[gnome-terminal/gnome-3-10] window: Remove input method submenu

[Christian Persch <chpe src gnome org>]

commit 100c9e33ad52bf879db65e26441c0fb7ac3e1ade
Author: Christian Persch <chpe gnome org>
Date:   Fri Feb 15 16:37:37 2013 +0100

    window: Remove input method submenu
    
    Conflicts:
        src/terminal-window.c
    
    (cherry picked from commit b0a51a3edf63722453fcb8a90daf85a1e7eb4d19)

 src/terminal-window.c |   35 ++---------------------------------
 src/terminal.xml      |    2 --
 2 files changed, 2 insertions(+), 35 deletions(-)
---
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 10a5462..3e2994e 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -1232,16 +1232,9 @@ static void
 popup_menu_deactivate_callback (GtkWidget *popup,
                                 TerminalWindow *window)
 {
-  TerminalWindowPrivate *priv = window->priv;
-  GtkWidget *im_menu_item;
-
   g_signal_handlers_disconnect_by_func
     (popup, G_CALLBACK (popup_menu_deactivate_callback), window);
 
-  im_menu_item = gtk_ui_manager_get_widget (priv->ui_manager,
-                                            "/Popup/PopupInputMethods");
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), NULL);
-
   unset_popup_info (window);
 }
 
@@ -1254,9 +1247,9 @@ popup_clipboard_targets_received_cb (GtkClipboard *clipboard,
   TerminalWindow *window;
   TerminalWindowPrivate *priv;
   TerminalScreen *screen = info->screen;
-  GtkWidget *popup_menu, *im_menu, *im_menu_item;
+  GtkWidget *popup_menu;
   GtkAction *action;
-  gboolean can_paste, can_paste_uris, show_link, show_email_link, show_call_link, show_input_method_menu;
+  gboolean can_paste, can_paste_uris, show_link, show_email_link, show_call_link;
 
   window = terminal_screen_popup_info_ref_window (info);
   if (window == NULL ||
@@ -1297,29 +1290,6 @@ popup_clipboard_targets_received_cb (GtkClipboard *clipboard,
   gtk_action_set_sensitive (action, can_paste);
   action = gtk_action_group_get_action (priv->action_group, "PopupPasteURIPaths");
   gtk_action_set_visible (action, can_paste_uris);
-  
-  g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)),
-                "gtk-show-input-method-menu", &show_input_method_menu,
-                NULL);
-
-  action = gtk_action_group_get_action (priv->action_group, "PopupInputMethods");
-  gtk_action_set_visible (action, show_input_method_menu);
-
-  im_menu_item = gtk_ui_manager_get_widget (priv->ui_manager,
-                                            "/Popup/PopupInputMethods");
-  /* FIXME: fix this when gtk+ bug #500065 is done, use vte_terminal_im_merge_ui */
-  if (show_input_method_menu)
-    {
-      im_menu = gtk_menu_new ();
-      vte_terminal_im_append_menuitems (VTE_TERMINAL (screen),
-                                        GTK_MENU_SHELL (im_menu));
-      gtk_widget_show (im_menu);
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), im_menu);
-    }
-  else
-    {
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), NULL);
-    }
 
   popup_menu = gtk_ui_manager_get_widget (priv->ui_manager, "/Popup");
   g_signal_connect (popup_menu, "deactivate",
@@ -1818,7 +1788,6 @@ terminal_window_init (TerminalWindow *window)
       { "PopupLeaveFullscreen", NULL, N_("L_eave Full Screen"), NULL,
         NULL,
         G_CALLBACK (popup_leave_fullscreen_callback) },
-      { "PopupInputMethods", NULL, N_("_Input Methods") }
     };
   
   const GtkToggleActionEntry toggle_menu_entries[] =
diff --git a/src/terminal.xml b/src/terminal.xml
index 2bff712..cf28f07 100644
--- a/src/terminal.xml
+++ b/src/terminal.xml
@@ -98,8 +98,6 @@
     </menu>
     <menuitem action="ViewMenubar" />
     <menuitem action="PopupLeaveFullscreen" />
-    <separator />
-    <menuitem action="PopupInputMethods" />
   </popup>
   <popup name="NotebookPopup" action="NotebookPopup">
     <menuitem action="TabsMoveLeft"/>