--- gnome-control-center-2.32.0/capplets/mouse/gnome-mouse-properties.c.orig	2010-10-31 21:13:12.035857439 -0500
+++ gnome-control-center-2.32.0/capplets/mouse/gnome-mouse-properties.c	2010-10-31 21:20:01.503749034 -0500
@@ -358,13 +358,18 @@
 					 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 hw supports
+			 * double touch or can emulate it based on finger
+			 * width.
+			 */
+			if (!(data[3] ||(nitems >= 6 && data[5])))
 				gtk_widget_set_sensitive (WID ("scroll_twofinger_radio"), FALSE);
 
 			XFree (data);
