Mercurial > pidgin.yaz
changeset 17815:60bc2827d0e7
merge of '0e092e2c969ff59e242f866fd69d643b77bad18c'
and '49fd2d3743c303820668e5566f9513c3a16bca71'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 10 Jun 2007 15:59:10 +0000 |
| parents | 04f1a6da47a2 (current diff) d495103dcf88 (diff) |
| children | 2c425e60fb1d 210fc36306e4 7577706bde9c |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/libxmpp.c Sun Jun 10 15:51:29 2007 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Sun Jun 10 15:59:10 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 15:51:29 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Sun Jun 10 15:59:10 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)