Mercurial > pidgin3 / changeset

• changeset
• raw

changeset

Two questions:

Sun, 10 Jun 2007 15:58:23 +0000

author

Mark Doliner <markdoliner@pidgin.im>

date

Sun, 10 Jun 2007 15:58:23 +0000

changeset 17683

cc7e7a1d5d8c

parent 17681

b16ce226d996

child 17684

21bb56f87221

Two questions:
1. XMPP <status> messages inside <presence> broadcasts should be
plaintext and not HTML, right?
2. 'stripped = purple_markup_strip_html(str)' is basically the same as
'purple_markup_html_to_xhtml(str, NULL, &stripped)', right?

This fixes a bug Emily found where setting an XMPP status message with
an embedded link would drop the link completely. For example, in
Pidgin you set your away message and insert a link so that the message
body is <a href="http://www.example.com/">Example</a>. When we set
this message for an XMPP account it just strips the HTML and sets the
message to "Example". This change causes the message to be
"Example (http://www.example.com/)". It's the same thing we do when
displaying links in tooltips in the blist.

--- a/libpurple/protocols/jabber/libxmpp.c	Sun Jun 10 07:25:09 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Sun Jun 10 15:58:23 2007 +0000
@@ -64,7 +64,7 @@
 	jabber_set_info,				/* set_info */
 	jabber_send_typing,				/* send_typing */
 	jabber_buddy_get_info,			/* get_info */
-	jabber_presence_send,			/* set_away */
+	jabber_presence_send,			/* set_status */
 	jabber_idle_set,				/* set_idle */
 	NULL,							/* change_passwd */
 	jabber_roster_add_buddy,		/* add_buddy */

--- a/libpurple/protocols/jabber/presence.c	Sun Jun 10 07:25:09 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sun Jun 10 15:58:23 2007 +0000
@@ -608,7 +608,7 @@
 				formatted_msg = NULL;
 
 			if(formatted_msg)
-				purple_markup_html_to_xhtml(formatted_msg, NULL, msg);
+				*msg = purple_markup_strip_html(formatted_msg);
 		}
 
 		if(priority)