summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-26 17:06:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-30 22:11:56 +0100
commite8e3b62d6b9086a2147fa15c849b5a36ba1e9812 (patch)
treef84e1f992ce78eac81c56a340fcb47071cf84255
parent0ac89346dea9ae52aa9b8c11a6e6bf84ab82e3c9 (diff)
downloadpoky-e8e3b62d6b9086a2147fa15c849b5a36ba1e9812.tar.gz
matchbox-panel: silence some pointless warnings
The battery applet emits a warning if the hardware doesn't have a battery (it shouldn't) and the parser emits a warning if two separators are used in a row (which happens if the hardware has a keyboard). Silence these with a patch from upstream. [ YOCTO #4061 ] (From OE-Core rev: 4e2b86787ed7a44ad88aa1431207d049c2cb444a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch64
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb3
2 files changed, 66 insertions, 1 deletions
diff --git a/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch b/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch
new file mode 100644
index 0000000000..45ba9a0318
--- /dev/null
+++ b/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch
@@ -0,0 +1,64 @@
1Don't warn if the machine doesn't actually have a battery, or if the applets
2string contains consecutive separators.
3
4Upstream-Status: Backport
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c
8index 6515cb0..c44dd12 100644
9--- a/applets/battery/battery-acpi.c
10+++ b/applets/battery/battery-acpi.c
11@@ -14,8 +14,6 @@ int batt_state, ac_state;
12 int pm_support(void)
13 {
14 if(check_acpi_support() == NOT_SUPPORTED){
15- g_warning("No ACPI support\n");
16-
17 return 0;
18 }
19
20@@ -32,8 +30,9 @@ const char* pm_battery_icon(void)
21 const char *icon;
22 battery_t *binfo;
23
24+ /* No battery available (not present, disabled, or something
25+ else. Silently do nothing. */
26 if (batt_state != SUCCESS) {
27- g_warning("Couldnt initialize ACPI battery\n");
28 return NULL;
29 }
30
31diff --git a/applets/battery/battery-apm.c b/applets/battery/battery-apm.c
32index 5467438..2f39cb6 100644
33--- a/applets/battery/battery-apm.c
34+++ b/applets/battery/battery-apm.c
35@@ -10,8 +10,6 @@
36 int pm_support(void)
37 {
38 if (1 == apm_exists ()) {
39- g_warning ("No APM support");
40-
41 return 0;
42 }
43
44diff --git a/matchbox-panel/mb-panel.c b/matchbox-panel/mb-panel.c
45index 2d8cafd..828a36d 100644
46--- a/matchbox-panel/mb-panel.c
47+++ b/matchbox-panel/mb-panel.c
48@@ -110,10 +110,15 @@ load_applets (const char *applets_desc,
49 applets = g_strsplit (applets_desc, ",", -1);
50
51 for (i = 0; applets[i]; i++) {
52+ char *s;
53 char **bits;
54 GtkWidget *applet;
55
56- bits = g_strsplit (applets[i], ":", 2);
57+ s = applets[i];
58+ if (s == NULL || s[0] == '\0')
59+ continue;
60+
61+ bits = g_strsplit (s, ":", 2);
62
63 applet = load_applet (bits[0],
64 bits[1],
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index 1e2a7ae2ad..eff20f0493 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -19,7 +19,8 @@ RPROVIDES_${PN} = "matchbox-panel"
19RREPLACES_${PN} = "matchbox-panel" 19RREPLACES_${PN} = "matchbox-panel"
20RCONFLICTS_${PN} = "matchbox-panel" 20RCONFLICTS_${PN} = "matchbox-panel"
21 21
22SRC_URI = "git://git.yoctoproject.org/${BPN}" 22SRC_URI = "git://git.yoctoproject.org/${BPN} \
23 file://silence-warnings.patch"
23 24
24EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 25EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
25EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" 26EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"