rpms/xfce4-power-manager/devel xfce4-power-manager-0.8.0beta1-button-hal.patch, NONE, 1.1 xfce4-power-manager.spec, 1.6, 1.7

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19170

Modified Files:
	xfce4-power-manager.spec 
Added Files:
	xfce4-power-manager-0.8.0beta1-button-hal.patch 
Log Message:
* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta1
- Add xfpm-button-hal.patch by Mike Massonnet


xfce4-power-manager-0.8.0beta1-button-hal.patch:

--- NEW FILE xfce4-power-manager-0.8.0beta1-button-hal.patch ---
--- xfce4-power-manager-0.8.0beta1.orig/src/xfpm-button-hal.c	2009-04-10 21:12:15.000000000 +0200
+++ xfce4-power-manager-0.8.0beta1/src/xfpm-button-hal.c	2009-04-13 21:14:10.000000000 +0200
@@ -71,27 +71,27 @@
 
     TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 
-    if ( xfpm_strequal (detail, "power")  && !bt->priv->keys & POWER_KEY )
+    if ( xfpm_strequal (detail, "power")  && !(bt->priv->keys & POWER_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_POWER_OFF);
     }
-    else if ( xfpm_strequal (detail, "sleep")  && !bt->priv->keys & SLEEP_KEY )
+    else if ( xfpm_strequal (detail, "sleep")  && !(bt->priv->keys & SLEEP_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_SLEEP);
     }
-    else if ( xfpm_strequal (detail, "hibernate") && !bt->priv->keys & HIBERNATE_KEY )
+    else if ( xfpm_strequal (detail, "hibernate") && !(bt->priv->keys & HIBERNATE_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_HIBERNATE);
     }
-    else if ( xfpm_strequal (detail, "brightness-up")  && !bt->priv->keys & BRIGHTNESS_KEY )
+    else if ( xfpm_strequal (detail, "brightness-up")  && !(bt->priv->keys & BRIGHTNESS_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_MON_BRIGHTNESS_UP);
     }
-    else if ( xfpm_strequal (detail, "brightness-down")  && !bt->priv->keys & BRIGHTNESS_KEY )
+    else if ( xfpm_strequal (detail, "brightness-down")  && !(bt->priv->keys & BRIGHTNESS_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_MON_BRIGHTNESS_DOWN);


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-power-manager.spec	11 Apr 2009 23:18:52 -0000	1.6
+++ xfce4-power-manager.spec	13 Apr 2009 20:35:13 -0000	1.7
@@ -2,17 +2,18 @@
 
 Name:           xfce4-power-manager
 Version:        0.8.0
-Release:        0.1.%{betaversion}%{?dist}
+Release:        0.2.%{betaversion}%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}%{betaversion}.tar.bz2
+# Posted on goodies-dev and applied upstream on Apr 11th 2009
+Patch0:         xfce4-power-manager-0.8.0beta1-button-hal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
-
 BuildRequires:  xfce4-panel-devel >= 4.6.0
 BuildRequires:  dbus-devel >= 0.60
 BuildRequires:  dbus-glib-devel >= 0.70
@@ -30,6 +31,7 @@
 
 %prep
 %setup -qn %{name}-%{version}%{betaversion}
+%patch0 -p1 -b .button-hal
 
 
 %build
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta1
+- Add xfpm-button-hal.patch by Mike Massonnet
+
 * Sun Apr 12 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.beta1
 - Update to 0.8.0beta1