rpms/gsynaptics/F-9 gsynaptics-0.9.14-do-not-set-zero.patch, NONE, 1.1 gsynaptics-0.9.14-dot-fixes.patch, NONE, 1.1 gsynaptics-0.9.14-pixmap.patch, NONE, 1.1 gsynaptics.spec, 1.17, 1.18

Christoph Wickert (cwickert) fedora-extras-commits at redhat.com
Tue Aug 12 22:46:38 UTC 2008 

Author: cwickert

Update of /cvs/pkgs/rpms/gsynaptics/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23063

Modified Files:
	gsynaptics.spec 
Added Files:
	gsynaptics-0.9.14-do-not-set-zero.patch 
	gsynaptics-0.9.14-dot-fixes.patch 
	gsynaptics-0.9.14-pixmap.patch 
Log Message:
* Tue Aug 12 2008 Christoph Wickert <fedora christoph-wickert de> - 0.9.14-2
- Fix crash on startup, thanks to Sertaç Ö. Yıldız for the pointer (#457540)
- Add patch to not set undefined keys to 0 by Michal ÄŒihaÅ™ (Debian #480744)
- Fix for locales not using "." as decimal seperator (upstream #12498)


gsynaptics-0.9.14-do-not-set-zero.patch:

--- NEW FILE gsynaptics-0.9.14-do-not-set-zero.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## do-not-set-zero.dpatch by Michal ÄŒihaÅ™ <nijel at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Do not set to 0 when some keys are not defined.
## DP: Debian bug #480744.
## DP: Forwarded to https://sourceforge.jp/tracker/index.php?func=detail&aid=12545&group_id=1720&atid=6435

@DPATCH@
diff -urNad gsynaptics-0.9.14~/src/init.c gsynaptics-0.9.14/src/init.c
--- gsynaptics-0.9.14~/src/init.c	2008-02-28 23:27:41.000000000 +0100
+++ gsynaptics-0.9.14/src/init.c	2008-05-17 09:14:12.000000000 +0200
@@ -36,63 +36,148 @@
 {
 	gboolean b_value;
 	gint i_value;
+    GConfValue *gval = NULL;
 
 	if (!gconf_client_dir_exists (gconf, DIRNAME, NULL))
 		return;
 
 	/* touchpad on/off */	
-	b_value = gconf_client_get_bool (gconf, OFF_KEY, NULL);
-	g_synaptics_set_enabled (synaptics, b_value ? 1 : 0);
+	gval = gconf_client_get (gconf, OFF_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_BOOL) {
+			b_value = gconf_value_get_bool(gval);
+			g_synaptics_set_enabled (synaptics, b_value ? 1 : 0);
+		}
+		gconf_value_free(gval);
+	}
 	
 	/* vertical scroll delta */
-	i_value = gconf_client_get_int (gconf, VERTSCROLLDELTA_KEY, NULL);
-	g_synaptics_set_vertical_scroll_delta (synaptics, i_value);
+	gval = gconf_client_get (gconf, VERTSCROLLDELTA_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_INT) {
+			i_value = gconf_value_get_int(gval);
+			g_synaptics_set_vertical_scroll_delta (synaptics, i_value);
+		}
+		gconf_value_free(gval);
+	}
 	
 	/* horizontal scroll delta */
-	i_value = gconf_client_get_int (gconf, HORIZSCROLLDELTA_KEY, NULL);
-	g_synaptics_set_horizontal_scroll_delta (synaptics, i_value);
+	gval = gconf_client_get (gconf, HORIZSCROLLDELTA_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_INT) {
+			i_value = gconf_value_get_int(gval);
+			g_synaptics_set_horizontal_scroll_delta (synaptics, i_value);
+		}
+		gconf_value_free(gval);
+	}
 	
 	/* circular scroll */
-	i_value = gconf_client_get_int (gconf, CIRCSCROLLDELTA_KEY, NULL);
-	b_value = gconf_client_get_bool (gconf, CIRCULARSCROLLING_KEY, NULL);
-	g_synaptics_set_circular_scroll_delta (synaptics, i_value);
-	g_synaptics_set_circular_scroll_enabled (synaptics, b_value);
+	gval = gconf_client_get (gconf, CIRCSCROLLDELTA_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_INT) {
+			i_value = gconf_value_get_int(gval);
+			g_synaptics_set_circular_scroll_delta (synaptics, i_value);
+		}
+		gconf_value_free(gval);
+	}
+	gval = gconf_client_get (gconf, CIRCULARSCROLLING_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_BOOL) {
+			b_value = gconf_value_get_bool(gval);
+			g_synaptics_set_circular_scroll_enabled (synaptics, b_value);
+		}
+		gconf_value_free(gval);
+	}
 	/* the trigger of circular scrolling */
-	i_value = gconf_client_get_int (gconf, CIRCSCROLLTRIGGER_KEY, NULL);
-	g_synaptics_set_circular_scroll_trigger (synaptics, i_value);
+	gval = gconf_client_get (gconf, CIRCSCROLLTRIGGER_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_INT) {
+			i_value = gconf_value_get_int(gval);
+			g_synaptics_set_circular_scroll_trigger (synaptics, i_value);
+		}
+		gconf_value_free(gval);
+	}
 	
 	
 	/* tapping time */
-	i_value = gconf_client_get_int (gconf, MAXTAPTIME_KEY, NULL);
-	g_synaptics_set_tap_time (synaptics, i_value);
+	gval = gconf_client_get (gconf, MAXTAPTIME_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_INT) {
+			i_value = gconf_value_get_int(gval);
+			g_synaptics_set_tap_time (synaptics, i_value);
+		}
+		gconf_value_free(gval);
+	}
 	
 	/* fast taps */
-	b_value = gconf_client_get_bool (gconf, FASTTAPS_KEY, NULL);
-	g_synaptics_set_fast_taps (synaptics, b_value);
+	gval = gconf_client_get (gconf, FASTTAPS_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_BOOL) {
+			b_value = gconf_value_get_bool(gval);
+			g_synaptics_set_fast_taps (synaptics, b_value);
+		}
+		gconf_value_free(gval);
+	}
 	
 	/* sensitivity */
-	i_value = gconf_client_get_int (gconf, SENSITIVITY_KEY, NULL);
-	g_synaptics_set_sensitivity (synaptics, i_value);
+	gval = gconf_client_get (gconf, SENSITIVITY_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_INT) {
+			i_value = gconf_value_get_int(gval);
+			g_synaptics_set_sensitivity (synaptics, i_value);
+		}
+		gconf_value_free(gval);
+	}
 
 	/* coasting */
-	b_value = gconf_client_get_bool (gconf, COASTENABLE_KEY, NULL);
-	g_synaptics_set_coasting_enabled (synaptics, b_value);
+	gval = gconf_client_get (gconf, COASTENABLE_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_BOOL) {
+			b_value = gconf_value_get_bool(gval);
+			g_synaptics_set_coasting_enabled (synaptics, b_value);
+		}
+		gconf_value_free(gval);
+	}
 	
 	/* edge motion */
-	b_value = gconf_client_get_bool (gconf, EDGEMOTIONUSEALWAYS_KEY, NULL);
-	g_synaptics_set_edge_motion_enabled (synaptics, b_value);
+	gval = gconf_client_get (gconf, EDGEMOTIONUSEALWAYS_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_BOOL) {
+			b_value = gconf_value_get_bool(gval);
+			g_synaptics_set_edge_motion_enabled (synaptics, b_value);
+		}
+		gconf_value_free(gval);
+	}
 
 	/* min speed */
-	i_value = gconf_client_get_int (gconf, MINSPEED_KEY, NULL);
-	g_synaptics_set_min_speed (synaptics, i_value);
+	gval = gconf_client_get (gconf, MINSPEED_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_INT) {
+			i_value = gconf_value_get_int(gval);
+			g_synaptics_set_min_speed (synaptics, i_value);
+		}
+		gconf_value_free(gval);
+	}
 
 	/* max speed */
-	i_value = gconf_client_get_int (gconf, MAXSPEED_KEY, NULL);
-	g_synaptics_set_max_speed (synaptics, i_value);
+	gval = gconf_client_get (gconf, MAXSPEED_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_INT) {
+			i_value = gconf_value_get_int(gval);
+			g_synaptics_set_max_speed (synaptics, i_value);
+		}
+		gconf_value_free(gval);
+	}
 
 	/* accel factor */
-	i_value = gconf_client_get_int (gconf, ACCELFACTOR_KEY, NULL);
-	g_synaptics_set_accel_factor (synaptics, i_value);
+	gval = gconf_client_get (gconf, ACCELFACTOR_KEY, NULL);
+	if (gval != NULL) {
+		if (gval->type == GCONF_VALUE_INT) {
+			i_value = gconf_value_get_int(gval);
+			g_synaptics_set_accel_factor (synaptics, i_value);
+		}
+		gconf_value_free(gval);
+	}
 
 }
 

gsynaptics-0.9.14-dot-fixes.patch:

--- NEW FILE gsynaptics-0.9.14-dot-fixes.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## dot-fixes.dpatch by Unknown
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix format strings to always use . as decimal separator, see 
## DP: https://sourceforge.jp/tracker/index.php?func=detail&aid=12498&group_id=1720&atid=6435
## DP: Forwarded to https://sourceforge.jp/tracker/index.php?func=detail&aid=12544&group_id=1720&atid=6435

@DPATCH@
diff -urNad gsynaptics-0.9.14~/src/gsynaptics.c gsynaptics-0.9.14/src/gsynaptics.c
--- gsynaptics-0.9.14~/src/gsynaptics.c	2008-02-28 23:21:17.000000000 +0100
+++ gsynaptics-0.9.14/src/gsynaptics.c	2008-05-17 08:36:54.000000000 +0200
@@ -713,8 +713,9 @@
 	if (priv->synclient)
 	{
 		gchar *command;
-		command = g_strdup_printf ("synclient AccelFactor=%f",
-			       		   (gdouble)value / 1000);
+		char strval[G_ASCII_DTOSTR_BUF_SIZE];
+		g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000);
+		command = g_strdup_printf ("synclient AccelFactor=%s", strval);
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
@@ -734,8 +735,9 @@
 	if (priv->synclient)
 	{
 		gchar *command;
-		command = g_strdup_printf ("synclient MaxSpeed=%f",
-			       		   (gdouble)value / 1000);
+		char strval[G_ASCII_DTOSTR_BUF_SIZE];
+		g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000);
+		command = g_strdup_printf ("synclient MaxSpeed=%s", strval);
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
@@ -755,8 +757,9 @@
 	if (priv->synclient)
 	{
 		gchar *command;
-		command = g_strdup_printf ("synclient MinSpeed=%f",
-			       		   (gdouble)value / 1000);
+		char strval[G_ASCII_DTOSTR_BUF_SIZE];
+		g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000);
+		command = g_strdup_printf ("synclient MinSpeed=%s", strval);
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
@@ -822,8 +825,10 @@
 	if (priv->synclient)
 	{
 		gchar *command;
-		command = g_strdup_printf ("synclient CoastingSpeedThreshold=%f",
-			       		   thresh);
+		char strval[G_ASCII_DTOSTR_BUF_SIZE];
+		g_ascii_dtostr(strval, sizeof(strval), thresh);
+		command = g_strdup_printf ("synclient CoastingSpeed=%s",
+			       		   strval);
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
@@ -843,8 +848,9 @@
 	if (priv->synclient)
 	{
 		gchar *command;
-		command = g_strdup_printf ("synclient CircScrollDelta=%f",
-			       		   (gdouble)delta / 1000);
+		char strval[G_ASCII_DTOSTR_BUF_SIZE];
+		g_ascii_dtostr(strval, sizeof(strval), (gdouble)delta / 1000);
+		command = g_strdup_printf ("synclient CircScrollDelta=%s", strval);
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}

gsynaptics-0.9.14-pixmap.patch:

--- NEW FILE gsynaptics-0.9.14-pixmap.patch ---
--- gsynaptics-0.9.14-old/src/main.c	2008-02-29 00:27:28.000000000 +0200
+++ gsynaptics-0.9.14/src/main.c	2008-08-12 23:23:42.000000000 +0300
@@ -690,7 +690,7 @@ setup_dialog (GladeXML *dialog)
 
 	gtk_window_set_default_size (GTK_WINDOW (widget), 400, -1);
 
-	path = g_build_filename (DATADIR "/pixmaps", "touchpad.png");
+	path = g_build_filename (DATADIR "pixmaps", "touchpad.png", NULL);
 	if (path)
 	{
 		icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);


Index: gsynaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/F-9/gsynaptics.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gsynaptics.spec	27 Jul 2008 00:46:19 -0000	1.17
+++ gsynaptics.spec	12 Aug 2008 22:46:08 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gsynaptics
 Version:        0.9.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Settings tool for Synaptics touchpad driver
 
 Group:          Applications/System
@@ -8,7 +8,10 @@
 URL:            http://gsynaptics.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/gsynaptics/28322/gsynaptics-%{version}.tar.gz
 # Source1 taken from http://downloads.sourceforge.jp/gsynaptics/15189/gsynaptics-0.9.0.tar.gz
-# until http://sourceforge.jp/tracker/index.php?func=detail&aid=11265&group_id=1720&atid=6433 get fixed
+# until http://sourceforge.jp/tracker/index.php?func=detail&aid=11265&group_id=1720&atid=6433 gets fixed
+Patch0:         gsynaptics-0.9.14-dot-fixes.patch
+Patch1:         gsynaptics-0.9.14-do-not-set-zero.patch
+Patch2:         gsynaptics-0.9.14-pixmap.patch
 Source1:        %{name}-touchpad.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,6 +39,9 @@
 cp data/gsynaptics-init.desktop.in.in data/gsynaptics-init.desktop.in.in.org
 grep -v -e "^Categories=$" data/gsynaptics-init.desktop.in.in.org > data/gsynaptics-init.desktop.in.in
 install -p %{SOURCE1} data/touchpad.png
+%patch0 -p1 -b .dot-fixes
+%patch1 -p1 -b .zero
+%patch2 -p1 -b .pixmap
 
 %build
 %configure
@@ -53,7 +59,7 @@
         $RPM_BUILD_ROOT%{_datadir}/applications/gsynaptics.desktop
 
 desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}//gnome/autostart/    \
+        --dir ${RPM_BUILD_ROOT}%{_datadir}/gnome/autostart/    \
         --add-category X-Fedora                                 \
         --delete-original                                       \
         $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gsynaptics-init.desktop
@@ -78,6 +84,11 @@
 
 
 %changelog
+* Tue Aug 12 2008 Christoph Wickert <fedora christoph-wickert de> - 0.9.14-2
+- Fix crash on startup, thanks to Sertaç Ö. Yıldız for the pointer (#457540)
+- Add patch to not set undefined keys to 0 by Michal ÄŒihaÅ™ (Debian #480744)
+- Fix for locales not using "." as decimal seperator (upstream #12498)
+
 * Sun Jul 27 2008 Christoph Wickert <fedora christoph-wickert de> - 0.9.14-1
 - Use dist tag

More information about the scm-commits mailing list