gnome-mud r750 - in trunk: . src

[lharris svn gnome org]

Author: lharris
Date: Fri Feb 20 11:36:32 2009
New Revision: 750
URL: http://svn.gnome.org/viewvc/gnome-mud?rev=750&view=rev

Log:
Workaround for a g_convert() problem where it doesn't return NULL when error is set.


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	Fri Feb 20 11:36:32 2009
@@ -339,9 +339,12 @@
             break;
     }
 
-    if(view->local_echo)
-        mud_connection_view_feed_text(view, text);
-    mud_connection_view_feed_text(view, "\e[0m");
+    if(!error)
+    {
+        if(view->local_echo)
+            mud_connection_view_feed_text(view, text);
+        mud_connection_view_feed_text(view, "\e[0m");
+    }
 
     g_free(text);
 }
@@ -704,6 +707,12 @@
                 local_codeset, 
                 &bytes_read, &bytes_written, &error);
 
+            if(error)
+            {
+                conv_text = NULL;
+                error = NULL;
+            }
+
             // Give plugins first crack at it.
             mud_window_handle_plugins(view->priv->window, view->priv->id,
                     (gchar *)text, strlen(text), 0);