diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-07-21 11:25:16 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2014-07-21 11:25:16 -0500 |
| commit | 1902911c18a863ca285c53ae323e233119cf0d86 (patch) | |
| tree | 95e59c486dd0b10cd919174258f472f255e15501 /src/service.c | |
| parent | b08f9b096f956b528ad974a30828a809b827efef (diff) | |
| download | ayatana-indicator-power-1902911c18a863ca285c53ae323e233119cf0d86.tar.gz ayatana-indicator-power-1902911c18a863ca285c53ae323e233119cf0d86.tar.bz2 ayatana-indicator-power-1902911c18a863ca285c53ae323e233119cf0d86.zip | |
remove DeviceProvider from Notifier
Diffstat (limited to 'src/service.c')
| -rw-r--r-- | src/service.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/service.c b/src/service.c index d8f1371..1c1f8f7 100644 --- a/src/service.c +++ b/src/service.c @@ -926,6 +926,12 @@ on_devices_changed (IndicatorPowerService * self) g_clear_object (&p->primary_device); p->primary_device = indicator_power_service_choose_primary_device (p->devices); + /* update the notifier's battery */ + if ((p->primary_device != NULL) || (indicator_power_device_get_kind(p->primary_device) == UP_DEVICE_KIND_BATTERY)) + indicator_power_notifier_set_battery (p->primary_device); + else + indicator_power_notifier_set_battery (NULL); + /* update the battery-level action's state */ if (p->primary_device == NULL) battery_level = 0; @@ -1042,7 +1048,7 @@ indicator_power_service_init (IndicatorPowerService * self) p->settings = g_settings_new ("com.canonical.indicator.power"); - p->notifier = indicator_power_notifier_new (NULL); + p->notifier = indicator_power_notifier_new (); uscreen_proxy = uscreen_get_proxy(&brightness_params); if (uscreen_proxy != NULL) @@ -1145,8 +1151,6 @@ indicator_power_service_set_device_provider (IndicatorPowerService * self, on_devices_changed (self); } - - indicator_power_notifier_set_device_provider (p->notifier, dp); } /* If a device has multiple batteries and uses only one of them at a time, |