Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/buddy.c @ 25438:4b8c4870b13a
propagate from branch 'im.pidgin.pidgin.next.minor' (head 7305b29db7bd00d3261f348c71674c93aa31b327)
to branch 'im.pidgin.pidgin' (head d8c03c68d591d9392607d954942ee58b8618d946)
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Mon, 02 Mar 2009 04:18:40 +0000 |
| parents | 3687049b4faf d7dcdba13b88 |
| children | 5f9a24d1c25e |
comparison
equal
deleted
inserted
replaced
| 25437:8998ca47e6d0 | 25438:4b8c4870b13a |
|---|---|
| 1784 JabberID *jid = jabber_id_new(who); | 1784 JabberID *jid = jabber_id_new(who); |
| 1785 | 1785 |
| 1786 if (!jid) | 1786 if (!jid) |
| 1787 return; | 1787 return; |
| 1788 | 1788 |
| 1789 if (jabber_chat_find(js, jid->node, jid->domain)) { | 1789 if (jid->node && jabber_chat_find(js, jid->node, jid->domain)) { |
| 1790 /* For a conversation, include the resource (indicates the user). */ | 1790 /* For a conversation, include the resource (indicates the user). */ |
| 1791 jabber_buddy_get_info_for_jid(js, who); | 1791 jabber_buddy_get_info_for_jid(js, who); |
| 1792 } else { | 1792 } else { |
| 1793 char *bare_jid = jabber_get_bare_jid(who); | 1793 char *bare_jid = jabber_get_bare_jid(who); |
| 1794 jabber_buddy_get_info_for_jid(js, bare_jid); | 1794 jabber_buddy_get_info_for_jid(js, bare_jid); |