From 33fc7575d231da1dc6af80cf345238b307c8e5f4 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Mar 16 2016 08:20:15 +0000
Subject: Don't render smileys in timestamps (#1317905)


Resolves: #1317905

---

diff --git a/pidgin-2.10.11-smileys.patch b/pidgin-2.10.11-smileys.patch
new file mode 100644
index 0000000..9c19a7b
--- /dev/null
+++ b/pidgin-2.10.11-smileys.patch
@@ -0,0 +1,13 @@
+diff -r c00a1fd0d27b pidgin/plugins/history.c
+--- a/pidgin/plugins/history.c	Wed Aug 05 12:32:22 2015 -0500
++++ b/pidgin/plugins/history.c	Fri Aug 21 11:01:50 2015 -0400
+@@ -134,7 +134,8 @@
+ 		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);
++	/* times can render as smileys - add an IMHTML option to prevent that */
++	gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), header, options|GTK_IMHTML_NO_SMILEY);
+ 	g_free(header);
+ 	g_free(escaped_alias);
+ 
diff --git a/pidgin.spec b/pidgin.spec
index b865ada..c11b60a 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -131,7 +131,7 @@
 
 Name:           pidgin
 Version:        2.10.11
-Release:        16%{?dist}
+Release:        17%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -212,6 +212,8 @@ Patch118:      pidgin-2.10.11-no-drain-appsink.patch
 # https://bitbucket.org/pidgin/main/commits/23aa214a723e61868b15efd64765e73c27a3c745
 # https://bitbucket.org/pidgin/main/commits/2f8eb8108b6381014bd90b6245181840c519f19b
 Patch119:      pidgin-2.10.11-purple-url-handler.patch
+# http://hg.pidgin.im/pidgin/main/rev/b4e5abab1114
+Patch120:      pidgin-2.10.11-smileys.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Summary:        A Gtk+ based multiprotocol instant messaging client
@@ -568,6 +570,8 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 # https://bitbucket.org/pidgin/main/commits/23aa214a723e61868b15efd64765e73c27a3c745
 # https://bitbucket.org/pidgin/main/commits/2f8eb8108b6381014bd90b6245181840c519f19b
 %patch119 -p1
+# http://hg.pidgin.im/pidgin/main/rev/b4e5abab1114
+%patch120 -p1
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -862,6 +866,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Mar 16 2016 Jan Synáček <jsynacek@redhat.com> - 2.10.11-17
+- Don't render smileys in timestamps (#1317905)
+
 * Wed Jan 13 2016 Jan Synáček <jsynacek@redhat.com> - 2.10.11-16
 - Fix purple-url-handler to work with python3 (#1245310)