[gnome-control-center] power: Remove get_battery_level()
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] power: Remove get_battery_level()
- Date: Wed, 14 Oct 2020 22:59:05 +0000 (UTC)
commit af8c3247b46beb6de082c95b2377e3358b94d2d7
Author: Ian Douglas Scott <idscott system76 com>
Date: Mon Oct 12 10:06:41 2020 -0700
power: Remove get_battery_level()
This was added in 6c447dc14a2a3a98d25e8a71fb3d5e08ae8b6fe6 to deal with
both older and newer UPower versions.
It should be safe now to assume a UPower version with this property.
panels/power/cc-power-panel.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
---
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index 6398f455e..c7109f277 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -383,18 +383,6 @@ kind_to_description (UpDeviceKind kind)
g_assert_not_reached ();
}
-static UpDeviceLevel
-get_battery_level (UpDevice *device)
-{
- UpDeviceLevel battery_level;
-
- if (!g_object_class_find_property (G_OBJECT_CLASS (G_OBJECT_GET_CLASS (device)), "battery-level"))
- return UP_DEVICE_LEVEL_NONE;
-
- g_object_get (device, "battery-level", &battery_level, NULL);
- return battery_level;
-}
-
static void
add_device (CcPowerPanel *panel, UpDevice *device)
{
@@ -419,8 +407,8 @@ add_device (CcPowerPanel *panel, UpDevice *device)
"state", &state,
"model", &name,
"is-present", &is_present,
+ "battery-level", &battery_level,
NULL);
- battery_level = get_battery_level (device);
if (!is_present)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]