rpms/control-center/devel control-center-2.12.1-inputmethod.patch, NONE, 1.1 control-center.spec, 1.98, 1.99

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19073

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.12.1-inputmethod.patch 
Log Message:
Support hiding the input method menu


control-center-2.12.1-inputmethod.patch:
 gnome-settings-xsettings.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE control-center-2.12.1-inputmethod.patch ---
--- control-center-2.12.1/gnome-settings-daemon/gnome-settings-xsettings.c.inputmethod	2005-10-19 16:10:36.000000000 -0400
+++ control-center-2.12.1/gnome-settings-daemon/gnome-settings-xsettings.c	2005-10-19 16:13:13.000000000 -0400
@@ -138,6 +138,11 @@
       GCONF_VALUE_STRING,	translate_string_string },
   { "/desktop/gnome/peripherals/mouse/cursor_size",	"Gtk/CursorThemeSize",
       GCONF_VALUE_INT,		translate_int_int },
+      GCONF_VALUE_BOOL,		translate_bool_int },
+  { "/desktop/gnome/interface/show_input_method_menu",  "Gtk/ShowInputMethodMenu",
+      GCONF_VALUE_BOOL,		translate_bool_int },
+  { "/desktop/gnome/interface/show_unicode_menu",  "Gtk/ShowUnicodeMenu",
+      GCONF_VALUE_BOOL,		translate_bool_int },
 };
 
 static TranslationEntry*


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- control-center.spec	19 Oct 2005 21:19:15 -0000	1.98
+++ control-center.spec	24 Oct 2005 20:09:52 -0000	1.99
@@ -20,7 +20,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.12.1
-Release: 2
+Release: 3
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -31,6 +31,8 @@
 Patch3: control-center-2.10.1-mark-tool-buttons-important.patch
 Patch4: control-center-2.12.0-help-left-handed-dual-mice-users.patch
 Patch5: control-center-2.12.0-run-power-manager.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=319634 
+Patch6: control-center-2.12.1-inputmethod.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -91,6 +93,7 @@
 %patch3 -p1 -b .mark-tool-buttons-important
 %patch4 -p1 -b .help-left-handed-dual-mice-users
 %patch5 -p1 -b .run-power-manager
+%patch6 -p1 -b .inputmethod
 
 %build
 
@@ -211,6 +214,9 @@
 # (also its headers)
 
 %changelog
+* Mon Oct 24 2005 Matthias Clasen <mclasen at redhat.com> - 1:2.12.1-3
+- Support a gconf key to hide the input method menu
+
 * Wed Oct 19 2005 Ray Strode <rstrode at redhat.com> - 1:2.12.1-2
 - rename Font capplet to Fonts (bug 171059)