gnome-terminal r2579 - trunk/src

[chpe svn gnome org]

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

Log:
Use vte_terminal_[sg]et_encoding 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:25 2008
@@ -542,26 +542,3 @@
 				    VTE_ANTI_ALIAS_FORCE_DISABLE);
     }
 }
-
-const char*
-terminal_widget_get_encoding (GtkWidget *widget)
-{
-  return vte_terminal_get_encoding (VTE_TERMINAL (widget));
-}
-
-void
-terminal_widget_set_encoding (GtkWidget  *widget,
-                              const char *encoding)
-{
-  const char *old;
-
-  /* Short-circuit setting the same encoding twice. */
-  old = vte_terminal_get_encoding (VTE_TERMINAL (widget));
-  if ((old && encoding &&
-       strcmp (old, encoding) == 0) ||
-      (old == NULL && encoding == NULL))
-    return;
-  
-  vte_terminal_set_encoding (VTE_TERMINAL (widget),
-                             encoding);
-}

Modified: trunk/src/terminal-widget.h
==============================================================================
--- trunk/src/terminal-widget.h	(original)
+++ trunk/src/terminal-widget.h	Thu May 29 19:35:25 2008
@@ -147,10 +147,6 @@
 
 gboolean terminal_widget_supports_pango_fonts (void);
 
-const char* terminal_widget_get_encoding (GtkWidget  *widget);
-void        terminal_widget_set_encoding (GtkWidget  *widget,
-                                          const char *encoding);
-
 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:25 2008
@@ -532,8 +532,7 @@
   g_assert (g_str_has_prefix (name, SET_ENCODING_ACTION_NAME_PREFIX));
   charset = name + strlen (SET_ENCODING_ACTION_NAME_PREFIX);
 
-  widget = terminal_screen_get_widget (priv->active_term);
-  terminal_widget_set_encoding (widget, charset);
+  vte_terminal_set_encoding (VTE_TERMINAL (priv->active_term), charset);
 }
 
 static void
@@ -545,7 +544,6 @@
   guint n;
   GSList *encodings, *l;
   const char *charset;
-  GtkWidget *widget;
 
   /* Remove the old UI */
   if (priv->encodings_ui_id != 0)
@@ -570,8 +568,7 @@
 
   priv->encodings_ui_id = gtk_ui_manager_new_merge_id (priv->ui_manager);
 
-  widget = terminal_screen_get_widget (priv->active_term);
-  charset = terminal_widget_get_encoding (widget);
+  charset = vte_terminal_get_encoding (VTE_TERMINAL (priv->active_term));
   
   encodings = terminal_get_active_encodings ();