rpms/control-center/F-12 control-center.spec, 1.515, 1.516 disable-touchpad-on-capabilities.patch, 1.1, 1.2

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/control-center/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13049

Modified Files:
	control-center.spec disable-touchpad-on-capabilities.patch 
Log Message:
* Tue Jan 19 2010 Peter Hutterer <peter.hutterer at redhat.com> 2.28.1-16
- Update disable-touch-pad-on-capabilities.patch: don't forcibly enable
  tapping for touchpads with a single button. (#548978)



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -p -r1.515 -r1.516
--- control-center.spec	18 Jan 2010 20:46:52 -0000	1.515
+++ control-center.spec	19 Jan 2010 01:40:47 -0000	1.516
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -103,7 +103,7 @@ Patch99: default-applications.patch
 Patch100: shell-common-tasks.patch
 
 # disable touchpad GUI parts if the touchpad can't do two-finger/tapping
-# already upstream
+# Includes https://bugzilla.gnome.org/show_bug.cgi?id=606793
 Patch101: disable-touchpad-on-capabilities.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -434,6 +434,10 @@ fi
 
 
 %changelog
+* Tue Jan 19 2010 Peter Hutterer <peter.hutterer at redhat.com> 2.28.1-16
+- Update disable-touch-pad-on-capabilities.patch: don't forcibly enable
+  tapping for touchpads with a single button. (#548978)
+
 * Mon Jan 18 2010 Matthias Clasen <mclasen at redhat.com> 2.28.1-15
 - Update Marathi translation
 

disable-touchpad-on-capabilities.patch:
 gnome-mouse-properties.c |   52 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

Index: disable-touchpad-on-capabilities.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/disable-touchpad-on-capabilities.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- disable-touchpad-on-capabilities.patch	18 Nov 2009 00:36:01 -0000	1.1
+++ disable-touchpad-on-capabilities.patch	19 Jan 2010 01:40:47 -0000	1.2
@@ -6,8 +6,8 @@ Subject: Disable two-finger scrolling/ta
 Touchpads that can't do two-finger cannot two-finger scroll - disable this
 scroll method.
 
-Touchpads that don't have physical buttons mustn't disable tapping - set to
-on by default and disable checkbox.
+Touchpads that don't have a physical left button mustn't disable tapping -
+set to on by default and disable checkbox.
 
 Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
 ---
@@ -51,7 +51,7 @@ index 816eab5..fe88434 100644
 +					 &bytes_after, &data) == Success) && (realtype != None)) {
 +			/* Property data is booleans for has_left, has_middle,
 +			 * has_right, has_double, has_triple */
-+			if (!data[0] || !data[1] || !data[2]) {
++			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);
 +			}