[Xfce4-commits] <xfce4-power-manager:master> Prepare 0.8.4

[Ali Abdallah]

Updating branch refs/heads/master
         to e701f3498aa8e47f832c41e59fec0afe0b645475 (commit)
       from 40b01c3a4993d0054f9d85b8869b4d7a457a1a48 (commit)

commit e701f3498aa8e47f832c41e59fec0afe0b645475
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Tue Sep 29 09:17:41 2009 +0000

    Prepare 0.8.4

 NEWS                  |    2 +-
 configure.ac.in       |    8 ++++----
 libxfpm/Makefile.am   |    3 ++-
 libxfpm/xfpm-common.c |    2 +-
 libxfpm/xfpm-common.h |    2 +-
 src/xfpm-dpms.c       |    2 +-
 src/xfpm-engine.c     |    2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index b78879f..e020918 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-0.9.90
+0.8.4
 =======
 - Don't lock screen on lid event when multiple monitor are connected.
 - Force DPMSModeOff on lid close event if it is not done in Hardware.
diff --git a/configure.ac.in b/configure.ac.in
index 22f0b0f..0e581bc 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,9 +1,9 @@
 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfpm_version_major],  [0])
-m4_define([xfpm_version_minor],  [9])
-m4_define([xfpm_version_micro],  [90])
-m4_define([xfpm_version_build],  [@REVISION@])
-m4_define([xfpm_version_tag],[git])
+m4_define([xfpm_version_minor],  [8])
+m4_define([xfpm_version_micro],  [4])
+m4_define([xfpm_version_build],  [])
+m4_define([xfpm_version_tag],[])
 m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [git], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
 
 AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
diff --git a/libxfpm/Makefile.am b/libxfpm/Makefile.am
index 81a3aa2..ecdc403 100644
--- a/libxfpm/Makefile.am
+++ b/libxfpm/Makefile.am
@@ -36,7 +36,8 @@ libxfpmcommon_la_SOURCES =      	\
         xfpm-common.c           	\
         xfpm-common.h			\
 	xfpm-notify.c			\
-	xfpm-notify.h
+	xfpm-notify.h			\
+	xfpm-icons.h
 
 libxfpmcommon_la_CFLAGS =       	\
         $(GTK_CFLAGS)           	\
diff --git a/libxfpm/xfpm-common.c b/libxfpm/xfpm-common.c
index 76c8cf3..77da56a 100644
--- a/libxfpm/xfpm-common.c
+++ b/libxfpm/xfpm-common.c
@@ -146,7 +146,7 @@ xfpm_about (GtkWidget *widget, gpointer data)
 						 
 }
 
-gboolean xfpm_guess_is_multimonitor (void)
+gboolean xfpm_is_multihead_connected (void)
 {
     GdkDisplay *dpy;
     GdkScreen *screen;
diff --git a/libxfpm/xfpm-common.h b/libxfpm/xfpm-common.h
index 75d310e..dfd9faf 100644
--- a/libxfpm/xfpm-common.h
+++ b/libxfpm/xfpm-common.h
@@ -44,7 +44,7 @@ void            xfpm_quit                       (void);
 void       	xfpm_about			(GtkWidget *widget, 
 						 gpointer data);
 
-gboolean	xfpm_guess_is_multimonitor	(void);
+gboolean	xfpm_is_multihead_connected	(void);
 
 G_END_DECLS
 
diff --git a/src/xfpm-dpms.c b/src/xfpm-dpms.c
index f9ecb3a..3022096 100644
--- a/src/xfpm-dpms.c
+++ b/src/xfpm-dpms.c
@@ -244,7 +244,7 @@ xfpm_dpms_force_off (gpointer data)
 
     if ( power_level != DPMSModeOff )
     {
-	if ( xfpm_guess_is_multimonitor () )
+	if ( xfpm_is_multihead_connected () )
 	    goto out;
 	
 	TRACE ("Checking if we have multiple monitor : no");
diff --git a/src/xfpm-engine.c b/src/xfpm-engine.c
index 9742493..5a3a962 100644
--- a/src/xfpm-engine.c
+++ b/src/xfpm-engine.c
@@ -246,7 +246,7 @@ xfpm_engine_lid_event (XfpmButtonHal *bt_hal, gboolean pressed, XfpmEngine *engi
 	
 	if ( action == LID_TRIGGER_LOCK_SCREEN )
 	{
-	    if ( !xfpm_guess_is_multimonitor () )
+	    if ( !xfpm_is_multihead_connected () )
 		xfpm_lock_screen ();
 	}
 	else