rpms/gpointing-device-settings/F-12 gpds-1.5.1-set_tapping_time_from_preference.patch, NONE, 1.1 gpointing-device-settings.spec, 1.2, 1.3

[Gianluca Sforna]

Author: giallu

Update of /cvs/extras/rpms/gpointing-device-settings/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21414

Modified Files:
	gpointing-device-settings.spec 
Added Files:
	gpds-1.5.1-set_tapping_time_from_preference.patch 
Log Message:
* Mon May 17 2010 Gianluca Sforna <giallu gmail com> - 1.5.1-2
- add patch from upstream for #592786


gpds-1.5.1-set_tapping_time_from_preference.patch:
 gpds-touchpad-ui.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE gpds-1.5.1-set_tapping_time_from_preference.patch ---
>From 70add06dec8413965f3e98b6ba9a3c82168ea72c Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <poincare at ikezoe.net>
Date: Tue, 16 Mar 2010 10:56:17 +0000
Subject: Fix crash.

We need to get xinput property if there is no gconf value for tapping time.

Fix for #613022.
---
diff --git a/modules/gpds-touchpad-ui.c b/modules/gpds-touchpad-ui.c
index 3bbcda6..a1cd31b 100644
--- a/modules/gpds-touchpad-ui.c
+++ b/modules/gpds-touchpad-ui.c
@@ -1067,8 +1067,14 @@ set_tapping_time_from_preference (GpdsUI *ui, GtkBuilder *builder)
         }
     }
 
-    if (!gpds_ui_get_gconf_int(ui, GPDS_TOUCHPAD_TAP_TIME_KEY, &value))
+    if (!gpds_ui_get_gconf_int(ui, GPDS_TOUCHPAD_TAP_TIME_KEY, &value) && !values) {
+        if (!gpds_xinput_ui_get_xinput_int_property(GPDS_XINPUT_UI(ui),
+                                                    GPDS_TOUCHPAD_TAP_TIME,
+                                                    &values, &n_values)) {
+            return;
+        }
         value = values[0];
+    }
 
     double_value = value;
     object = gpds_ui_get_ui_object_by_name(GPDS_UI(ui), "tapping_time_scale");
--
cgit v0.8.3.1


Index: gpointing-device-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/gpointing-device-settings/F-12/gpointing-device-settings.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gpointing-device-settings.spec	15 Apr 2010 21:50:02 -0000	1.2
+++ gpointing-device-settings.spec	25 May 2010 15:06:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gpointing-device-settings
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Configuration tool for pointing devices
 
 Group:          Applications/System
@@ -27,6 +27,9 @@ Requires(preun):GConf2
 Obsoletes:      gsynaptics < 0.9.17
 Provides:       gsynaptics = %{version}-%{release}
 
+# Upstream patch from https://bugzilla.gnome.org/show_bug.cgi?id=613022
+Patch0:         gpds-1.5.1-set_tapping_time_from_preference.patch
+
 
 %description
 GUI tool for setting pointing device such as TrackPoint or Touchpad. It
@@ -47,6 +50,7 @@ Development headers and libraries for %{
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -131,6 +135,9 @@ fi
 
 
 %changelog
+* Mon May 17 2010 Gianluca Sforna <giallu gmail com> - 1.5.1-2
+- add patch from upstream for #592786
+
 * Wed Apr 14 2010 Gianluca Sforna <giallu gmail com> - 1.5.1-1
 - new upstream release
 - drop upstreamed patches