rpms/imsettings/devel imsettings-xim-fixes.patch,1.1,1.2

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11608

Modified Files:
	imsettings-xim-fixes.patch 
Log Message:
remove unnecessary backporting patches.

imsettings-xim-fixes.patch:

Index: imsettings-xim-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings-xim-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imsettings-xim-fixes.patch	18 Mar 2009 07:32:48 -0000	1.1
+++ imsettings-xim-fixes.patch	18 Mar 2009 08:33:09 -0000	1.2
@@ -1,40 +1,3 @@
-Index: applet/imsettings-applet.schemas.in
-===================================================================
---- applet/imsettings-applet.schemas.in	(リビジョン 263)
-+++ applet/imsettings-applet.schemas.in	(リビジョン 277)
-@@ -50,7 +50,7 @@
-       <applyto>/apps/imsettings-applet/sync_on_forward</applyto>
-       <owner>imsettings-applet</owner>
-       <type>bool</type>
--      <default>FALSE</default>
-+      <default>TRUE</default>
-       <locale name="C">
- 	<short>Enable this when accelerator keys etc doesn't work</short>
- 	<long>
-Index: applet/main.c
-===================================================================
---- applet/main.c	(リビジョン 263)
-+++ applet/main.c	(リビジョン 277)
-@@ -779,7 +779,8 @@
- 	val = gconf_client_get(client, "/apps/imsettings-applet/sync_on_forward", NULL);
- 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (applet->checkbox_sync),
- 				     val == NULL ? TRUE : gconf_value_get_bool(val));
--	gconf_value_free(val);
-+	if (val)
-+		gconf_value_free(val);
- 
- 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (applet->checkbox_showicon),
- 				     gtk_status_icon_get_visible(applet->status_icon));
-@@ -1223,7 +1224,8 @@
- 			     "synchronous", val == NULL ? TRUE : gconf_value_get_bool(val),
- 			     NULL);
- 	}
--	gconf_value_free(val);
-+	if (val)
-+		gconf_value_free(val);
- 
- 	dbus_bus_add_match(applet->conn,
- 			   "type='signal',"
 Index: backends/xim/loopback.h
 ===================================================================
 --- backends/xim/loopback.h	(リビジョン 263)