gpointing-device-settings r62 - in trunk: modules src

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Sat Feb 28 10:11:04 2009
New Revision: 62
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=62&view=rev

Log:
remove gpds-xinput.h from gpointing-device-settings.h since some module
would not need XInput.

Modified:
   trunk/modules/Makefile.am
   trunk/modules/gpds-touchpad-ui.c
   trunk/modules/gpds-trackpoint-ui.c
   trunk/src/gpointing-device-settings.h

Modified: trunk/modules/Makefile.am
==============================================================================
--- trunk/modules/Makefile.am	(original)
+++ trunk/modules/Makefile.am	Sat Feb 28 10:11:04 2009
@@ -5,15 +5,15 @@
 	 -I$(top_srcdir)	\
 	 -I$(top_srcdir)/src
 
-AM_CFLAGS =				\
-	$(GPDS_CFLAGS)			\
-	$(GCONF2_CFLAGS)		\
+AM_CFLAGS =			\
+	$(GPDS_CFLAGS)		\
+	$(GCONF2_CFLAGS)	\
 	$(COVERAGE_CFLAGS)
 
 AM_LDFLAGS =			\
-  -avoid-version -module	\
-  -no-undefined 		\
-  -export-dynamic $(LIBTOOL_EXPORT_OPTIONS)
+  	-avoid-version -module	\
+  	-no-undefined 		\
+  	-export-dynamic $(LIBTOOL_EXPORT_OPTIONS)
 
 gpds_module_LTLIBRARIES = 	\
 	trackpoint.la		\

Modified: trunk/modules/gpds-touchpad-ui.c
==============================================================================
--- trunk/modules/gpds-touchpad-ui.c	(original)
+++ trunk/modules/gpds-touchpad-ui.c	Sat Feb 28 10:11:04 2009
@@ -24,6 +24,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gpointing-device-settings.h>
+#include <gpds-xinput.h>
 #include <gconf/gconf-client.h>
 
 #include "gpds-touchpad-gconf.h"

Modified: trunk/modules/gpds-trackpoint-ui.c
==============================================================================
--- trunk/modules/gpds-trackpoint-ui.c	(original)
+++ trunk/modules/gpds-trackpoint-ui.c	Sat Feb 28 10:11:04 2009
@@ -24,7 +24,9 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gpointing-device-settings.h>
+#include <gpds-xinput.h>
 #include <gconf/gconf-client.h>
+
 #include "gpds-trackpoint-gconf.h"
 
 #define DEVICE_NAME "TPPS/2 IBM TrackPoint"

Modified: trunk/src/gpointing-device-settings.h
==============================================================================
--- trunk/src/gpointing-device-settings.h	(original)
+++ trunk/src/gpointing-device-settings.h	Sat Feb 28 10:11:04 2009
@@ -22,7 +22,6 @@
 
 #include <gpds-ui.h>
 #include <gpds-module-impl.h>
-#include <gpds-xinput.h>
 
 #endif /* __GPOINTING_DEVICE_SETTINGS_H__ */
 /*