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
This commit is contained in:
Andreas Jaeger 2011-08-23 06:17:57 +00:00 committed by Git OBS Bridge
parent 8d945b5e51
commit 04af9a9169
3 changed files with 8 additions and 4 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ef7e4ed2f3594dd02a50a92fc47dc0e1fea80c07fab8a5f3d1040ee76fae0acb
size 76092

View File

@ -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

View File

@ -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