diff options
| author | Victor Lowther <victor.lowther@gmail.com> | 2010-04-12 22:00:09 -0500 |
|---|---|---|
| committer | Victor Lowther <victor.lowther@gmail.com> | 2010-04-12 22:00:09 -0500 |
| commit | 0e58d64382a4efd2b1140f1fb1b3cf19043f1dd4 (patch) | |
| tree | 7ea19f13f013c45d32179fccc5178b3bcf6c42e3 /src | |
| parent | a1d9fde306aee2d65f83c0225c65a31b5d417e10 (diff) | |
| parent | ddad23ae577a712489abbdd7e997ce4a551ea838 (diff) | |
Merge remote branch 'UPSTREAM/master'
Diffstat (limited to 'src')
| -rwxr-xr-x | src/on_ac_power | 12 | ||||
| -rw-r--r-- | src/pm-powersave.in | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/on_ac_power b/src/on_ac_power index fdbcb36..1f9c59e 100755 --- a/src/on_ac_power +++ b/src/on_ac_power @@ -30,7 +30,17 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# prefer DeviceKit-power if available +# prefer UPower if available +if s="$(dbus-send --system --print-reply \ + --dest=org.freedesktop.UPower \ + /org/freedesktop/UPower \ + org.freedesktop.DBus.Properties.Get \ + string:org.freedesktop.UPower string:OnBattery)"; then + echo "$s" | grep -q 'boolean false' + exit $? +fi + +# try its old name 'DeviceKit-power' too if s="$(dbus-send --system --print-reply \ --dest=org.freedesktop.DeviceKit.Power \ /org/freedesktop/DeviceKit/Power \ diff --git a/src/pm-powersave.in b/src/pm-powersave.in index dff1f64..08e4f5b 100644 --- a/src/pm-powersave.in +++ b/src/pm-powersave.in @@ -38,6 +38,8 @@ trap remove_powersave_lock 0 mkdir -p "${STORAGEDIR}" rm -f "${INHIBIT}" +load_hook_blacklist + if [ "$1" = "true" -o "$1" = "false" ] ; then init_logfile "${PM_LOGFILE}" run_hooks power "$1" |