Mercurial > pidgin.yaz
changeset 8537:dc818b62379e
[gaim-migrate @ 9276]
jabber fixination
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Wed, 31 Mar 2004 18:37:06 +0000 |
| parents | 008e4576dbfc |
| children | 848dfa9fe9d4 |
| files | src/protocols/jabber/chat.c src/protocols/jabber/message.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/jabber/chat.c Wed Mar 31 15:51:31 2004 +0000 +++ b/src/protocols/jabber/chat.c Wed Mar 31 18:37:06 2004 +0000 @@ -572,7 +572,8 @@ char *room_jid; xmlnode *presence; - room_jid = g_strdup_printf("%s@%s", chat->room, chat->server); + room_jid = g_strdup_printf("%s@%s/%s", chat->room, chat->server, + chat->handle); presence = xmlnode_new("presence"); xmlnode_set_attrib(presence, "to", room_jid); xmlnode_set_attrib(presence, "type", "unavailable");
--- a/src/protocols/jabber/message.c Wed Mar 31 15:51:31 2004 +0000 +++ b/src/protocols/jabber/message.c Wed Mar 31 18:37:06 2004 +0000 @@ -195,6 +195,7 @@ { GHashTable *components; JabberID *jid = jabber_id_new(jm->to); + char *stripped; if(!jid) return; @@ -209,7 +210,9 @@ g_strdup(jm->password)); jabber_id_free(jid); - serv_got_chat_invite(jm->js->gc, jm->to, jm->from, jm->body, components); + stripped = gaim_markup_strip_html(jm->body); + serv_got_chat_invite(jm->js->gc, jm->to, jm->from, stripped, components); + g_free(stripped); } static void handle_error(JabberMessage *jm)