[Xfce4-commits] <xfce4-power-manager:master> Build fix with xextproto > 7.0.5 Brightness fine tuning.

[Ali Abdallah]

Updating branch refs/heads/master
         to 3742c86ef274cdb1c1493e16878d414c960c1ac5 (commit)
       from 786c643a19d4aeafc72a0ae009458fb865db54ee (commit)

commit 3742c86ef274cdb1c1493e16878d414c960c1ac5
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Mon Nov 2 09:22:47 2009 +0100

    Build fix with xextproto > 7.0.5
    Brightness fine tuning.

 NEWS                      |    5 +++--
 configure.ac.in           |    2 +-
 src/xfpm-battery.c        |    3 +++
 src/xfpm-brightness-hal.c |    2 +-
 src/xfpm-dpms.c           |    3 +++
 src/xfpm-dpms.h           |    1 -
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index f1adb1f..f5f8d58 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,12 @@
 0.8.4.1
 =======
-- Because on some systems we might not have the brightness keys mapped
-  brightness changes are not reflected to xfpm when keys are pressed, so
+- Because on some systems we might not have the brightness keys mapped.
+  LCD brightness change are not reflected to xfpm when keys are pressed, so
   save the actual brightness before dimming the screen on idle to restore it 
   afterword. (bug #5811).
 - Check if DPMS is enabled before doing action on lid close event (bug #5805).
 - Allow 1% as a minimum critical charge level.
+- Build fix with xextproto > 7.0.5 (bug #5897).
 
 0.8.4
 =======
diff --git a/configure.ac.in b/configure.ac.in
index 6d2fd87..a2919d4 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,7 +11,7 @@ AC_PREREQ(2.50)
 
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_USE_SYSTEM_EXTENSIONS()
diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index ca81fb7..a2315ec 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -152,6 +152,9 @@ xfpm_battery_refresh_visible_icon (XfpmBattery *battery)
 	else visible = TRUE;
     }
 
+    XFPM_DEBUG_ENUM ("Tray icon configuration: ", show_icon, XFPM_TYPE_SHOW_ICON);
+    XFPM_DEBUG_ENUM_FULL (battery->priv->state, XFPM_TYPE_BATTERY_STATE, " setting tray icon visible %s", 
+			  xfpm_bool_to_string (visible));
     xfpm_tray_icon_set_visible (battery->priv->icon, visible);
 }
     
diff --git a/src/xfpm-brightness-hal.c b/src/xfpm-brightness-hal.c
index 23f4929..0728428 100644
--- a/src/xfpm-brightness-hal.c
+++ b/src/xfpm-brightness-hal.c
@@ -298,7 +298,7 @@ xfpm_brightness_hal_reset_cb (XfpmIdle *idle, XfpmBrightnessHal *brg)
 	return;
     }
      
-    if ( level != brg->priv->hw_level )
+    if ( level != brg->priv->hw_level && level != 0)
     {
 	TRACE("Resetting brightness level to %d", brg->priv->hw_level);
 	xfpm_brightness_hal_set_level(brg, brg->priv->hw_level);
diff --git a/src/xfpm-dpms.c b/src/xfpm-dpms.c
index 564fdcc..762860f 100644
--- a/src/xfpm-dpms.c
+++ b/src/xfpm-dpms.c
@@ -92,7 +92,10 @@ xfpm_dpms_disable (XfpmDpms *dpms)
 	g_warning ("Cannot get DPMSInfo");
 	
     if ( state )
+    {
+	xfpm_dpms_set_timeouts (dpms, 0, 0, 0);
 	DPMSDisable (GDK_DISPLAY());
+    }
 }
 
 /*
diff --git a/src/xfpm-dpms.h b/src/xfpm-dpms.h
index 9a5b1d4..067622f 100644
--- a/src/xfpm-dpms.h
+++ b/src/xfpm-dpms.h
@@ -34,7 +34,6 @@
 #include <gdk/gdkx.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/dpms.h>
-#include <X11/extensions/dpmsstr.h>
 
 G_BEGIN_DECLS