# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1247722133 0
# Node ID b2f0d92aa2997a9d31ac8a20febe0ec08e2ae934
# Parent  29e85d4247013a363a95530b750e37c1eb98dab6# Parent  ccb1f1777df756e61707883f0f1631ea27d55c1e
merge of '47cc43740a8e5263c6eeb5b06416b3ba2434c57d'
     and '7cbc752a8f08158849396dab8039719a06b82ea9'

diff -r 29e85d424701 -r b2f0d92aa299 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Thu Jul 16 05:28:17 2009 +0000
+++ b/libpurple/protocols/jabber/presence.c	Thu Jul 16 05:28:53 2009 +0000
@@ -91,9 +91,9 @@
 		}
 
 		if ((jbr = jabber_buddy_find_resource(jb, NULL))) {
-			purple_prpl_got_user_status(js->gc->account, username, jabber_buddy_state_get_status_id(jbr->state), "priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL);
+			purple_prpl_got_user_status(account, username, jabber_buddy_state_get_status_id(jbr->state), "priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL);
 		} else {
-			purple_prpl_got_user_status(js->gc->account, username, "offline", msg ? "message" : NULL, msg, NULL);
+			purple_prpl_got_user_status(account, username, "offline", msg ? "message" : NULL, msg, NULL);
 		}
 		g_free(msg);
 	}