[gnome-terminal] encodings: Remove now-unneeded function

[Christian Persch <chpe src gnome org>]

commit 2c13f7c9a8dec83cf35254e68b52009967936c56
Author: Christian Persch <chpe gnome org>
Date:   Thu Apr 3 11:45:11 2014 +0200

    encodings: Remove now-unneeded function
    
    Since the encoding ID is now always the same as the charset, remove the ID
    and always directly use the charset.

 src/terminal-app.c      |    2 +-
 src/terminal-encoding.c |   15 +++------------
 src/terminal-encoding.h |    4 +---
 src/terminal-prefs.c    |    2 +-
 src/terminal-window.c   |    4 ++--
 5 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/src/terminal-app.c b/src/terminal-app.c
index fa7a68e..9ded6fc 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -645,7 +645,7 @@ terminal_app_ensure_encoding (TerminalApp *app,
                                         TRUE,
                                         TRUE /* scary! */);
       g_hash_table_insert (app->encodings,
-                          (gpointer) terminal_encoding_get_id (encoding),
+                          (gpointer) terminal_encoding_get_charset (encoding),
                           encoding);
     }
 
diff --git a/src/terminal-encoding.c b/src/terminal-encoding.c
index d96de55..2c85625 100644
--- a/src/terminal-encoding.c
+++ b/src/terminal-encoding.c
@@ -139,7 +139,7 @@ terminal_encoding_new (const char *charset,
 
   encoding = g_slice_new (TerminalEncoding);
   encoding->refcount = 1;
-  encoding->id = g_strdup (charset);
+  encoding->charset = g_intern_static_string (charset);
   encoding->name = g_strdup (display_name);
   encoding->valid = encoding->validity_checked = force_valid || g_str_equal (charset, "UTF-8");
   encoding->is_custom = is_custom;
@@ -164,24 +164,15 @@ terminal_encoding_unref (TerminalEncoding *encoding)
     return;
 
   g_free (encoding->name);
-  g_free (encoding->id);
   g_slice_free (TerminalEncoding, encoding);
 }
 
 const char *
-terminal_encoding_get_id (TerminalEncoding *encoding)
-{
-  g_return_val_if_fail (encoding != NULL, NULL);
-
-  return encoding->id;
-}
-
-const char *
 terminal_encoding_get_charset (TerminalEncoding *encoding)
 {
   g_return_val_if_fail (encoding != NULL, NULL);
 
-  return encoding->id;
+  return encoding->charset;
 }
 
 gboolean
@@ -266,7 +257,7 @@ terminal_encodings_get_builtins (void)
                                         FALSE,
                                         FALSE);
       g_hash_table_insert (encodings_hashtable,
-                           (gpointer) terminal_encoding_get_id (encoding),
+                           (gpointer) terminal_encoding_get_charset (encoding),
                            encoding);
     }
 
diff --git a/src/terminal-encoding.h b/src/terminal-encoding.h
index cc686e8..63c27ba 100644
--- a/src/terminal-encoding.h
+++ b/src/terminal-encoding.h
@@ -27,7 +27,7 @@
 typedef struct
 {
   int   refcount;
-  char *id;
+  const char *charset; /* interned */
   char *name;
   guint valid            : 1;
   guint validity_checked : 1;
@@ -48,8 +48,6 @@ void terminal_encoding_unref (TerminalEncoding *encoding);
 
 gboolean terminal_encoding_is_valid (TerminalEncoding *encoding);
 
-const char *terminal_encoding_get_id (TerminalEncoding *encoding);
-
 const char *terminal_encoding_get_charset (TerminalEncoding *encoding);
 
 GHashTable *terminal_encodings_get_builtins (void);
diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
index 043f8a7..5708acc 100644
--- a/src/terminal-prefs.c
+++ b/src/terminal-prefs.c
@@ -468,7 +468,7 @@ update_active_encodings_setting (void)
     {
       TerminalEncoding *encoding = (TerminalEncoding *) l->data;
 
-      g_variant_builder_add (&builder, "s", terminal_encoding_get_id (encoding));
+      g_variant_builder_add (&builder, "s", terminal_encoding_get_charset (encoding));
     }
   g_slist_foreach (list, (GFunc) terminal_encoding_unref, NULL);
   g_slist_free (list);
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 55e270d..ce7abb9 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -1618,7 +1618,7 @@ terminal_window_update_encoding_menu (TerminalWindow *window)
       char name[128];
       gs_free char *display_name;
 
-      g_snprintf (name, sizeof (name), SET_ENCODING_ACTION_NAME_PREFIX "%s", terminal_encoding_get_id (e));
+      g_snprintf (name, sizeof (name), SET_ENCODING_ACTION_NAME_PREFIX "%s", terminal_encoding_get_charset 
(e));
       display_name = g_strdup_printf ("%s (%s)", e->name, terminal_encoding_get_charset (e));
 
       encoding_action = gtk_radio_action_new (name,
@@ -1630,7 +1630,7 @@ terminal_window_update_encoding_menu (TerminalWindow *window)
       gtk_radio_action_set_group (encoding_action, group);
       group = gtk_radio_action_get_group (encoding_action);
 
-      if (charset && strcmp (terminal_encoding_get_id (e), charset) == 0)
+      if (charset && strcmp (terminal_encoding_get_charset (e), charset) == 0)
         gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (encoding_action), TRUE);
 
       g_signal_connect (encoding_action, "toggled",