diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
commit | 09351e78166b5e864197c4456ebae3f89dd0bed9 (patch) | |
tree | 41a96399f56ed3aa399006871bfce4430db84aa2 /sys-power/upower/files | |
parent | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff) |
gentoo resync : 22.01.2019
Diffstat (limited to 'sys-power/upower/files')
-rw-r--r-- | sys-power/upower/files/upower-0.99.9-pending-charge1.patch | 33 | ||||
-rw-r--r-- | sys-power/upower/files/upower-0.99.9-pending-charge2.patch | 48 |
2 files changed, 81 insertions, 0 deletions
diff --git a/sys-power/upower/files/upower-0.99.9-pending-charge1.patch b/sys-power/upower/files/upower-0.99.9-pending-charge1.patch new file mode 100644 index 000000000000..9ce91c10a66e --- /dev/null +++ b/sys-power/upower/files/upower-0.99.9-pending-charge1.patch @@ -0,0 +1,33 @@ +From a074a5462ab9749ad4aaca52e0202602897660aa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita@endlessm.com> +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 + diff --git a/sys-power/upower/files/upower-0.99.9-pending-charge2.patch b/sys-power/upower/files/upower-0.99.9-pending-charge2.patch new file mode 100644 index 000000000000..a79ebac7ed18 --- /dev/null +++ b/sys-power/upower/files/upower-0.99.9-pending-charge2.patch @@ -0,0 +1,48 @@ +From a074631c0b1748c8a791c4f0dad99da75805a328 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita@endlessm.com> +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 + |