aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-10-02 03:03:26 +0800
committerIain Holmes <iain@src.gnome.org>2001-10-02 03:03:26 +0800
commit1801894965cec6262493fdf935e6b3926dce380c (patch)
treef87802b679cacb67f43c55b1d505c887b6cd677d
parent6c2a82a063a463faf472a9a0998ef1ed59e85fd4 (diff)
downloadgsoc2013-evolution-1801894965cec6262493fdf935e6b3926dce380c.tar.gz
gsoc2013-evolution-1801894965cec6262493fdf935e6b3926dce380c.tar.zst
gsoc2013-evolution-1801894965cec6262493fdf935e6b3926dce380c.zip
Applied patch from Takuo Kitame
svn path=/trunk/; revision=13271
-rw-r--r--my-evolution/ChangeLog5
-rw-r--r--my-evolution/e-summary-rdf.c12
2 files changed, 14 insertions, 3 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index d820da715b..2667b0322d 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-01 Iain Holmes <iain@ximian.com>
+
+ * e-summary-rdf.c: Applied patch from Takuo Kitame for using charset
+ from the rdf.
+
2001-09-27 Iain Holmes <iain@ximian.com>
* e-summary-tasks.c (generate_html): Pass the summary to
diff --git a/my-evolution/e-summary-rdf.c b/my-evolution/e-summary-rdf.c
index d023e630f8..fa12df5996 100644
--- a/my-evolution/e-summary-rdf.c
+++ b/my-evolution/e-summary-rdf.c
@@ -244,8 +244,11 @@ tree_walk (xmlNodePtr root,
u = layer_find(channel->childs, "link", "");
if (*u != '\0')
- g_string_sprintfa (html, "<a href=\"%s\">", u);
- t = e_utf8_from_locale_string (t);
+ g_string_sprintfa (html, "<a href=\"%s\">", u);
+ if (r->cache->encoding)
+ t = e_utf8_from_charset_string (r->cache->encoding, t);
+ else
+ t = e_utf8_from_locale_string (t);
g_string_append (html, t);
g_free (t);
if (*u != '\0') {
@@ -268,7 +271,10 @@ tree_walk (xmlNodePtr root,
g_string_append (html, tmp);
g_free (tmp);
- p = e_utf8_from_locale_string (p);
+ if (r->cache->encoding)
+ p = e_utf8_from_charset_string (r->cache->encoding, p);
+ else
+ p = e_utf8_from_locale_string (p);
tmp = g_strdup_printf ("%s\n</A></font></li>", p);
g_free (p);
g_string_append (html, tmp);