gnome-settings-daemon r617 - in trunk: . plugins/keyboard plugins/mouse plugins/xrandr

[jensg svn gnome org]

Author: jensg
Date: Sat Nov 29 11:33:29 2008
New Revision: 617
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=617&view=rev

Log:
2008-11-29  Jens Granseuer  <jensgr gmx net>

	* configure.ac: fix checks for various X11 libraries (bug #562661)

	* plugins/mouse/gsd-mouse-manager.c: (set_left_handed),
	(gsd_mouse_manager_idle_cb), (gsd_mouse_manager_stop):
	* plugins/xrandr/gsd-xrandr-manager.c: adapt ifdefs accordingly


Removed:
   trunk/plugins/keyboard/.indent.pro
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/mouse/gsd-mouse-manager.c
   trunk/plugins/xrandr/gsd-xrandr-manager.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Nov 29 11:33:29 2008
@@ -42,7 +42,7 @@
 
 DBUS_GLIB_REQUIRED_VERSION=0.74
 GLIB_REQUIRED_VERSION=2.17.3
-GTK_REQUIRED_VERSION=2.13.1
+GTK_REQUIRED_VERSION=2.12.1
 GCONF_REQUIRED_VERSION=2.6.1
 GIO_REQUIRED_VERSION=2.17.3
 GNOME_DESKTOP_REQUIRED_VERSION=2.23.90
@@ -76,7 +76,6 @@
 AC_SUBST([GSD_PLUGIN_LDFLAGS])
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-AC_PATH_XTRA
 
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 
@@ -114,15 +113,15 @@
 dnl - X11 stuff
 dnl ---------------------------------------------------------------------------
 
-# Like AC_CHECK_HEADER, but it uses the already-computed -I directories.
+# Like AC_CHECK_HEADERS, but it uses the already-computed -I directories.
 #
-AC_DEFUN([AC_CHECK_X_HEADER], [
+AC_DEFUN([AC_CHECK_X_HEADERS], [
   ac_save_CPPFLAGS="$CPPFLAGS"
   if test \! -z "$includedir" ; then
     CPPFLAGS="$CPPFLAGS -I$includedir"
   fi
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-  AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+  AC_CHECK_HEADERS([$1],[$2],[$3],[$4])
   CPPFLAGS="$ac_save_CPPFLAGS"])
 
 # Like AC_CHECK_LIB, but it uses the already-computed -I and -L directories.
@@ -160,11 +159,10 @@
 dnl ---------------------------------------------------------------------------
 
 have_xinput=no
-AC_CHECK_LIB(Xi, XListInputDevices,
-  [AC_CHECK_HEADER(X11/extensions/XInput.h,
+AC_CHECK_X_LIB(Xi, XListInputDevices,
+  [AC_CHECK_X_HEADERS(X11/extensions/XInput.h,
      have_xinput=yes
-     XINPUT_LIBS="-lXi"
-     AC_DEFINE(HAVE_XINPUT, 1, [Define if XInput extension is available]),
+     XINPUT_LIBS="-lXi",
 	  :, [#include <X11/Xlib.h>])], : ,
        -lXi $x_libs)
 AM_CONDITIONAL(HAVE_XINPUT, [test $have_xinput = yes])
@@ -175,11 +173,10 @@
 dnl ---------------------------------------------------------------------------
 
 have_randr=no
-AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
-  [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
+AC_CHECK_X_LIB(Xrandr, XRRUpdateConfiguration,
+  [AC_CHECK_X_HEADERS(X11/extensions/Xrandr.h,
      have_randr=yes
-     RANDR_LIBS="-lXrandr -lXrender"
-     AC_DEFINE(HAVE_RANDR, 1, [Define if Xrandr extension is available]),
+     RANDR_LIBS="-lXrandr -lXrender",
 	  :, [#include <X11/Xlib.h>])], : ,
        -lXrandr -lXrender $x_libs)
 AC_SUBST(RANDR_LIBS)
@@ -199,16 +196,13 @@
 dnl - Keyboard plugin stuff
 dnl ---------------------------------------------------------------------------
 
-AC_CHECK_HEADERS([X11/Xlib.h])
-
 AC_CHECK_X_LIB(Xxf86misc, XF86MiscQueryExtension, [
-  AC_CHECK_HEADERS([X11/extensions/xf86misc.h], [XF86MISC_LIBS="-lXxf86misc"],[],
-[#if HAVE_X11_XLIB_H
-#include <X11/Xlib.h>
-#endif
-])], [true], -lXext -lX11)
+  AC_CHECK_X_HEADERS([X11/extensions/xf86misc.h],
+      [XF86MISC_LIBS="-lXxf86misc"], :,
+      [#include <X11/Xlib.h>])], : ,
+      -lXxf86misc $x_libs)
 AC_SUBST(XF86MISC_LIBS)
-AC_CHECK_HEADERS(X11/extensions/XKB.h)
+AC_CHECK_X_HEADERS([X11/extensions/XKB.h])
 
 PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4 libxklavier >= 3.8])
 AC_SUBST(LIBGNOMEKBD_CFLAGS)

Modified: trunk/plugins/mouse/gsd-mouse-manager.c
==============================================================================
--- trunk/plugins/mouse/gsd-mouse-manager.c	(original)
+++ trunk/plugins/mouse/gsd-mouse-manager.c	Sat Nov 29 11:33:29 2008
@@ -39,7 +39,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <X11/keysym.h>
 
-#ifdef HAVE_XINPUT
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
 #include <X11/extensions/XInput.h>
 #endif
 #include <gconf/gconf.h>
@@ -155,7 +155,7 @@
 }
 
 
-#ifdef HAVE_XINPUT
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
 static gboolean
 supports_xinput_devices (void)
 {
@@ -226,7 +226,7 @@
         }
 }
 
-#ifdef HAVE_XINPUT
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
 static gboolean
 xinput_device_has_buttons (XDeviceInfo *device_info)
 {
@@ -353,7 +353,7 @@
         gsize buttons_capacity = 16;
         gint n_buttons, i;
 
-#ifdef HAVE_XINPUT
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
         if (supports_xinput_devices ()) {
                 set_xinput_devices_left_handed (left_handed);
         }
@@ -718,7 +718,7 @@
                                           GCONF_MOUSE_A11Y_DIR,
                                           (GConfClientNotifyFunc) mouse_callback);
 
-#ifdef HAVE_XINPUT
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
         set_devicepresence_handler (manager);
 #endif
         set_mouse_settings (manager);
@@ -773,7 +773,7 @@
 
         set_locate_pointer (manager, FALSE);
 
-#ifdef HAVE_XINPUT
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
         gdk_window_remove_filter (NULL, devicepresence_filter, manager);
 #endif
 }

Modified: trunk/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- trunk/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ trunk/plugins/xrandr/gsd-xrandr-manager.c	Sat Nov 29 11:33:29 2008
@@ -44,7 +44,7 @@
 #include <libgnomeui/gnome-rr.h>
 #include <libgnomeui/gnome-rr-labeler.h>
 
-#ifdef HAVE_RANDR
+#ifdef HAVE_X11_EXTENSIONS_XRANDR_H
 #include <X11/extensions/Xrandr.h>
 #endif
 
@@ -268,7 +268,7 @@
 
         widget->state = GTK_STATE_NORMAL;
 
-        return FALSE;        
+        return FALSE;
 }
 
 /* See the comment in output_title_event_box_expose_event_cb() about this funny label widget */
@@ -372,7 +372,7 @@
                 GNOME_RR_ROTATION_270
                 /* We don't allow REFLECT_X or REFLECT_Y for now, as gnome-display-properties doesn't allow them, either */
         };
-                
+
         struct GsdXrandrManagerPrivate *priv = manager->priv;
         GnomeRRRotation current_rotation;
         int i;