rpms/control-center/devel im-setting.patch, NONE, 1.1 control-center.spec, 1.316, 1.317

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3087

Modified Files:
	control-center.spec 
Added Files:
	im-setting.patch 
Log Message:
support the gtk-im-module setting


im-setting.patch:

--- NEW FILE im-setting.patch ---
diff -pruN gnome-control-center-2.21.2.orig/gnome-settings-daemon/gnome-settings-xsettings.c gnome-control-center-2.21.2/gnome-settings-daemon/gnome-settings-xsettings.c
--- gnome-control-center-2.21.2.orig/gnome-settings-daemon/gnome-settings-xsettings.c	2007-07-17 18:42:56.000000000 +0900
+++ gnome-control-center-2.21.2/gnome-settings-daemon/gnome-settings-xsettings.c	2007-12-18 13:49:53.000000000 +0900
@@ -225,6 +225,8 @@ static TranslationEntry translations [] 
 	  GCONF_VALUE_STRING,	translate_string_string },
 	{ "/desktop/gnome/interface/gtk-im-status-style",	"Gtk/IMStatusStyle",
 	  GCONF_VALUE_STRING,	translate_string_string },
+	{ "/desktop/gnome/interface/gtk-im-module",		"Gtk/IMModule",
+	  GCONF_VALUE_STRING,	translate_string_string },
 	{ "/desktop/gnome/interface/icon_theme",		"Net/IconThemeName",
 	  GCONF_VALUE_STRING,	translate_string_string },
 	{ "/desktop/gnome/interface/file_chooser_backend",	"Gtk/FileChooserBackend",


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- control-center.spec	18 Nov 2007 05:02:13 -0000	1.316
+++ control-center.spec	18 Dec 2007 14:51:52 -0000	1.317
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.21.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -51,6 +51,9 @@
 # change default preferred apps to programs we ship
 Patch99: control-center-2.19.91-default-apps.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=504182
+Patch100: im-setting.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
 
@@ -178,6 +181,8 @@
 %patch96 -p1 -b .gecos
 %patch99 -p1 -b .default-apps
 
+%patch100 -p1 -b .im-setting
+
 %build
 
 autoreconf
@@ -373,6 +378,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Tue Dec 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.21.2-3
+- Support the gtk-im-module setting
+
 * Sun Nov 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.21.2-2
 - Spec file cleanups