gnome-terminal r2578 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:35:19 2008
New Revision: 2578
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2578&view=rev

Log:
Use vte_terminal_im_append_menuitems directly.


Modified:
   trunk/src/terminal-widget-vte.c
   trunk/src/terminal-widget.h
   trunk/src/terminal-window.c

Modified: trunk/src/terminal-widget-vte.c
==============================================================================
--- trunk/src/terminal-widget-vte.c	(original)
+++ trunk/src/terminal-widget-vte.c	Thu May 29 19:35:19 2008
@@ -565,28 +565,3 @@
   vte_terminal_set_encoding (VTE_TERMINAL (widget),
                              encoding);
 }
-
-gboolean
-terminal_widget_supports_dynamic_encoding (void)
-{
-  return TRUE;
-}
-
-void
-terminal_widget_im_append_menuitems(GtkWidget *widget, GtkMenuShell *menushell)
-{
-  vte_terminal_im_append_menuitems(VTE_TERMINAL(widget), menushell);
-}
-
-guint
-terminal_widget_im_merge_ui(GtkWidget *widget,
-                            GtkUIManager *manager,
-                            const char *group_name,
-                            const char *ui_path,
-                            GtkActionGroup **action_group)
-{
-#if 0
-  return vte_terminal_im_merge_ui(VTE_TERMINAL(widget), manager, group_name,
-                                  ui_path, action_group);
-#endif
-}

Modified: trunk/src/terminal-widget.h
==============================================================================
--- trunk/src/terminal-widget.h	(original)
+++ trunk/src/terminal-widget.h	Thu May 29 19:35:19 2008
@@ -151,16 +151,6 @@
 void        terminal_widget_set_encoding (GtkWidget  *widget,
                                           const char *encoding);
 
-gboolean terminal_widget_supports_dynamic_encoding (void);
-
-void terminal_widget_im_append_menuitems(GtkWidget    *wiget,
-					 GtkMenuShell *menushell);
-guint terminal_widget_im_merge_ui(GtkWidget *widget,
-                                  GtkUIManager *manager,
-                                  const char *group_name,
-                                  const char *ui_path,
-                                  GtkActionGroup **action_group);
-
 G_END_DECLS
 
 #endif /* TERMINAL_WIDGET_H */

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Thu May 29 19:35:19 2008
@@ -547,9 +547,6 @@
   const char *charset;
   GtkWidget *widget;
 
-  if (!terminal_widget_supports_dynamic_encoding ())
-    return;
-  
   /* Remove the old UI */
   if (priv->encodings_ui_id != 0)
     {
@@ -960,12 +957,12 @@
 
   im_menu_item = gtk_ui_manager_get_widget (priv->ui_manager,
                                             "/Popup/PopupInputMethods");
-  /* FIXME: fix this when gtk+ bug #500065 is done */
+  /* FIXME: fix this when gtk+ bug #500065 is done, by using vte_terminal_im_merge_ui */
   if (show_input_method_menu)
     {
       im_menu = gtk_menu_new ();
-      terminal_widget_im_append_menuitems (terminal_screen_get_widget (screen),
-                                           GTK_MENU_SHELL (im_menu));
+      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);
     }
@@ -1323,8 +1320,6 @@
   action = gtk_action_group_get_action (action_group, "ViewFullscreen");
   gtk_action_set_sensitive (action,
                             gdk_net_wm_supports (gdk_atom_intern ("_NET_WM_STATE_FULLSCREEN", FALSE)));
-  action = gtk_action_group_get_action (action_group, "TerminalSetEncoding");
-  gtk_action_set_sensitive (action, terminal_widget_supports_dynamic_encoding ());
 
   /* Load the UI */
   error = NULL;