/pidgin/main: b4e5abab1114: Don't render smileys in the History ...

Michael McConville mmcconville at mykolab.com
Mon Sep 7 15:00:08 EDT 2015


Changeset: b4e5abab111428d51b6d2b36ef9f8cac52d96d79
Author:	 Michael McConville <mmcconville at mykolab.com>
Date:	 2015-09-07 14:59 -0400
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/b4e5abab1114

Description:

Don't render smileys in the History plugin's headers. Fixes #16747

diffstat:

 pidgin/plugins/history.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/pidgin/plugins/history.c b/pidgin/plugins/history.c
--- a/pidgin/plugins/history.c
+++ b/pidgin/plugins/history.c
@@ -134,7 +134,7 @@ static void historize(PurpleConversation
 		header_date = purple_date_format_full(localtime(&((PurpleLog *)logs->data)->time));
 
 	header = g_strdup_printf(_("<b>Conversation with %s on %s:</b><br>"), escaped_alias, header_date);
-	gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), header, options);
+	gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), header, options|GTK_IMHTML_NO_SMILEY);
 	g_free(header);
 	g_free(escaped_alias);
 



More information about the Commits mailing list