No longer request battery levels if not enabled in the configuration
This commit is contained in:
parent
4d8e945a5a
commit
0ef02781a3
@ -128,6 +128,7 @@ static int _panel_init(PhonePlugin * plugin)
|
|||||||
/* battery */
|
/* battery */
|
||||||
panel->battery_timeout = 0;
|
panel->battery_timeout = 0;
|
||||||
panel->battery_level = -1;
|
panel->battery_level = -1;
|
||||||
|
panel->battery_image = NULL;
|
||||||
if((p = plugin->helper->config_get(plugin->helper->phone, "panel",
|
if((p = plugin->helper->config_get(plugin->helper->phone, "panel",
|
||||||
"battery")) != NULL
|
"battery")) != NULL
|
||||||
&& strcmp(p, "1") == 0)
|
&& strcmp(p, "1") == 0)
|
||||||
@ -239,6 +240,8 @@ static int _panel_event(PhonePlugin * plugin, PhoneEvent event, ...)
|
|||||||
_event_set_battery_level(panel, level);
|
_event_set_battery_level(panel, level);
|
||||||
break;
|
break;
|
||||||
case PHONE_EVENT_FUNCTIONAL:
|
case PHONE_EVENT_FUNCTIONAL:
|
||||||
|
if(panel->battery_image == NULL)
|
||||||
|
break;
|
||||||
/* FIXME should be disabled upon errors fetching CBC */
|
/* FIXME should be disabled upon errors fetching CBC */
|
||||||
if(panel->battery_timeout != 0)
|
if(panel->battery_timeout != 0)
|
||||||
break;
|
break;
|
||||||
@ -272,6 +275,8 @@ static int _event_set_battery_level(Panel * panel, gdouble level)
|
|||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
fprintf(stderr, "DEBUG: %s(plugin, %lf)\n", __func__, level);
|
fprintf(stderr, "DEBUG: %s(plugin, %lf)\n", __func__, level);
|
||||||
#endif
|
#endif
|
||||||
|
if(panel->battery_image == NULL)
|
||||||
|
return 0;
|
||||||
if(level >= 0.0 && level <= 100.0)
|
if(level >= 0.0 && level <= 100.0)
|
||||||
gtk_widget_show(panel->battery_image);
|
gtk_widget_show(panel->battery_image);
|
||||||
if(level < 0.0)
|
if(level < 0.0)
|
||||||
|
Loading…
Reference in New Issue
Block a user