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

[fpeters svn gnome org]

Author: fpeters
Date: Tue Dec 16 09:27:01 2008
New Revision: 3128
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3128&view=rev

Log:
* configure.ac:
* src/gpm-button.c: (gpm_button_init):
Added check for XF86XK_Battery as it is new in x11proto.
Fixes #558103



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 09:27:01 2008
@@ -139,6 +139,11 @@
 
 AC_PATH_XTRA
 
+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
+
 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 
 dnl ---------------------------------------------------------------------------

Modified: trunk/src/gpm-button.c
==============================================================================
--- trunk/src/gpm-button.c	(original)
+++ trunk/src/gpm-button.c	Tue Dec 16 09:27:01 2008
@@ -525,7 +525,9 @@
 		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);
+#ifdef HAVE_XF86XK_BATTERY
 		gpm_button_xevent_key (button, XF86XK_Battery, GPM_BUTTON_BATTERY);
+#endif
 		gpm_button_xevent_key (button, XF86XK_KbdBrightnessUp, GPM_BUTTON_KBD_BRIGHT_UP);
 		gpm_button_xevent_key (button, XF86XK_KbdBrightnessDown, GPM_BUTTON_KBD_BRIGHT_DOWN);
 		gpm_button_xevent_key (button, XF86XK_KbdLightOnOff, GPM_BUTTON_KBD_BRIGHT_TOGGLE);