From 04af9a9169430f3e88dffb9b8a34ae3fff7627e6eaf5e2c2bcaf438d95149605 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 23 Aug 2011 06:17:57 +0000 Subject: [PATCH] Accepting request 79509 from home:gary_lin:branches:Base:System - Add the check for gnome-settings-daemon in power_button since gnome-power-manager has been integrated into gnome-settings-daemon. bnc#711148 OBS-URL: https://build.opensuse.org/request/show/79509 OBS-URL: https://build.opensuse.org/package/show/Base:System/acpid?expand=0&rev=27 --- _service:download_url:acpid-2.0.10.tar.gz | 3 --- acpid.changes | 7 +++++++ power_button | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 _service:download_url:acpid-2.0.10.tar.gz diff --git a/_service:download_url:acpid-2.0.10.tar.gz b/_service:download_url:acpid-2.0.10.tar.gz deleted file mode 100644 index 19faccb..0000000 --- a/_service:download_url:acpid-2.0.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef7e4ed2f3594dd02a50a92fc47dc0e1fea80c07fab8a5f3d1040ee76fae0acb -size 76092 diff --git a/acpid.changes b/acpid.changes index 7c35c0c..89a5231 100644 --- a/acpid.changes +++ b/acpid.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 23 02:54:40 UTC 2011 - glin@suse.com + +- Add the check for gnome-settings-daemon in power_button since + gnome-power-manager has been integrated into + gnome-settings-daemon. bnc#711148 + ------------------------------------------------------------------- Sat May 21 16:09:14 UTC 2011 - vlado.paskov@gmail.com diff --git a/power_button b/power_button index 977779c..46823b2 100644 --- a/power_button +++ b/power_button @@ -47,7 +47,7 @@ while read A; do if [ "$IS_ACTIVE" = "true" -a -n "$DISP" ]; then # additional check, if none of these two apps are running, go on - if [ -n "`pidof kpowersave`" -o -n "`pidof gnome-power-manager`" -o -n "`pidof kded4`" -o -n "`pidof dalston-power-applet`" ]; then + if [ -n "`pidof kpowersave`" -o -n "`pidof gnome-power-manager`" -o -n "`pidof kded4`" -o -n "`pidof dalston-power-applet`" -o -n "`pidof gnome-settings-daemon`" ]; then echo doing nothing... exit 0 fi