changeset 27855:5058cdd46464

merge of '82204c4b8e636617e72c31b471d4f81e85194540' and '84289cafb705d202e2c87aa0b5b6a00aa796b7f5'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Fri, 07 Aug 2009 08:36:12 +0000
parents 47a356df8b5a (current diff) fdf1f64de3a0 (diff)
children 1c58b9d2429b
files
diffstat 4 files changed, 20 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Aug 07 08:34:37 2009 +0000
+++ b/ChangeLog	Fri Aug 07 08:36:12 2009 +0000
@@ -117,6 +117,8 @@
 	* When the GNU IDN library (libidn) is available, it is used for
 	  normalization of Jabber IDs.  When unavailable, internal routines are
 	  used (as in previous versions).
+	* Topics that contain '<' followed by a non-whitespace character can now
+	  be set properly.
 
 	Yahoo!/Yahoo! JAPAN:
 	* P2P file transfers.  (Sulabh Mahajan)
--- a/libpurple/protocols/jabber/chat.c	Fri Aug 07 08:34:37 2009 +0000
+++ b/libpurple/protocols/jabber/chat.c	Fri Aug 07 08:36:12 2009 +0000
@@ -605,7 +605,7 @@
 	jm->to = g_strdup_printf("%s@%s", chat->room, chat->server);
 
 	if (topic && *topic)
-		jm->subject = purple_markup_strip_html(topic);
+		jm->subject = g_strdup(topic);
 	else
 		jm->subject = g_strdup("");
 
--- a/libpurple/purple.h.in	Fri Aug 07 08:34:37 2009 +0000
+++ b/libpurple/purple.h.in	Fri Aug 07 08:36:12 2009 +0000
@@ -65,11 +65,13 @@
 #include <idle.h>
 #include <imgstore.h>
 #include <log.h>
+#include <media.h>
+#include <mediamanager.h>
 #include <mime.h>
 #include <nat-pmp.h>
 #include <network.h>
+#include <notify.h>
 #include <ntlm.h>
-#include <notify.h>
 #include <plugin.h>
 #include <pluginpref.h>
 #include <pounce.h>
@@ -82,16 +84,22 @@
 #include <savedstatuses.h>
 #include <server.h>
 #include <signals.h>
+#include <smiley.h>
+#include <sound.h>
+#include <sound-theme.h>
+#include <sound-theme-loader.h>
+#include <sslconn.h>
 #include <status.h>
 #include <stringref.h>
 #include <stun.h>
-#include <sound.h>
-#include <sslconn.h>
+#include <theme.h>
+#include <theme-loader.h>
+#include <theme-manager.h>
 #include <upnp.h>
 #include <util.h>
 #include <value.h>
 #include <version.h>
+#include <whiteboard.h>
 #include <xmlnode.h>
-#include <whiteboard.h>
 
 #endif
--- a/pidgin/gtkconv.c	Fri Aug 07 08:34:37 2009 +0000
+++ b/pidgin/gtkconv.c	Fri Aug 07 08:36:12 2009 +0000
@@ -4365,7 +4365,11 @@
 		return;
 	}
 
-	gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), current_topic);
+	if (current_topic)
+		gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), current_topic);
+	else
+		gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), "");
+
 	prpl_info->set_chat_topic(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)),
 			new_topic);