gpointing-device-settings r117 - in trunk: modules src test

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Thu Mar  5 03:27:30 2009
New Revision: 117
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=117&view=rev

Log:
gpds_xinput_get_property -> gpds_xinput_get_int_property.

Modified:
   trunk/modules/gpds-touchpad-ui.c
   trunk/modules/gpds-trackpoint-ui.c
   trunk/src/gpds-xinput.c
   trunk/src/gpds-xinput.h
   trunk/test/test-xinput.c

Modified: trunk/modules/gpds-touchpad-ui.c
==============================================================================
--- trunk/modules/gpds-touchpad-ui.c	(original)
+++ trunk/modules/gpds-touchpad-ui.c	Thu Mar  5 03:27:30 2009
@@ -562,10 +562,10 @@
 {
     GError *error = NULL;
 
-    if (!gpds_xinput_get_property(xinput,
-                                  gpds_touchpad_xinput_get_name(property),
-                                  &error,
-                                  values, n_values)) {
+    if (!gpds_xinput_get_int_property(xinput,
+                                      gpds_touchpad_xinput_get_name(property),
+                                      &error,
+                                      values, n_values)) {
         if (error) {
             show_error(error);
             g_error_free(error);

Modified: trunk/modules/gpds-trackpoint-ui.c
==============================================================================
--- trunk/modules/gpds-trackpoint-ui.c	(original)
+++ trunk/modules/gpds-trackpoint-ui.c	Thu Mar  5 03:27:30 2009
@@ -381,10 +381,10 @@
 {
     GError *error = NULL;
 
-    if (!gpds_xinput_get_property(xinput,
-                                  property_name,
-                                  &error,
-                                  values, n_values)) {
+    if (!gpds_xinput_get_int_property(xinput,
+                                      property_name,
+                                      &error,
+                                      values, n_values)) {
         if (error) {
             show_error(error);
             g_error_free(error);

Modified: trunk/src/gpds-xinput.c
==============================================================================
--- trunk/src/gpds-xinput.c	(original)
+++ trunk/src/gpds-xinput.c	Thu Mar  5 03:27:30 2009
@@ -377,11 +377,11 @@
 }
 
 gboolean
-gpds_xinput_get_property (GpdsXInput *xinput,
-                          const gchar *property_name,
-                          GError **error,
-                          gint **values,
-                          gulong *n_values)
+gpds_xinput_get_int_property (GpdsXInput *xinput,
+                              const gchar *property_name,
+                              GError **error,
+                              gint **values,
+                              gulong *n_values)
 {
     XDevice *device;
 

Modified: trunk/src/gpds-xinput.h
==============================================================================
--- trunk/src/gpds-xinput.h	(original)
+++ trunk/src/gpds-xinput.h	Thu Mar  5 03:27:30 2009
@@ -56,19 +56,26 @@
 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,
-                                            const gchar *property_name,
-                                            gint format_type,
-                                            GError **error,
-                                            gint *properties,
-                                            guint n_properties);
-gboolean    gpds_xinput_get_property       (GpdsXInput *xinput,
-                                            const gchar *property_name,
-                                            GError **error,
-                                            gint **values,
-                                            gulong *n_values);
-
+GpdsXInput *gpds_xinput_new                  (const gchar *device_name);
+gboolean    gpds_xinput_set_int_properties   (GpdsXInput *xinput,
+                                              const gchar *property_name,
+                                              gint format_type,
+                                              GError **error,
+                                              gint *properties,
+                                              guint n_properties);
+gboolean    gpds_xinput_get_int_property     (GpdsXInput *xinput,
+                                              const gchar *property_name,
+                                              GError **error,
+                                              gint **values,
+                                              gulong *n_values);
+#if 0
+gboolean    gpds_xinput_set_float_properties (GpdsXInput *xinput,
+                                              const gchar *property_name,
+                                              gint format_type,
+                                              GError **error,
+                                              gdouble *properties,
+                                              guint n_properties);
+#endif
 G_END_DECLS
 
 #endif /* __GPDS_XINPUT_H__ */

Modified: trunk/test/test-xinput.c
==============================================================================
--- trunk/test/test-xinput.c	(original)
+++ trunk/test/test-xinput.c	Thu Mar  5 03:27:30 2009
@@ -40,10 +40,10 @@
 {
     cut_trace(test_new());
 
-    cut_assert_true(gpds_xinput_get_property(xinput,
-                                             "Evdev Middle Button Emulation",
-                                             &error,
-                                             &values, &n_values));
+    cut_assert_true(gpds_xinput_get_int_property(xinput,
+                                                 "Evdev Middle Button Emulation",
+                                                 &error,
+                                                 &values, &n_values));
     gcut_assert_error(error);
     cut_assert_equal_int(1, n_values);