changeset 2660:c1258ae018ee

Possibly fix some cases where certain X11 keysyms are not found.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 28 May 2008 20:51:52 +0300
parents 503ea4219e17
children 1eb29b830013
files configure.ac src/hotkey/grab.c src/hotkey/gui.c src/hotkey/plugin.c
diffstat 4 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed May 28 20:31:51 2008 +0300
+++ b/configure.ac	Wed May 28 20:51:52 2008 +0300
@@ -477,6 +477,7 @@
 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"
--- a/src/hotkey/grab.c	Wed May 28 20:31:51 2008 +0300
+++ b/src/hotkey/grab.c	Wed May 28 20:51:52 2008 +0300
@@ -33,11 +33,13 @@
  *  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"
 
--- a/src/hotkey/gui.c	Wed May 28 20:31:51 2008 +0300
+++ b/src/hotkey/gui.c	Wed May 28 20:51:52 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>
--- a/src/hotkey/plugin.c	Wed May 28 20:31:51 2008 +0300
+++ b/src/hotkey/plugin.c	Wed May 28 20:51:52 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>