debian/midori
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Convert source code for display from the locale encoding

Browse source
This commit is contained in:
Enrico Tröger 2009-02-14 12:36:18 +01:00 committed by Christian Dywan
parent fb8dedfaac
commit 6af1840e75
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
midori/midori-source.c
View file

@ -87,6 +87,7 @@ midori_source_transfer_cb (KatzeNetRequest* request,
{ {
gchar** mimev; gchar** mimev;
gchar* charset; gchar* charset;
const gchar* default_charset;
gchar* contents_utf8; gchar* contents_utf8;
GtkTextBuffer* buffer; GtkTextBuffer* buffer;
@ -103,8 +104,14 @@ midori_source_transfer_cb (KatzeNetRequest* request,
charset = g_strdup (&mimev[1][8]); charset = g_strdup (&mimev[1][8]);
g_strfreev (mimev); g_strfreev (mimev);
} }
g_get_charset (&default_charset);
contents_utf8 = g_convert (request->data, -1, "UTF-8", contents_utf8 = g_convert (request->data, -1, "UTF-8",
charset ? charset : "ISO-8859-1", NULL, NULL, NULL); charset ? charset : default_charset, NULL, NULL, NULL);
/* If conversion from the user's locale also failed,
try ISO-8859-1 as a last resort */
if (!contents_utf8)
contents_utf8 = g_convert (request->data, -1, "UTF-8",
"ISO-8859-1", NULL, NULL, NULL);
} }
else else
contents_utf8 = (gchar*)request->data; contents_utf8 = (gchar*)request->data;