[Xfce4-commits] [apps/xfce4-terminal] 01/01: Remove Input Methods menu: vte is not supporting it

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.

commit 9200aeb2dcc649f21e91fa08e7e4c9995027f9ba
Author: Igor <f2404 at yandex.ru>
Date:   Fri Jul 15 12:16:30 2016 +0300

    Remove Input Methods menu: vte is not supporting it
---
 terminal/terminal-screen.c      | 22 ----------------------
 terminal/terminal-screen.h      |  3 ---
 terminal/terminal-window-ui.xml |  3 +--
 terminal/terminal-window.c      | 17 -----------------
 4 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index ec17bf0..5c2e1d9 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -2053,28 +2053,6 @@ terminal_screen_reset (TerminalScreen *screen,
 
 
 /**
- * terminal_screen_im_append_menuitems:
- * @screen    : A #TerminalScreen.
- * @menushell : A #GtkMenuShell.
- *
- * Appends menu items for various input methods to the given @menushell.
- * The user can select one of these items to modify the input method
- * used by the terminal.
- **/
-void
-terminal_screen_im_append_menuitems (TerminalScreen *screen,
-                                     GtkMenuShell   *menushell)
-{
-  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-  terminal_return_if_fail (GTK_IS_MENU_SHELL (menushell));
-
-  // FIXME: functionality seems to have been removed
-  //vte_terminal_im_append_menuitems (VTE_TERMINAL (screen->terminal), menushell);
-}
-
-
-
-/**
  * terminal_screen_get_restart_command:
  * @screen  : A #TerminalScreen.
  *
diff --git a/terminal/terminal-screen.h b/terminal/terminal-screen.h
index 9da1506..ee0d51a 100644
--- a/terminal/terminal-screen.h
+++ b/terminal/terminal-screen.h
@@ -84,9 +84,6 @@ void         terminal_screen_select_all                   (TerminalScreen *scree
 void         terminal_screen_reset                        (TerminalScreen *screen,
                                                            gboolean        clear);
 
-void         terminal_screen_im_append_menuitems          (TerminalScreen *screen,
-                                                           GtkMenuShell   *menushell);
-
 GSList      *terminal_screen_get_restart_command          (TerminalScreen *screen);
 
 void         terminal_screen_reset_activity               (TerminalScreen *screen);
diff --git a/terminal/terminal-window-ui.xml b/terminal/terminal-window-ui.xml
index 16dda85..1a63e04 100644
--- a/terminal/terminal-window-ui.xml
+++ b/terminal/terminal-window-ui.xml
@@ -69,9 +69,8 @@
     <separator/>
     <menuitem action="show-menubar"/>
     <menuitem action="fullscreen"/>
-    <menuitem action="preferences"/>
     <separator/>
-    <menuitem action="input-methods"/>
+    <menuitem action="preferences"/>
   </popup>
 
   <!-- The right click tab menu -->
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 9de78ef..c945b98 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -220,7 +220,6 @@ static const GtkActionEntry action_entries[] =
   { "help-menu", NULL, N_ ("_Help"), NULL, NULL, NULL, },
     { "contents", "help-browser", N_ ("_Contents"), "F1", N_ ("Display help contents"), G_CALLBACK (terminal_window_action_contents), },
     { "about", "help-about", N_ ("_About"), NULL, NULL, G_CALLBACK (terminal_window_action_about), },
-  { "input-methods", NULL, N_ ("_Input Methods"), NULL, NULL, NULL, },
 };
 
 static const GtkToggleActionEntry toggle_action_entries[] =
@@ -1175,27 +1174,11 @@ terminal_window_get_context_menu (TerminalScreen  *screen,
                                   TerminalWindow  *window)
 {
   GtkWidget *popup;
-  GtkWidget *menu;
-  GtkWidget *item;
 
   if (G_UNLIKELY (screen != window->active))
     return NULL;
 
   popup = gtk_ui_manager_get_widget (window->ui_manager, "/popup-menu");
-  if (G_LIKELY (popup != NULL))
-    {
-      item = gtk_ui_manager_get_widget (window->ui_manager, "/popup-menu/input-methods");
-      if (G_LIKELY (item != NULL && GTK_IS_MENU_ITEM (item)))
-        {
-          /* append input methods */
-          menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (item));
-          if (G_LIKELY (menu != NULL))
-            gtk_widget_destroy (menu);
-          menu = gtk_menu_new ();
-          terminal_screen_im_append_menuitems (screen, GTK_MENU_SHELL (menu));
-          gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
-        }
-    }
 
   return popup;
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.