From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 10 Mar 2008 15:55:16 +0000 (+0000)
Subject: Fix confusing error message. (#521028, Peter Kjellerstedt)
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b85f7190da7a5d7da94fd79488f51f4c895c3779;p=dana%2Fcg-glib.git

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 021492a8..86001010 100644
--- 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 44289b6b..3ef94e4c 100644
--- 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