# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1258499113 0
# Node ID 1acb11145fa4e6c690290aaf76f9ec9cc565fc89
# Parent  ecca39fe50d71f5e7e1e4b8bce4152b45a04a2ec# Parent  923681c5406e35f5d8397d3cf531df1cbdba7813
merge of '47697d74271a33e8dfe15fdeef4210b3ca9b762f'
     and 'a878de35a8972daab016ed05e7af50043bd856ca'

diff -r ecca39fe50d7 -r 1acb11145fa4 libpurple/protocols/jabber/jabber.c
--- 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;