Mercurial > pidgin.yaz

changeset 13454:1b5bf4b215f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15829] A patch from Bartosz Oler Fixes SF Bug #1440898 This patch fixes the handling of markup in GG status text. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Tue, 07 Mar 2006 20:11:35 +0000
parents efd3f93a220f
children 70197e8ac15c
files src/protocols/gg/gg.c
diffstat 1 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/gg/gg.c	Tue Mar 07 14:43:00 2006 +0000
+++ b/src/protocols/gg/gg.c	Tue Mar 07 20:11:35 2006 +0000
@@ -1395,13 +1395,9 @@
 	name = gaim_status_get_name(status);
 
 	if (msg != NULL) {
-		char *tmp = gaim_markup_strip_html(msg);
-		text = g_markup_escape_text(tmp, -1);
-		g_free(tmp);
-
+		text = g_markup_escape_text(msg, -1);
 		g_string_append_printf(str, "\n<b>%s:</b> %s: %s",
 				       _("Status"), name, text);
-
 		g_free(text);
 	} else {
 		g_string_append_printf(str, "\n<b>%s:</b> %s",
@@ -1669,14 +1665,12 @@
 	} else {
 		gchar *tmp, *new_msg;
 
-		tmp = gaim_markup_strip_html(msg);
-		new_msg = g_markup_escape_text(tmp, -1);
+		tmp = charset_convert(msg, "UTF-8", "CP1250");
+		new_msg = gaim_markup_strip_html(tmp);
 		g_free(tmp);
 
-		tmp = charset_convert(new_msg, "UTF-8", "CP1250");
-		gg_change_status_descr(info->session, new_status_descr, tmp);
+		gg_change_status_descr(info->session, new_status_descr, new_msg);
 		g_free(new_msg);
-		g_free(tmp);
 	}
 }
 /* }}} */