gpointing-device-settings r127 - in trunk: modules/common modules/gnome-settings-daemon-plugins src test

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Fri Mar  6 07:23:32 2009
New Revision: 127
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=127&view=rev

Log:
Use gpds_xinput_utils functions.

Modified:
   trunk/modules/common/gpds-touchpad-xinput.c
   trunk/modules/common/gpds-trackpoint-xinput.c
   trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
   trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.c
   trunk/src/Makefile.am
   trunk/src/gpds-xinput-utils.h
   trunk/src/gpds-xinput.c
   trunk/src/gpds-xinput.h
   trunk/test/Makefile.am

Modified: trunk/modules/common/gpds-touchpad-xinput.c
==============================================================================
--- trunk/modules/common/gpds-touchpad-xinput.c	(original)
+++ trunk/modules/common/gpds-touchpad-xinput.c	Fri Mar  6 07:23:32 2009
@@ -25,6 +25,7 @@
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <gpds-xinput.h>
+#include <gpds-xinput-utils.h>
 
 static const gchar *touchpad_device_names[] = {
     "SynPS/2 Synaptics TouchPad",
@@ -114,7 +115,7 @@
     gint i;
 
     for (i = 0; i < n_touchpad_device_names; i++) {
-        if (gpds_xinput_exist_device(touchpad_device_names[i]))
+        if (gpds_xinput_utils_exist_device(touchpad_device_names[i]))
             return touchpad_device_names[i];
     }
     return NULL;

Modified: trunk/modules/common/gpds-trackpoint-xinput.c
==============================================================================
--- trunk/modules/common/gpds-trackpoint-xinput.c	(original)
+++ trunk/modules/common/gpds-trackpoint-xinput.c	Fri Mar  6 07:23:32 2009
@@ -25,6 +25,7 @@
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <gpds-xinput.h>
+#include <gpds-xinput-utils.h>
 
 static const gchar *track_point_device_names[] = {
     "TPPS/2 IBM TrackPoint"
@@ -90,7 +91,7 @@
     gint i;
 
     for (i = 0; i < n_track_point_device_names; i++) {
-        if (gpds_xinput_exist_device(track_point_device_names[i]))
+        if (gpds_xinput_utils_exist_device(track_point_device_names[i]))
             return track_point_device_names[i];
     }
     return NULL;

Modified: trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
==============================================================================
--- trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c	(original)
+++ trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c	Fri Mar  6 07:23:32 2009
@@ -25,6 +25,7 @@
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <gpds-xinput.h>
+#include <gpds-xinput-utils.h>
 
 #include "gpds-touchpad-definitions.h"
 #include "gpds-touchpad-xinput.h"
@@ -90,7 +91,7 @@
     if (!device_name)
         return;
 
-    if (!gpds_xinput_exist_device(device_name))
+    if (!gpds_xinput_utils_exist_device(device_name))
         return;
 
     xinput = gpds_xinput_new(device_name);

Modified: trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.c
==============================================================================
--- trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.c	(original)
+++ trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.c	Fri Mar  6 07:23:32 2009
@@ -25,6 +25,7 @@
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <gpds-xinput.h>
+#include <gpds-xinput-utils.h>
 
 #include "gpds-trackpoint-definitions.h"
 #include "gpds-trackpoint-xinput.h"
@@ -90,7 +91,7 @@
     if (!device_name)
         return;
 
-    if (!gpds_xinput_exist_device(device_name))
+    if (!gpds_xinput_utils_exist_device(device_name))
         return;
 
     xinput = gpds_xinput_new(device_name);

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Mar  6 07:23:32 2009
@@ -4,14 +4,16 @@
 	gpointing-device-settings.h	\
 	gpds-module-impl.h		\
 	gpds-ui.h			\
-	gpds-xinput.h
+	gpds-xinput.h                   \
+	gpds-xinput-utils.h
 
 libgpds_la_SOURCES =			\
 	$(libgpds_public_headers)	\
 	gpds-module.c			\
 	gpds-module.h			\
 	gpds-ui.c			\
-	gpds-xinput.c
+	gpds-xinput.c                   \
+	gpds-xinput-utils.c
 
 AM_CFLAGS = -DG_LOG_DOMAIN=\"GPointingDeviceSettings\"
 

Modified: trunk/src/gpds-xinput-utils.h
==============================================================================
--- trunk/src/gpds-xinput-utils.h	(original)
+++ trunk/src/gpds-xinput-utils.h	Fri Mar  6 07:23:32 2009
@@ -33,7 +33,7 @@
     GPDS_XINPUT_UTILS_ERROR_NO_DEVICE,
     GPDS_XINPUT_UTILS_ERROR_UNABLE_TO_OPEN_DEVICE,
     GPDS_XINPUT_UTILS_ERROR_NO_FLOAT_ATOM
-} GpdsXInputError;
+} GpdsXInputUtilsError;
 
 GQuark       gpds_xinput_utils_error_quark              (void);
 XDeviceInfo *gpds_xinput_utils_get_device_info          (const gchar *device_name);

Modified: trunk/src/gpds-xinput.c
==============================================================================
--- trunk/src/gpds-xinput.c	(original)
+++ trunk/src/gpds-xinput.c	Fri Mar  6 07:23:32 2009
@@ -511,12 +511,6 @@
     return TRUE;
 }
 
-gboolean
-gpds_xinput_exist_device (const gchar *device_name)
-{
-    return get_device_info(device_name) ? TRUE : FALSE;
-}
-
 /*
 vi:ts=4:nowrap:ai:expandtab:sw=4
 */

Modified: trunk/src/gpds-xinput.h
==============================================================================
--- trunk/src/gpds-xinput.h	(original)
+++ trunk/src/gpds-xinput.h	Fri Mar  6 07:23:32 2009
@@ -55,7 +55,6 @@
 
 GQuark      gpds_xinput_error_quark        (void);
 GType       gpds_xinput_get_type           (void) G_GNUC_CONST;
-gboolean    gpds_xinput_exist_device       (const gchar *device_name);
 
 GpdsXInput *gpds_xinput_new                  (const gchar *device_name);
 gboolean    gpds_xinput_set_int_properties   (GpdsXInput *xinput,
@@ -80,6 +79,7 @@
                                               gdouble **properties,
                                               gulong *n_properties);
 
+
 G_END_DECLS
 
 #endif /* __GPDS_XINPUT_H__ */

Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am	(original)
+++ trunk/test/Makefile.am	Fri Mar  6 07:23:32 2009
@@ -5,6 +5,7 @@
 noinst_LTLIBRARIES =	\
 	suite_gpds_test.la	\
 	test-xinput.la		\
+	test-xinput-utils.la	\
 	test-module.la		\
 	test-ui.la
 endif
@@ -35,6 +36,7 @@
 suite_gpds_test_la_SOURCES = gpds-test-suite.c
 
 test_xinput_la_SOURCES = test-xinput.c
+test_xinput_utils_la_SOURCES = test-xinput-utils.c
 test_module_la_SOURCES = test-module.c
 test_ui_la_SOURCES = test-ui.c