gnome-mud r743 - in trunk: . src

[lharris svn gnome org]

Author: lharris
Date: Wed Feb 18 03:08:08 2009
New Revision: 743
URL: http://svn.gnome.org/viewvc/gnome-mud?rev=743&view=rev

Log:
All gnome-mud messages sent to the terminal are now encoded to the encoding of the terminal.


Modified:
   trunk/ChangeLog
   trunk/src/mud-connection-view.c

Modified: trunk/src/mud-connection-view.c
==============================================================================
--- trunk/src/mud-connection-view.c	(original)
+++ trunk/src/mud-connection-view.c	Wed Feb 18 03:08:08 2009
@@ -276,16 +276,21 @@
 void
 mud_connection_view_add_text(MudConnectionView *view, gchar *message, enum MudConnectionColorType type)
 {
-    gchar *encoding;
+    gchar *encoding, *buf, *text;
+    const gchar *local_codeset;
     gchar *profile_name;
     GConfClient *client;
     gboolean remote;
+    gsize bytes_read, bytes_written;
+    GError *error = NULL;
 
     gchar key[2048];
     gchar extra_path[512] = "";
 
     client = gconf_client_get_default();
 
+    text = g_strdup(message);
+
     g_snprintf(key, 2048, "/apps/gnome-mud/%s%s", extra_path, "functionality/remote_encoding");
     remote = gconf_client_get_bool(client, key, NULL);
 
@@ -304,8 +309,19 @@
         encoding = gconf_client_get_string(client, key, NULL);
     }
 
+    buf = text;
+
+    g_get_charset(&local_codeset);
+
+    text = g_convert(text, -1,
+            encoding,
+            local_codeset, 
+            &bytes_read, &bytes_written, &error);
+
     vte_terminal_set_encoding(VTE_TERMINAL(view->priv->terminal), encoding);
 
+    g_free(encoding);
+
     switch (type)
     {
     case Sent:
@@ -326,8 +342,10 @@
     }
 
     if(view->local_echo)
-        mud_connection_view_feed_text(view, message);
+        mud_connection_view_feed_text(view, text);
     mud_connection_view_feed_text(view, "\e[0m");
+
+    g_free(text);
 }