| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Don't warn if the machine doesn't actually have a battery, or if the applets |
| 2 | string contains consecutive separators. |
| 3 | |
| 4 | Upstream-Status: Backport |
| 5 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 6 | |
| 7 | diff --git a/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c |
| 8 | index 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 | |
| 31 | diff --git a/applets/battery/battery-apm.c b/applets/battery/battery-apm.c |
| 32 | index 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 | |
| 44 | diff --git a/matchbox-panel/mb-panel.c b/matchbox-panel/mb-panel.c |
| 45 | index 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], |