Fix confusing error message. (#521028, Peter Kjellerstedt)

2008-03-10  Matthias Clasen  <mclasen@redhat.com>

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

svn path=/trunk/; revision=6654

diff --git a/ChangeLog b/ChangeLog
index 021492a8bf42ca0eefa5047f59b00f9c1b0a7865..86001010cd4e7c386a8dbe5a870bea3687a677b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-10  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/giochannel.c (g_io_channle_set_encoding): Fix confusing
+       error message.  (#521028, Peter Kjellerstedt)
+
 2008-03-10  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testglib.c: Still set the udddocs and uddpubshare 

diff --git a/glib/giochannel.c b/glib/giochannel.c
index 44289b6b17ba18d7e951b6e6951b823cae8f6804..3ef94e4cafec10f83bd81cd996f8f56138ef8563 100644 (file)
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -1127,8 +1127,8 @@ g_io_channel_set_encoding (GIOChannel     *channel,
           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 @@ g_io_channel_set_encoding (GIOChannel     *channel,
           if (write_cd == (GIConv) -1)
             {
               err = errno;
-              from_enc = encoding;
-              to_enc = "UTF-8";
+              from_enc = "UTF-8";
+              to_enc = encoding;
             }
         }
       else