pidgin.2.7.2: 9bf4b7a3: *** Plucked rev 913a8d73fc8635dab66f0c26...

Tue Jul 20 23:36:19 EDT 2010

----------------------------------------------------------------------
Revision: 9bf4b7a3def01690cd528dac96909cce2c143fc9
Parent:   b6f27e24a5b1a3888eb649cf868335db257a64fc
Author:   markdoliner at pidgin.im
Date:     07/20/10 23:27:02
Branch:   im.pidgin.pidgin.2.7.2
URL: http://d.pidgin.im/viewmtn/revision/info/9bf4b7a3def01690cd528dac96909cce2c143fc9

Changelog: 

*** Plucked rev 913a8d73fc8635dab66f0c26561d1ec9fe366b09 (markdoliner at pidgin.im):
Copy the third hunk from 3c30f64efedafc379b6536852bbb3b6ef5f1f6c9 to trunk
Somehow this didn't get propagated in bcae499af351044e047d297b8032fa4dca99c147
So recent official ICQ clients display our HTML tags :-(
Refs #11863

*** Plucked rev 4e13d24893523b8cf8f1197f69827e562fde3309 (nosnilmot at pidgin.im):
I forgot to update the RPM spec file for building for older releases with
older hicolor-icon-theme packages before release. Oops.
Refs: #12073


Changes against parent b6f27e24a5b1a3888eb649cf868335db257a64fc

  patched  ChangeLog
  patched  libpurple/protocols/oscar/oscar.c
  patched  pidgin.spec.in

-------------- next part --------------
============================================================

--- ChangeLog	604b3a670da13575741f2c4c5997ed34b2c881dc
+++ ChangeLog	750cccd1f3b1f15893d7309aa7962b46e8021c20
@@ -6,6 +6,8 @@ version 2.7.2 (07/21/2010):
 	  remove users.  This is CVE-2010-2528.
 	* Fix a rare crash bug caused by certain incoming SMS messages
 	  (discovered by Jan Kaluza--thanks Jan!)
+	* Change HTML sent from ICQ accounts so that official ICQ clients
+	  hopefully display it correctly.
 
 version 2.7.1 (05/29/2010):
 	General:
============================================================
--- pidgin.spec.in	71c952c4fc12a30ef025dab77139689529f187fb
+++ pidgin.spec.in	126eb8ab0c3700ac9c447484383da882884c6a6c
@@ -241,7 +241,8 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --pr
                                     %{?_with_mono:--enable-mono} \
                                     %{?_with_sasl:--enable-cyrus-sasl} \
                                     %{?_without_tcl:--disable-tcl} \
-                                    %{?_without_text:--disable-consoleui}
+                                    %{?_without_text:--disable-consoleui} \
+                                    %{?_with_trayiconcompat:--enable-trayicon-compat}
 
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -470,6 +471,10 @@ fi
 %endif
 
 %changelog
+* Wed Jun 02 2010 Stu Tomlinson <stu at nosnilmot.com>
+- add an option to build RPMs using --enable-trayicon-compat
+  (--with trayiconcompat)
+
 * Thu May 13 2010 Stu Tomlinson <stu at nosnilmot.com>
 - Include all libpurple headers in libpurple-devel
 
============================================================
--- libpurple/protocols/oscar/oscar.c	cee224a3a79d8c949316f387a000186a7e4d6a93
+++ libpurple/protocols/oscar/oscar.c	b43bf7e7c61512795d38fa66a4a71b8f8b7d5205
@@ -4662,7 +4662,8 @@ oscar_send_im(PurpleConnection *gc, cons
 			tmp2 = purple_markup_strip_html(tmp1);
 			is_html = FALSE;
 		} else {
-			tmp2 = g_strdup(tmp1);
+			/* ICQ 6 wants its HTML wrapped in these tags. Oblige it. */
+			tmp2 = g_strdup_printf("<HTML><BODY>%s</BODY></HTML>", tmp1);
 			is_html = TRUE;
 		}
 		g_free(tmp1);
