# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1211997365 -10800
# Node ID 1eb29b830013c1e204cb6c8f66f9ea770857da59
# Parent  c1258ae018eebd938fa92868cd3fc166cf8387d9
Backed out changeset c1258ae018ee

diff -r c1258ae018ee -r 1eb29b830013 configure.ac
--- a/configure.ac	Wed May 28 20:51:52 2008 +0300
+++ b/configure.ac	Wed May 28 20:56:05 2008 +0300
@@ -477,7 +477,6 @@
 if test "x$enable_hotkey" = "xyes"; then
     have_hotkey="yes"
     PKG_CHECK_MODULES(GDKX11,[gdk-x11-2.0 >= 2.6.0],,[have_hotkey="no"])
-    AC_CHECK_HEADERS([X11/keysym.h])
 else
     AC_MSG_RESULT([*** X11 Global Hotkey plugin disabled per user request ***])
     have_hotkey="no"
diff -r c1258ae018ee -r 1eb29b830013 src/hotkey/grab.c
--- a/src/hotkey/grab.c	Wed May 28 20:51:52 2008 +0300
+++ b/src/hotkey/grab.c	Wed May 28 20:56:05 2008 +0300
@@ -33,13 +33,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-#ifdef HAVE_X11_KEYSYM_H
-#include <X11/keysym.h>
-#endif
+
 #include "grab.h"
 #include "plugin.h"
 
diff -r c1258ae018ee -r 1eb29b830013 src/hotkey/gui.c
--- a/src/hotkey/gui.c	Wed May 28 20:51:52 2008 +0300
+++ b/src/hotkey/gui.c	Wed May 28 20:56:05 2008 +0300
@@ -33,7 +33,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
diff -r c1258ae018ee -r 1eb29b830013 src/hotkey/plugin.c
--- a/src/hotkey/plugin.c	Wed May 28 20:51:52 2008 +0300
+++ b/src/hotkey/plugin.c	Wed May 28 20:56:05 2008 +0300
@@ -33,7 +33,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <X11/XF86keysym.h>