Mercurial > pidgin
changeset 28595:1acb11145fa4
merge of '47697d74271a33e8dfe15fdeef4210b3ca9b762f'
and 'a878de35a8972daab016ed05e7af50043bd856ca'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 17 Nov 2009 23:05:13 +0000 |
| parents | ecca39fe50d7 (current diff) 923681c5406e (diff) |
| children | bd4f23c22dc2 da768548fc99 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Tue Nov 17 23:04:24 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Tue Nov 17 23:05:13 2009 +0000 @@ -3234,6 +3234,12 @@ GList *iter; gboolean has_resources_without_caps = FALSE; + /* if we didn't find a JabberBuddy, we don't have presence for this + buddy, let's assume they can receive files, disco should tell us + when actually trying */ + if (jb == NULL) + return TRUE; + /* find out if there is any resources without caps */ for (iter = jb->resources; iter ; iter = g_list_next(iter)) { JabberBuddyResource *jbr = (JabberBuddyResource *) iter->data;