gpointing-device-settings r6 - trunk/src

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Tue Feb 24 22:56:51 2009
New Revision: 6
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=6&view=rev

Log:
Set -1, -1 to disable horizontal/vertical scrolling.

Modified:
   trunk/src/gtrackpoint-ui.c
   trunk/src/gxinput.c

Modified: trunk/src/gtrackpoint-ui.c
==============================================================================
--- trunk/src/gtrackpoint-ui.c	(original)
+++ trunk/src/gtrackpoint-ui.c	Tue Feb 24 22:56:51 2009
@@ -194,14 +194,11 @@
                               first_value, second_value,
                               NULL);
     } else {
-        /* This call causes crash. why? */ 
-        /*
         g_xinput_set_property(xinput,
                               property_name,
                               &error,
-                              0,
+                              -1, -1,
                               NULL);
-        */
     }
 
     if (error) {
@@ -215,7 +212,7 @@
 {
     GTrackPointUIPriv *priv = G_TRACK_POINT_UI_GET_PRIVATE(user_data);
 
-    set_toggle_scroll_property(priv->xinput, button, WHEEL_EMULATION_X_AXIS, 6, 7);
+    set_toggle_scroll_property(priv->xinput, button, WHEEL_EMULATION_Y_AXIS, 6, 7);
 }
 
 static void
@@ -223,7 +220,7 @@
 {
     GTrackPointUIPriv *priv = G_TRACK_POINT_UI_GET_PRIVATE(user_data);
 
-    set_toggle_scroll_property(priv->xinput, button, WHEEL_EMULATION_Y_AXIS, 4, 5);
+    set_toggle_scroll_property(priv->xinput, button, WHEEL_EMULATION_X_AXIS, 4, 5);
 }
 
 static void
@@ -356,9 +353,9 @@
     set_integer_property(priv->xinput, WHEEL_EMULATION_TIMEOUT,
                          priv->builder, "wheel_emulation_timeout");
 
-    set_scroll_property(priv->xinput, WHEEL_EMULATION_X_AXIS,
-                        priv->builder, "wheel_emulation_vertical");
     set_scroll_property(priv->xinput, WHEEL_EMULATION_Y_AXIS,
+                        priv->builder, "wheel_emulation_vertical");
+    set_scroll_property(priv->xinput, WHEEL_EMULATION_X_AXIS,
                         priv->builder, "wheel_emulation_horizontal");
 }
 

Modified: trunk/src/gxinput.c
==============================================================================
--- trunk/src/gxinput.c	(original)
+++ trunk/src/gxinput.c	Tue Feb 24 22:56:51 2009
@@ -150,7 +150,7 @@
 GQuark
 g_xinput_error_quark (void)
 {
-    return g_quark_from_static_string("g-track-point-xinput-error-quark");
+    return g_quark_from_static_string("g-xinput-error-quark");
 }
 
 GXInput *