Mercurial > pidgin.yaz
diff src/protocols/jabber/message.c @ 7310:dd4b4a187171
[gaim-migrate @ 7894]
assorted jabber tweaks
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Tue, 21 Oct 2003 17:18:46 +0000 |
| parents | 7c12dab8e513 |
| children | 02b713a5c7e2 |
line wrap: on
line diff
--- a/src/protocols/jabber/message.c Tue Oct 21 16:34:12 2003 +0000 +++ b/src/protocols/jabber/message.c Tue Oct 21 17:18:46 2003 +0000 @@ -78,6 +78,9 @@ JabberBuddy *jb; JabberBuddyResource *jbr; + if(!jid) + return; + jb = jabber_buddy_find(jm->js, jm->from, TRUE); jbr = jabber_buddy_find_resource(jb, jid->resource); @@ -164,7 +167,12 @@ static void handle_groupchat(JabberMessage *jm) { JabberID *jid = jabber_id_new(jm->from); - JabberChat *chat = jabber_chat_find(jm->js, jid->node, jid->domain); + JabberChat *chat; + + if(!jid) + return; + + chat = jabber_chat_find(jm->js, jid->node, jid->domain); if(!chat) return; @@ -181,10 +189,14 @@ static void handle_groupchat_invite(JabberMessage *jm) { - GHashTable *components = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, g_free); + GHashTable *components; JabberID *jid = jabber_id_new(jm->to); + if(!jid) + return; + + components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + g_hash_table_replace(components, g_strdup("room"), jid->node); g_hash_table_replace(components, g_strdup("server"), jid->node); g_hash_table_replace(components, g_strdup("handle"), jm->js->user->node);