[Goodies-commits] r7164 - in xfce4-power-manager/trunk: . src

[Ali Abdallah]

Author: aliov
Date: 2009-04-11 12:38:06 +0000 (Sat, 11 Apr 2009)
New Revision: 7164

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/src/xfpm-engine.c
   xfce4-power-manager/trunk/src/xfpm-xfconf.c
Log:
Fix brightness buttons issue

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-04-11 12:15:11 UTC (rev 7163)
+++ xfce4-power-manager/trunk/ChangeLog	2009-04-11 12:38:06 UTC (rev 7164)
@@ -1,4 +1,7 @@
 
+2009-04-11 14:38 Ali aliov at xfce.org 
+	 * : Fix brightness buttons issue
+
 2009-04-11 11:26 Ali aliov at xfce.org 
 	 * : Fix notification timeouts when using xfce4-notifyd+minor clean up of some unused includes
 

Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c	2009-04-11 12:15:11 UTC (rev 7163)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c	2009-04-11 12:38:06 UTC (rev 7164)
@@ -217,6 +217,9 @@
 	return;
     }
     
+    if ( type == BUTTON_MON_BRIGHTNESS_DOWN || type == BUTTON_MON_BRIGHTNESS_UP )
+	return;
+    
     if ( type == BUTTON_POWER_OFF || type == BUTTON_SLEEP || type == BUTTON_HIBERNATE )
 	shutdown = xfpm_xfconf_get_property_enum (engine->priv->conf, 
 					          type == BUTTON_POWER_OFF ? POWER_SWITCH_CFG :

Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.c	2009-04-11 12:15:11 UTC (rev 7163)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.c	2009-04-11 12:38:06 UTC (rev 7164)
@@ -583,13 +583,13 @@
 	return conf->priv->dpms_off_on_ac;
     else if ( xfpm_strequal (property, ON_BATT_DPMS_OFF))
 	return conf->priv->dpms_off_on_battery;
+#endif /* HAVE_DPMS */
     else if ( xfpm_strequal (property, BRIGHTNESS_ON_AC ) )
 	return conf->priv->brightness_on_ac_timeout;
     else if ( xfpm_strequal (property, BRIGHTNESS_ON_BATTERY )) 
 	return conf->priv->brightness_on_battery_timeout;
     else if ( xfpm_strequal (property, CRITICAL_POWER_LEVEL) )
 	return conf->priv->critical_level;
-#endif /* HAVE_DPMS */
 
     g_warn_if_reached ();