# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1209438895 0
# Node ID a95fcf01f72c35f8904dd45b98d74449701fb915
# Parent  2404b13940e978e736d2a6c33f757a3f458bb803# Parent  f1a4ad1526a268d181970e23c7456218f2363358
merge of '0e779a37ee17a7bb7ad39bbe2b37eeca45975655'
     and '52c0efb045580dac7b6f5e40c91002e917e0cae3'

diff -r f1a4ad1526a2 -r a95fcf01f72c libpurple/protocols/jabber/buddy.c
--- a/libpurple/protocols/jabber/buddy.c	Tue Apr 29 02:58:23 2008 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Tue Apr 29 03:14:55 2008 +0000
@@ -155,12 +155,8 @@
 	}
 	jbr->priority = priority;
 	jbr->state = state;
-	if(jbr->status)
-		g_free(jbr->status);
-	if (status)
-		jbr->status = g_markup_escape_text(status, -1);
-	else
-		jbr->status = NULL;
+	g_free(jbr->status);
+	jbr->status = status != NULL ? g_markup_escape_text(status, -1) : NULL;
 
 	return jbr;
 }
diff -r f1a4ad1526a2 -r a95fcf01f72c libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Tue Apr 29 02:58:23 2008 +0000
+++ b/libpurple/protocols/jabber/presence.c	Tue Apr 29 03:14:55 2008 +0000
@@ -369,17 +369,29 @@
 
 typedef struct _JabberPresenceCapabilities {
 	JabberStream *js;
-	JabberBuddyResource *jbr;
+	JabberBuddy *jb;
 	char *from;
 } JabberPresenceCapabilities;
 
 static void jabber_presence_set_capabilities(JabberCapsClientInfo *info, gpointer user_data) {
 	JabberPresenceCapabilities *userdata = user_data;
+	JabberID *jid;
+	JabberBuddyResource *jbr;
 	GList *iter;
 
-	if(userdata->jbr->caps)
-		jabber_caps_free_clientinfo(userdata->jbr->caps);
-	userdata->jbr->caps = info;
+	jid = jabber_id_new(userdata->from);
+	jbr = jabber_buddy_find_resource(userdata->jb, jid->resource);
+	jabber_id_free(jid);
+
+	if(!jbr) {
+		g_free(userdata->from);
+		g_free(userdata);
+		return;
+	}
+
+	if(jbr->caps)
+		jabber_caps_free_clientinfo(jbr->caps);
+	jbr->caps = info;
 
 	if (info) {
 		for(iter = info->features; iter; iter = g_list_next(iter)) {
@@ -742,7 +754,7 @@
 				if(node && ver) {
 					JabberPresenceCapabilities *userdata = g_new0(JabberPresenceCapabilities, 1);
 					userdata->js = js;
-					userdata->jbr = jbr;
+					userdata->jb = jb;
 					userdata->from = g_strdup(from);
 					jabber_caps_get_info(js, from, node, ver, ext, jabber_presence_set_capabilities, userdata);
 				}