glib r6654 - in trunk: . glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Mar 10 15:55:16 2008
New Revision: 6654
URL: http://svn.gnome.org/viewvc/glib?rev=6654&view=rev

Log:
2008-03-10  Matthias Clasen  <mclasen redhat com>

        * glib/giochannel.c (g_io_channle_set_encoding): Fix confusing
        error message.  (#521028, Peter Kjellerstedt)



Modified:
   trunk/ChangeLog
   trunk/glib/giochannel.c

Modified: trunk/glib/giochannel.c
==============================================================================
--- trunk/glib/giochannel.c	(original)
+++ trunk/glib/giochannel.c	Mon Mar 10 15:55:16 2008
@@ -1127,8 +1127,8 @@
           if (read_cd == (GIConv) -1)
             {
               err = errno;
-              from_enc = "UTF-8";
-              to_enc = encoding;
+              from_enc = encoding;
+              to_enc = "UTF-8";
             }
         }
       else
@@ -1141,8 +1141,8 @@
           if (write_cd == (GIConv) -1)
             {
               err = errno;
-              from_enc = encoding;
-              to_enc = "UTF-8";
+              from_enc = "UTF-8";
+              to_enc = encoding;
             }
         }
       else