rpms/gsynaptics/F-8 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

Tue Aug 12 23:07:47 UTC 2008

Author: cwickert

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

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:
forgot to add the patches

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);


