diff options
author | Bastien Nocera <hadess@hadess.net> | 2013-10-11 15:23:25 +0200 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2013-10-14 10:42:56 +0200 |
commit | bd3a57fe0471ddeb8f0a168f10629e8f5d7b7b6c (patch) | |
tree | b5fd4e86161aa8eaf9c9f7eb395ba054d663e447 /src/linux | |
parent | 9c27c42a9977afe6e82622bda947b831c3be7197 (diff) | |
download | upower-bd3a57fe0471ddeb8f0a168f10629e8f5d7b7b6c.tar.gz |
daemon: Replace "on-low-battery" property
With "warning-level" property.
Diffstat (limited to 'src/linux')
-rwxr-xr-x | src/linux/integration-test | 1 | ||||
-rw-r--r-- | src/linux/up-device-hid.c | 31 | ||||
-rw-r--r-- | src/linux/up-device-supply.c | 31 |
3 files changed, 0 insertions, 63 deletions
diff --git a/src/linux/integration-test b/src/linux/integration-test index 510e1f7..c004740 100755 --- a/src/linux/integration-test +++ b/src/linux/integration-test @@ -726,7 +726,6 @@ class Tests(unittest.TestCase): self.assertIn(client.get_lid_is_present(), [False, True]) self.assertIn(client.get_lid_is_closed(), [False, True]) self.assertEqual(client.get_on_battery(), False) - self.assertEqual(client.get_on_low_battery(), False) # # Helper methods diff --git a/src/linux/up-device-hid.c b/src/linux/up-device-hid.c index d7d4440..a7bb07c 100644 --- a/src/linux/up-device-hid.c +++ b/src/linux/up-device-hid.c @@ -466,36 +466,6 @@ up_device_hid_get_on_battery (UpDevice *device, gboolean *on_battery) } /** - * up_device_hid_get_low_battery: - **/ -static gboolean -up_device_hid_get_low_battery (UpDevice *device, gboolean *low_battery) -{ - gboolean ret; - gboolean on_battery; - UpDeviceHid *hid = UP_DEVICE_HID (device); - gdouble percentage; - - g_return_val_if_fail (UP_IS_DEVICE_HID (hid), FALSE); - g_return_val_if_fail (low_battery != NULL, FALSE); - - /* reuse the common checks */ - ret = up_device_hid_get_on_battery (device, &on_battery); - if (!ret) - return FALSE; - - /* shortcut */ - if (!on_battery) { - *low_battery = FALSE; - return TRUE; - } - - g_object_get (device, "percentage", &percentage, NULL); - *low_battery = (percentage < 10.0f); - return TRUE; -} - -/** * up_device_hid_init: **/ static void @@ -544,7 +514,6 @@ up_device_hid_class_init (UpDeviceHidClass *klass) object_class->finalize = up_device_hid_finalize; device_class->coldplug = up_device_hid_coldplug; device_class->get_on_battery = up_device_hid_get_on_battery; - device_class->get_low_battery = up_device_hid_get_low_battery; device_class->refresh = up_device_hid_refresh; g_type_class_add_private (klass, sizeof (UpDeviceHidPrivate)); diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c index c1b046e..48bf786 100644 --- a/src/linux/up-device-supply.c +++ b/src/linux/up-device-supply.c @@ -176,36 +176,6 @@ up_device_supply_get_on_battery (UpDevice *device, gboolean *on_battery) } /** - * up_device_supply_get_low_battery: - **/ -static gboolean -up_device_supply_get_low_battery (UpDevice *device, gboolean *low_battery) -{ - gboolean ret; - gboolean on_battery; - UpDeviceSupply *supply = UP_DEVICE_SUPPLY (device); - gdouble percentage; - - g_return_val_if_fail (UP_IS_DEVICE_SUPPLY (supply), FALSE); - g_return_val_if_fail (low_battery != NULL, FALSE); - - /* reuse the common checks */ - ret = up_device_supply_get_on_battery (device, &on_battery); - if (!ret) - return FALSE; - - /* shortcut */ - if (!on_battery) { - *low_battery = FALSE; - return TRUE; - } - - g_object_get (device, "percentage", &percentage, NULL); - *low_battery = (percentage < 10.0f); - return TRUE; -} - -/** * up_device_supply_get_online: **/ static gboolean @@ -1100,7 +1070,6 @@ up_device_supply_class_init (UpDeviceSupplyClass *klass) object_class->finalize = up_device_supply_finalize; device_class->get_on_battery = up_device_supply_get_on_battery; - device_class->get_low_battery = up_device_supply_get_low_battery; device_class->get_online = up_device_supply_get_online; device_class->coldplug = up_device_supply_coldplug; device_class->refresh = up_device_supply_refresh; |