rpms/gtk2/devel gtk+-2.8.6-inputmethod.patch,1.1,1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Nov 28 19:36:19 UTC 2005
Author: mclasen
Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2634
Modified Files:
gtk+-2.8.6-inputmethod.patch
Log Message:
Update patch
gtk+-2.8.6-inputmethod.patch:
gdk/x11/gdkevents-x11.c | 2 +
gtk/gtkentry.c | 54 ++++++++++++++++++++++++++-------------
gtk/gtksettings.c | 23 ++++++++++++++++
gtk/gtktextview.c | 66 ++++++++++++++++++++++++++++++------------------
4 files changed, 102 insertions(+), 43 deletions(-)
Index: gtk+-2.8.6-inputmethod.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk+-2.8.6-inputmethod.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk+-2.8.6-inputmethod.patch 24 Oct 2005 19:54:18 -0000 1.1
+++ gtk+-2.8.6-inputmethod.patch 28 Nov 2005 19:36:14 -0000 1.2
@@ -1,131 +1,5 @@
-? gtk/globdup.patch
-? gtk/gtkassistant.c
-? gtk/gtkassistant.h
-? gtk/xdgmime/LOG
-? gtk/xdgmime/cachefix.patch
-? gtk/xdgmime/test-mime-data
-? gtk/xdgmime/test-mime-data.c
-? gtk/xdgmime/testdata
-? gtk/xdgmime/tests
-Index: gdk/x11/gdkevents-x11.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/x11/gdkevents-x11.c,v
-retrieving revision 1.159
-diff -u -r1.159 gdkevents-x11.c
---- gdk/x11/gdkevents-x11.c 20 Sep 2005 05:28:33 -0000 1.159
-+++ gdk/x11/gdkevents-x11.c 24 Oct 2005 19:48:27 -0000
-@@ -2805,6 +2805,8 @@
- { "Gtk/MenuBarAccel", "gtk-menu-bar-accel" },
- { "Gtk/CursorThemeName", "gtk-cursor-theme-name" },
- { "Gtk/CursorThemeSize", "gtk-cursor-theme-size" },
-+ { "Gtk/ShowInputMethodMenu", "gtk-show-input-method-menu" },
-+ { "Gtk/ShowUnicodeMenu", "gtk-show-unicode-menu" },
- { "Xft/Antialias", "gtk-xft-antialias" },
- { "Xft/Hinting", "gtk-xft-hinting" },
- { "Xft/HintStyle", "gtk-xft-hintstyle" },
-Index: gtk/gtkentry.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
-retrieving revision 1.297
-diff -u -r1.297 gtkentry.c
---- gtk/gtkentry.c 20 Sep 2005 15:20:11 -0000 1.297
-+++ gtk/gtkentry.c 24 Oct 2005 19:48:28 -0000
-@@ -4557,10 +4557,13 @@
-
- if (GTK_WIDGET_REALIZED (entry))
- {
-- gboolean clipboard_contains_text = gtk_selection_data_targets_include_text (data);
-+ gboolean clipboard_contains_text;
- GtkWidget *menuitem;
- GtkWidget *submenu;
-+ gboolean show_input_method_menu;
-+ gboolean show_unicode_menu;
-
-+ clipboard_contains_text = gtk_selection_data_targets_include_text (data);
- if (entry->popup_menu)
- gtk_widget_destroy (entry->popup_menu);
-
-@@ -4594,33 +4597,46 @@
- gtk_widget_show (menuitem);
- gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
-
-- menuitem = gtk_separator_menu_item_new ();
-- gtk_widget_show (menuitem);
-- gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
--
-- menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
-- gtk_widget_set_sensitive (menuitem, entry->editable);
-- gtk_widget_show (menuitem);
-- submenu = gtk_menu_new ();
-- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
--
-- gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
--
-- gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (entry->im_context),
-- GTK_MENU_SHELL (submenu));
--
-- menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
-- gtk_widget_show (menuitem);
--
-- submenu = gtk_menu_new ();
-- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
-- gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
--
-- _gtk_text_util_append_special_char_menuitems (GTK_MENU_SHELL (submenu),
-- unichar_chosen_func,
-- entry);
-- if (!entry->editable)
-- gtk_widget_set_sensitive (menuitem, FALSE);
-+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (entry)),
-+ "gtk-show-input-method-menu", &show_input_method_menu,
-+ "gtk-show-unicode-menu", &show_unicode_menu,
-+ NULL);
-+
-+ if (show_input_method_menu || show_unicode_menu)
-+ {
-+ menuitem = gtk_separator_menu_item_new ();
-+ gtk_widget_show (menuitem);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
-+ }
-+
-+ if (show_input_method_menu)
-+ {
-+ menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
-+ gtk_widget_set_sensitive (menuitem, entry->editable);
-+ gtk_widget_show (menuitem);
-+ submenu = gtk_menu_new ();
-+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
-+
-+ gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
-+
-+ gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (entry->im_context),
-+ GTK_MENU_SHELL (submenu));
-+ }
-+
-+ if (show_unicode_menu)
-+ {
-+ menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
-+ gtk_widget_set_sensitive (menuitem, entry->editable);
-+ gtk_widget_show (menuitem);
-+
-+ submenu = gtk_menu_new ();
-+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
-+
-+ _gtk_text_util_append_special_char_menuitems (GTK_MENU_SHELL (submenu),
-+ unichar_chosen_func,
-+ entry);
-+ }
-
- g_signal_emit (entry,
- signals[POPULATE_POPUP],
-Index: gtk/gtksettings.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtksettings.c,v
-retrieving revision 1.77
-diff -u -r1.77 gtksettings.c
---- gtk/gtksettings.c 13 Sep 2005 19:57:42 -0000 1.77
-+++ gtk/gtksettings.c 24 Oct 2005 19:48:28 -0000
+--- gtk+-2.8.8/gtk/gtksettings.c.inputmethod 2005-08-29 00:47:20.000000000 -0400
++++ gtk+-2.8.8/gtk/gtksettings.c 2005-11-28 14:33:31.000000000 -0500
@@ -77,7 +77,9 @@
PROP_CURSOR_THEME_NAME,
PROP_CURSOR_THEME_SIZE,
@@ -163,14 +37,9 @@
}
static void
-Index: gtk/gtktextview.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtktextview.c,v
-retrieving revision 1.296
-diff -u -r1.296 gtktextview.c
---- gtk/gtktextview.c 13 Sep 2005 19:57:42 -0000 1.296
-+++ gtk/gtktextview.c 24 Oct 2005 19:48:29 -0000
-@@ -7070,14 +7070,18 @@
+--- gtk+-2.8.8/gtk/gtktextview.c.inputmethod 2005-11-02 01:30:22.000000000 -0500
++++ gtk+-2.8.8/gtk/gtktextview.c 2005-11-28 14:33:31.000000000 -0500
+@@ -7066,14 +7066,18 @@
/* We implicitely rely here on the fact that if we are pasting ourself, we'll
* have text targets as well as the private GTK_TEXT_BUFFER_CONTENTS target.
*/
@@ -190,49 +59,34 @@
if (text_view->popup_menu)
gtk_widget_destroy (text_view->popup_menu);
-@@ -7125,33 +7129,47 @@
+@@ -7121,33 +7125,47 @@
gtk_widget_show (menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
- menuitem = gtk_separator_menu_item_new ();
- gtk_widget_show (menuitem);
- gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
--
-- menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
-- gtk_widget_show (menuitem);
-- gtk_widget_set_sensitive (menuitem, can_insert);
--
-- submenu = gtk_menu_new ();
-- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
-- gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
--
-- gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (text_view->im_context),
-- GTK_MENU_SHELL (submenu));
--
-- menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
-- gtk_widget_show (menuitem);
-- gtk_widget_set_sensitive (menuitem, can_insert);
--
-- submenu = gtk_menu_new ();
-- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
-- gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
--
-- _gtk_text_util_append_special_char_menuitems (GTK_MENU_SHELL (submenu),
-- unichar_chosen_func,
-- text_view);
--
+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (text_view)),
+ "gtk-show-input-method-menu", &show_input_method_menu,
+ "gtk-show-unicode-menu", &show_unicode_menu,
+ NULL);
-+
+
+- menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
+- gtk_widget_show (menuitem);
+- gtk_widget_set_sensitive (menuitem, can_insert);
+ if (show_input_method_menu || show_unicode_menu)
+ {
+ menuitem = gtk_separator_menu_item_new ();
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
+ }
-+
+
+- submenu = gtk_menu_new ();
+- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+- gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
+-
+- gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (text_view->im_context),
+- GTK_MENU_SHELL (submenu));
+ if (show_input_method_menu)
+ {
+ menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
@@ -246,13 +100,24 @@
+ gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (text_view->im_context),
+ GTK_MENU_SHELL (submenu));
+ }
-+
+
+- menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
+- gtk_widget_show (menuitem);
+- gtk_widget_set_sensitive (menuitem, can_insert);
+-
+- submenu = gtk_menu_new ();
+- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+- gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
+-
+- _gtk_text_util_append_special_char_menuitems (GTK_MENU_SHELL (submenu),
+- unichar_chosen_func,
+- text_view);
+ if (show_unicode_menu)
+ {
+ menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
+ gtk_widget_show (menuitem);
+ gtk_widget_set_sensitive (menuitem, can_insert);
-+
+
+ submenu = gtk_menu_new ();
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+ gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
@@ -265,3 +130,95 @@
g_signal_emit (text_view,
signals[POPULATE_POPUP],
0,
+--- gtk+-2.8.8/gtk/gtkentry.c.inputmethod 2005-11-23 09:29:33.000000000 -0500
++++ gtk+-2.8.8/gtk/gtkentry.c 2005-11-28 14:33:31.000000000 -0500
+@@ -4567,10 +4567,13 @@
+
+ if (GTK_WIDGET_REALIZED (entry))
+ {
+- gboolean clipboard_contains_text = gtk_selection_data_targets_include_text (data);
++ gboolean clipboard_contains_text;
+ GtkWidget *menuitem;
+ GtkWidget *submenu;
++ gboolean show_input_method_menu;
++ gboolean show_unicode_menu;
+
++ clipboard_contains_text = gtk_selection_data_targets_include_text (data);
+ if (entry->popup_menu)
+ gtk_widget_destroy (entry->popup_menu);
+
+@@ -4604,11 +4607,23 @@
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
+
+- menuitem = gtk_separator_menu_item_new ();
+- gtk_widget_show (menuitem);
+- gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
++ g_object_get (gtk_widget_get_settings (GTK_WIDGET (entry)),
++ "gtk-show-input-method-menu", &show_input_method_menu,
++ "gtk-show-unicode-menu", &show_unicode_menu,
++ NULL);
++
++ if (!entry->visible)
++ show_input_method_menu = FALSE;
+
+- if (entry->visible)
++ if (show_input_method_menu || show_unicode_menu)
++ {
++
++ menuitem = gtk_separator_menu_item_new ();
++ gtk_widget_show (menuitem);
++ gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
++ }
++
++ if (show_input_method_menu)
+ {
+ menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
+ gtk_widget_set_sensitive (menuitem, entry->editable);
+@@ -4622,19 +4637,22 @@
+ GTK_MENU_SHELL (submenu));
+ }
+
+- menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
+- gtk_widget_show (menuitem);
+-
+- submenu = gtk_menu_new ();
+- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+- gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
+-
+- _gtk_text_util_append_special_char_menuitems (GTK_MENU_SHELL (submenu),
+- unichar_chosen_func,
+- entry);
+- if (!entry->editable)
+- gtk_widget_set_sensitive (menuitem, FALSE);
+-
++ if (show_unicode_menu)
++ {
++ menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
++ gtk_widget_show (menuitem);
++
++ submenu = gtk_menu_new ();
++ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
++ gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
++
++ _gtk_text_util_append_special_char_menuitems (GTK_MENU_SHELL (submenu),
++ unichar_chosen_func,
++ entry);
++ if (!entry->editable)
++ gtk_widget_set_sensitive (menuitem, FALSE);
++ }
++
+ g_signal_emit (entry,
+ signals[POPULATE_POPUP],
+ 0,
+--- gtk+-2.8.8/gdk/x11/gdkevents-x11.c.inputmethod 2005-08-19 01:46:06.000000000 -0400
++++ gtk+-2.8.8/gdk/x11/gdkevents-x11.c 2005-11-28 14:33:31.000000000 -0500
+@@ -2802,6 +2802,8 @@
+ { "Gtk/MenuBarAccel", "gtk-menu-bar-accel" },
+ { "Gtk/CursorThemeName", "gtk-cursor-theme-name" },
+ { "Gtk/CursorThemeSize", "gtk-cursor-theme-size" },
++ { "Gtk/ShowInputMethodMenu", "gtk-show-input-method-menu" },
++ { "Gtk/ShowUnicodeMenu", "gtk-show-unicode-menu" },
+ { "Xft/Antialias", "gtk-xft-antialias" },
+ { "Xft/Hinting", "gtk-xft-hinting" },
+ { "Xft/HintStyle", "gtk-xft-hintstyle" },
More information about the fedora-cvs-commits
mailing list