gpointing-device-settings r212 - in trunk/modules: . gnome-settings-daemon-plugins

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Sat Mar 14 04:09:19 2009
New Revision: 212
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=212&view=rev

Log:
fix horizontal and vertical scrooling inversion.

Modified:
   trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-manager.c
   trunk/modules/gpds-mouse-ui.c

Modified: trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-manager.c
==============================================================================
--- trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-manager.c	(original)
+++ trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-manager.c	Sat Mar 14 04:09:19 2009
@@ -84,14 +84,14 @@
         return;
     }
 
-    if (y_enable) {
+    if (x_enable) {
         properties[0] = 6;
         properties[1] = 7;
     } else {
         properties[0] = 0;
         properties[1] = 0;
     }
-    if (x_enable) {
+    if (y_enable) {
         properties[2] = 4;
         properties[3] = 5;
     } else {

Modified: trunk/modules/gpds-mouse-ui.c
==============================================================================
--- trunk/modules/gpds-mouse-ui.c	(original)
+++ trunk/modules/gpds-mouse-ui.c	Sat Mar 14 04:09:19 2009
@@ -238,7 +238,7 @@
 
     builder = gpds_ui_get_builder(GPDS_UI(ui));
 
-    button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "wheel_emulation_vertical"));
+    button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "wheel_emulation_horizontal"));
     active = gtk_toggle_button_get_active(button);
     if (active) {
         properties[0] = 6;
@@ -248,7 +248,7 @@
         properties[1] = 0;
     }
 
-    button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "wheel_emulation_horizontal"));
+    button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "wheel_emulation_vertical"));
     active = gtk_toggle_button_get_active(button);
     if (active) {
         properties[2] = 4;