From 0ef02781a3a52095e7cac0f73066a80a302c55e7 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 12 Aug 2010 21:16:08 +0000 Subject: [PATCH] No longer request battery levels if not enabled in the configuration --- src/plugins/panel.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/panel.c b/src/plugins/panel.c index 8823d7d..27692f7 100644 --- a/src/plugins/panel.c +++ b/src/plugins/panel.c @@ -128,6 +128,7 @@ static int _panel_init(PhonePlugin * plugin) /* battery */ panel->battery_timeout = 0; panel->battery_level = -1; + panel->battery_image = NULL; if((p = plugin->helper->config_get(plugin->helper->phone, "panel", "battery")) != NULL && strcmp(p, "1") == 0) @@ -239,6 +240,8 @@ static int _panel_event(PhonePlugin * plugin, PhoneEvent event, ...) _event_set_battery_level(panel, level); break; case PHONE_EVENT_FUNCTIONAL: + if(panel->battery_image == NULL) + break; /* FIXME should be disabled upon errors fetching CBC */ if(panel->battery_timeout != 0) break; @@ -272,6 +275,8 @@ static int _event_set_battery_level(Panel * panel, gdouble level) #ifdef DEBUG fprintf(stderr, "DEBUG: %s(plugin, %lf)\n", __func__, level); #endif + if(panel->battery_image == NULL) + return 0; if(level >= 0.0 && level <= 100.0) gtk_widget_show(panel->battery_image); if(level < 0.0)