gnome-power-manager r3129 - in trunk: . src

[rhughes svn gnome org]

Author: rhughes
Date: Tue Dec 16 17:44:24 2008
New Revision: 3129
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3129&view=rev

Log:
2008-12-16  Richard Hughes  <richard hughsie com>

* configure.ac:
* src/gpm-button.c: (gpm_button_init):
Added check for XF86XK_Suspend and XF86XK_Hibernate.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/gpm-button.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Dec 16 17:44:24 2008
@@ -139,10 +139,21 @@
 
 AC_PATH_XTRA
 
+dnl ---------------------------------------------------------------------------
+dnl - Check XF86XK_Keys
+dnl ---------------------------------------------------------------------------
 AC_CHECK_DECL(XF86XK_Battery,have_XF86XK_Battery=1,have_XF86XK_Battery=0,[#include <X11/XF86keysym.h>])
 if test "x${ac_cv_have_decl_XF86XK_Battery}" != "xno"; then
   AC_DEFINE(HAVE_XF86XK_BATTERY, 1, [Define if XF86XK_Battery is available])
 fi
+AC_CHECK_DECL(XF86XK_Suspend,have_XF86XK_Suspend=1,have_XF86XK_Suspend=0,[#include <X11/XF86keysym.h>])
+if test "x${ac_cv_have_decl_XF86XK_Suspend}" != "xno"; then
+  AC_DEFINE(HAVE_XF86XK_SUSPEND, 1, [Define if XF86XK_Suspend is available])
+fi
+AC_CHECK_DECL(XF86XK_Hibernate,have_XF86XK_Hibernate=1,have_XF86XK_Hibernate=0,[#include <X11/XF86keysym.h>])
+if test "x${ac_cv_have_decl_XF86XK_Hibernate}" != "xno"; then
+  AC_DEFINE(HAVE_XF86XK_HIBERNATE, 1, [Define if XF86XK_Hibernate is available])
+fi
 
 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 

Modified: trunk/src/gpm-button.c
==============================================================================
--- trunk/src/gpm-button.c	(original)
+++ trunk/src/gpm-button.c	Tue Dec 16 17:44:24 2008
@@ -519,9 +519,13 @@
 	if (have_xevents) {
 		/* register the brightness keys */
 		gpm_button_xevent_key (button, XF86XK_PowerOff, GPM_BUTTON_POWER);
-//		gpm_button_xevent_key (button, XF86XK_Suspend, GPM_BUTTON_SUSPEND);
+#ifdef HAVE_XF86XK_SUSPEND
+		gpm_button_xevent_key (button, XF86XK_Suspend, GPM_BUTTON_SUSPEND);
+#endif
 		gpm_button_xevent_key (button, XF86XK_Sleep, GPM_BUTTON_SUSPEND); /* should be configurable */
-//		gpm_button_xevent_key (button, XF86XK_Hibernate, GPM_BUTTON_HIBERNATE);
+#ifdef HAVE_XF86XK_HIBERNATE
+		gpm_button_xevent_key (button, XF86XK_Hibernate, GPM_BUTTON_HIBERNATE);
+#endif
 		gpm_button_xevent_key (button, XF86XK_MonBrightnessUp, GPM_BUTTON_BRIGHT_UP);
 		gpm_button_xevent_key (button, XF86XK_MonBrightnessDown, GPM_BUTTON_BRIGHT_DOWN);
 		gpm_button_xevent_key (button, XF86XK_ScreenSaver, GPM_BUTTON_LOCK);