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
This commit is contained in:
Matthias Clasen 2008-03-10 15:55:16 +00:00 committed by Matthias Clasen
parent b2d5e81c5c
commit b85f7190da
2 changed files with 9 additions and 4 deletions

View File

@ -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

View File

@ -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