--- gnome-control-center-2.30.1/capplets/mouse/gnome-mouse-properties.c.orig	2010-07-23 20:18:54.557234011 -0500
+++ gnome-control-center-2.30.1/capplets/mouse/gnome-mouse-properties.c	2010-07-23 20:26:13.210652641 -0500
@@ -358,13 +358,22 @@
 					 XA_INTEGER, &realtype, &realformat, &nitems,
 					 &bytes_after, &data) == Success) && (realtype != None)) {
 			/* Property data is booleans for has_left, has_middle,
-			 * has_right, has_double, has_triple */
+			 * has_right, has_double, has_triple.  Newer versions
+			 * will also include has_pressure and has_width. */
 			if (!data[0]) {
 				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("tap_to_click_toggle")), TRUE);
 				gtk_widget_set_sensitive (WID ("tap_to_click_toggle"), FALSE);
 			}
 
-			if (!data[3])
+			/* Disable two finger scrolling unless supports
+			 * double touch or can emulate double touch
+			 * with finger width.  
+			 * If doesn't report width property, assume
+			 * it is support and leave up to user to
+			 * configure correctly.
+			 */
+			if (!(data[3] || (bytes_after >= 6 && data[5]) ||
+			      bytes_after < 6))
 				gtk_widget_set_sensitive (WID ("scroll_twofinger_radio"), FALSE);
 
 			XFree (data);
