diff --exclude-from=/home/dang/.diffrc -u -ruN control-center-2.14.1/gnome-settings-daemon/gnome-settings-mouse.c control-center-2.14.1.new/gnome-settings-daemon/gnome-settings-mouse.c
--- control-center-2.14.1/gnome-settings-daemon/gnome-settings-mouse.c	2006-04-10 08:39:57.000000000 -0400
+++ control-center-2.14.1.new/gnome-settings-daemon/gnome-settings-mouse.c	2006-05-16 14:53:44.000000000 -0400
@@ -70,7 +70,9 @@
       }
       /* swap the buttons */
       buttons[left_button - 1] = right_button;
-      buttons[i] = left_button;
+
+      if (i != n_buttons)
+          buttons[i] = left_button;
     }
   /* check if we are not left_handed but are swapped */
   else if (!left_handed && buttons[left_button - 1] == right_button)
@@ -82,7 +84,9 @@
               break;
       }
       /* swap the buttons */
-      buttons[i] = right_button;
+      if (i != n_buttons)
+          buttons[i] = right_button;
+
       buttons[left_button - 1] = left_button;
   }
 }