Mercurial > pidgin.yaz
diff src/protocols/jabber/chat.c @ 7322:ab828b8c3f22
[gaim-migrate @ 7908]
all sorts of stuff including tweaks to logging so it mostly works again
for jabber.
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Fri, 24 Oct 2003 05:46:01 +0000 |
| parents | dd4b4a187171 |
| children | d60e1629ffde |
line wrap: on
line diff
--- a/src/protocols/jabber/chat.c Thu Oct 23 21:56:16 2003 +0000 +++ b/src/protocols/jabber/chat.c Fri Oct 24 05:46:01 2003 +0000 @@ -69,7 +69,7 @@ room_jid = g_strdup_printf("%s@%s", room, server); - chat = g_hash_table_lookup(js->chats, jabber_normalize(room_jid)); + chat = g_hash_table_lookup(js->chats, jabber_normalize(NULL, room_jid)); g_free(room_jid); return chat; @@ -147,8 +147,6 @@ chat = jabber_chat_find_by_id(js, id); - /* TODO: we get real Jabber IDs from MUC sometimes, we need to cache - * them eventually */ full_jid = g_strdup_printf("%s@%s/%s", chat->room, chat->server, who); jabber_message_send_im(gc, full_jid, message, 0); @@ -194,7 +192,7 @@ return; tmp = g_strdup_printf("%s@%s", room, server); - room_jid = g_strdup(jabber_normalize(tmp)); + room_jid = g_strdup(jabber_normalize(NULL, tmp)); g_free(tmp); chat = g_new0(JabberChat, 1); @@ -248,7 +246,7 @@ JabberStream *js = chat->js; char *room_jid = g_strdup_printf("%s@%s", chat->room, chat->server); - g_hash_table_remove(js->chats, jabber_normalize(room_jid)); + g_hash_table_remove(js->chats, jabber_normalize(NULL, room_jid)); g_free(room_jid); g_free(chat->room);