Hello community, here is the log from the commit of package upower for openSUSE:Factory checked in at 2019-01-29 14:45:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/upower (Old) and /work/SRC/openSUSE:Factory/.upower.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "upower" Tue Jan 29 14:45:00 2019 rev:66 rq:666540 version:0.99.9 Changes: -------- --- /work/SRC/openSUSE:Factory/upower/upower.changes 2018-11-14 14:28:51.623589286 +0100 +++ /work/SRC/openSUSE:Factory/.upower.new.28833/upower.changes 2019-01-29 14:45:01.707069280 +0100 @@ -1,0 +2,6 @@ +Sun Jan 13 19:04:52 UTC 2019 - [email protected] + +- Add upower_daemon-consider-pending-charge.patch: daemon: Consider + pending-charge when calculating the display state. + +------------------------------------------------------------------- New: ---- upower_daemon-consider-pending-charge.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ upower.spec ++++++ --- /var/tmp/diff_new_pack.BXMeA5/_old 2019-01-29 14:45:02.159068732 +0100 +++ /var/tmp/diff_new_pack.BXMeA5/_new 2019-01-29 14:45:02.163068727 +0100 @@ -1,7 +1,7 @@ # # spec file for package upower # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,8 @@ Source0: https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE upower-hibernate-insteadof-hybridsleep.patch boo#985741 [email protected] -- Set the system per default to hibernate, not hybridsleep Patch0: upower-hibernate-insteadof-hybridsleep.patch +# PATCH-FIX-UPSTREAM upower_daemon-consider-pending-charge.patch -- daemon: Consider pending-charge when calculating the display state +Patch1: upower_daemon-consider-pending-charge.patch BuildRequires: gobject-introspection-devel >= 0.9.9 BuildRequires: gtk-doc >= 1.11 ++++++ upower_daemon-consider-pending-charge.patch ++++++ >From a074a5462ab9749ad4aaca52e0202602897660aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <[email protected]> Date: Thu, 1 Nov 2018 14:45:28 -0700 Subject: [PATCH] daemon: Make comment more succinct This will help make it more clear when adding an extra state on the following commit. It also makes the language consistent between the different lines. There are no changes on the meaning of these lines nor any functional changes on this commit. --- src/up-daemon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/up-daemon.c b/src/up-daemon.c index 1a5dddc..95fff6b 100644 --- a/src/up-daemon.c +++ b/src/up-daemon.c @@ -209,9 +209,9 @@ up_daemon_update_display_battery (UpDaemon *daemon) power_supply == FALSE) continue; - /* If one battery is charging, then the composite is charging - * If all batteries are discharging, then the composite is discharging - * If all batteries are fully charged, then they're all fully charged + /* If one battery is charging, the composite is charging + * If all batteries are discharging, the composite is discharging + * If all batteries are fully charged, the composite is fully charged * Everything else is unknown */ if (state == UP_DEVICE_STATE_CHARGING) state_total = UP_DEVICE_STATE_CHARGING; -- 2.18.1 >From a074631c0b1748c8a791c4f0dad99da75805a328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <[email protected]> Date: Mon, 15 Oct 2018 17:05:27 -0700 Subject: [PATCH] daemon: Consider pending-charge when calculating the display state Without this change if all batteries in the system are in the pending-charge state, the display device state is set to unknown, and its icon to battery-missing-symbolic. This change makes the pending-charge state be considered when calculating the DisplayDevice state, setting it to pending-charge if at least one battery in the system is pending-charge and no other is charging or discharging. Closes: #81 Closes: #19 --- src/up-daemon.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/up-daemon.c b/src/up-daemon.c index 95fff6b..690f379 100644 --- a/src/up-daemon.c +++ b/src/up-daemon.c @@ -210,14 +210,18 @@ up_daemon_update_display_battery (UpDaemon *daemon) continue; /* If one battery is charging, the composite is charging - * If all batteries are discharging, the composite is discharging + * If all batteries are discharging or pending-charge, the composite is discharging * If all batteries are fully charged, the composite is fully charged + * If one battery is pending-charge and no other is charging or discharging, then the composite is pending-charge * Everything else is unknown */ if (state == UP_DEVICE_STATE_CHARGING) state_total = UP_DEVICE_STATE_CHARGING; else if (state == UP_DEVICE_STATE_DISCHARGING && state_total != UP_DEVICE_STATE_CHARGING) state_total = UP_DEVICE_STATE_DISCHARGING; + else if (state == UP_DEVICE_STATE_PENDING_CHARGE && + (state_total == UP_DEVICE_STATE_UNKNOWN || state_total == UP_DEVICE_STATE_PENDING_CHARGE)) + state_total = UP_DEVICE_STATE_PENDING_CHARGE; else if (state == UP_DEVICE_STATE_FULLY_CHARGED && state_total == UP_DEVICE_STATE_UNKNOWN) state_total = UP_DEVICE_STATE_FULLY_CHARGED; -- 2.18.1
