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

[hiikezoe svn gnome org]

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

Log:
gpds_xinput_get_int_property -> gpds_xinput_get_int_properties.

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:35 2009
@@ -557,15 +557,15 @@
 }
 
 static gboolean
-get_integer_property (GpdsXInput *xinput, GpdsTouchpadProperty property,
+get_integer_properties (GpdsXInput *xinput, GpdsTouchpadProperty property,
                       gint **values, gulong *n_values)
 {
     GError *error = NULL;
 
-    if (!gpds_xinput_get_int_property(xinput,
-                                      gpds_touchpad_xinput_get_name(property),
-                                      &error,
-                                      values, n_values)) {
+    if (!gpds_xinput_get_int_properties(xinput,
+                                        gpds_touchpad_xinput_get_name(property),
+                                        &error,
+                                        values, n_values)) {
         if (error) {
             show_error(error);
             g_error_free(error);
@@ -590,8 +590,8 @@
     gint value;
     gboolean dir_exists;
 
-    if (!get_integer_property(ui->xinput, property,
-                              &values, &n_values)) {
+    if (!get_integer_properties(ui->xinput, property,
+                                &values, &n_values)) {
         return;
     }
 
@@ -617,8 +617,8 @@
     gulong n_values;
     gboolean enable, dir_exists;
 
-    if (!get_integer_property(ui->xinput, property,
-                              &values, &n_values)) {
+    if (!get_integer_properties(ui->xinput, property,
+                                &values, &n_values)) {
         return FALSE;
     }
 
@@ -643,8 +643,8 @@
     gulong n_values;
     gboolean enable, dir_exists;
 
-    if (!get_integer_property(ui->xinput, GPDS_TOUCHPAD_EDGE_SCROLLING,
-                              &values, &n_values)) {
+    if (!get_integer_properties(ui->xinput, GPDS_TOUCHPAD_EDGE_SCROLLING,
+                                &values, &n_values)) {
         return;
     }
 
@@ -683,9 +683,9 @@
     gulong n_values;
     gint distance;
 
-    if (!get_integer_property(ui->xinput,
-                              GPDS_TOUCHPAD_SCROLLING_DISTANCE,
-                              &values, &n_values)) {
+    if (!get_integer_properties(ui->xinput,
+                                GPDS_TOUCHPAD_SCROLLING_DISTANCE,
+                                &values, &n_values)) {
         return;
     }
 
@@ -737,9 +737,9 @@
     gulong n_values;
     GpdsTouchpadCircularScrollingTrigger trigger;
 
-    if (!get_integer_property(ui->xinput,
-                              GPDS_TOUCHPAD_CIRCULAR_SCROLLING_TRIGGER,
-                              &values, &n_values)) {
+    if (!get_integer_properties(ui->xinput,
+                                GPDS_TOUCHPAD_CIRCULAR_SCROLLING_TRIGGER,
+                                &values, &n_values)) {
         return;
     }
 
@@ -762,9 +762,9 @@
     gulong n_values;
     GpdsTouchpadUseType type;
 
-    if (!get_integer_property(ui->xinput,
-                              GPDS_TOUCHPAD_OFF,
-                              &values, &n_values)) {
+    if (!get_integer_properties(ui->xinput,
+                                GPDS_TOUCHPAD_OFF,
+                                &values, &n_values)) {
         return;
     }
 

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:35 2009
@@ -376,15 +376,15 @@
 }
 
 static gboolean
-get_integer_property (GpdsXInput *xinput, const gchar *property_name,
-                      gint **values, gulong *n_values)
+get_integer_properties (GpdsXInput *xinput, const gchar *property_name,
+                        gint **values, gulong *n_values)
 {
     GError *error = NULL;
 
-    if (!gpds_xinput_get_int_property(xinput,
-                                      property_name,
-                                      &error,
-                                      values, n_values)) {
+    if (!gpds_xinput_get_int_properties(xinput,
+                                        property_name,
+                                        &error,
+                                        values, n_values)) {
         if (error) {
             show_error(error);
             g_error_free(error);
@@ -412,8 +412,8 @@
 
     property_name = gpds_track_point_xinput_get_name(property);
 
-    if (!get_integer_property(ui->xinput, property_name,
-                              &values, &n_values)) {
+    if (!get_integer_properties(ui->xinput, property_name,
+                                &values, &n_values)) {
         return;
     }
 
@@ -444,8 +444,8 @@
 
     property_name = gpds_track_point_xinput_get_name(property);
 
-    if (!get_integer_property(ui->xinput, property_name,
-                              &values, &n_values)) {
+    if (!get_integer_properties(ui->xinput, property_name,
+                                &values, &n_values)) {
         return;
     }
 
@@ -476,8 +476,8 @@
 
     property_name = gpds_track_point_xinput_get_name(GPDS_TRACK_POINT_WHEEL_EMULATION_AXES);
 
-    if (!get_integer_property(ui->xinput, property_name,
-                              &values, &n_values)) {
+    if (!get_integer_properties(ui->xinput, property_name,
+                                &values, &n_values)) {
         return;
     }
 

Modified: trunk/src/gpds-xinput.c
==============================================================================
--- trunk/src/gpds-xinput.c	(original)
+++ trunk/src/gpds-xinput.c	Thu Mar  5 03:27:35 2009
@@ -313,10 +313,10 @@
 }
 
 static gboolean
-get_int_property (GpdsXInput *xinput,
-                  const gchar *property_name,
-                  GError **error,
-                  gint **values, gulong *n_values)
+get_int_properties (GpdsXInput *xinput,
+                    const gchar *property_name,
+                    GError **error,
+                    gint **values, gulong *n_values)
 {
     XDevice *device;
     Atom atom;
@@ -377,11 +377,11 @@
 }
 
 gboolean
-gpds_xinput_get_int_property (GpdsXInput *xinput,
-                              const gchar *property_name,
-                              GError **error,
-                              gint **values,
-                              gulong *n_values)
+gpds_xinput_get_int_properties (GpdsXInput *xinput,
+                                const gchar *property_name,
+                                GError **error,
+                                gint **values,
+                                gulong *n_values)
 {
     XDevice *device;
 
@@ -391,7 +391,7 @@
     if (!device)
         return FALSE;
 
-    return get_int_property(xinput, property_name, error, values, n_values);
+    return get_int_properties(xinput, property_name, error, values, n_values);
 }
 
 gboolean

Modified: trunk/src/gpds-xinput.h
==============================================================================
--- trunk/src/gpds-xinput.h	(original)
+++ trunk/src/gpds-xinput.h	Thu Mar  5 03:27:35 2009
@@ -63,7 +63,7 @@
                                               GError **error,
                                               gint *properties,
                                               guint n_properties);
-gboolean    gpds_xinput_get_int_property     (GpdsXInput *xinput,
+gboolean    gpds_xinput_get_int_properties   (GpdsXInput *xinput,
                                               const gchar *property_name,
                                               GError **error,
                                               gint **values,

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