# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1190340689 0
# Node ID 485a0bffe4f51fc4322ac48f4dd1c16ec6c26a2e
# Parent  e2347dda167c2e5b40666b5da7ed77583782dd0d
presence is an xmlnode here.

diff -r e2347dda167c -r 485a0bffe4f5 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Fri Sep 21 00:20:20 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Fri Sep 21 02:11:29 2007 +0000
@@ -111,9 +111,8 @@
 	PurplePresence *p = purple_account_get_presence(account);
 	PurpleStatus *tune;
 
-	if(NULL == status) {
-		PurplePresence *gpresence = purple_account_get_presence(account);
-		status = purple_presence_get_active_status(gpresence);
+	if (NULL == status) {
+		status = purple_presence_get_active_status(p);
 	}
 
 	if(!purple_status_is_active(status))
@@ -148,8 +147,8 @@
 		js->old_priority != priority || CHANGED(js->old_avatarhash, js->avatar_hash)) {
 		js->allowBuzz = allowBuzz;
 
-		if (js->googletalk && stripped == NULL && purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) {
-			tune = purple_presence_get_status(presence, "tune");
+		if (js->googletalk && stripped == NULL && purple_presence_is_status_primitive_active(p, PURPLE_STATUS_TUNE)) {
+			tune = purple_presence_get_status(p, "tune");
 			stripped = jabber_google_presence_outgoing(tune);
 		}
 
@@ -181,7 +180,7 @@
 	}
 					  	
 	/* next, check if there are any changes to the tune values */
-	tune = purple_presence_get_status(purple_status_get_presence(status), "tune");
+	tune = purple_presence_get_status(p, "tune");
 	if (tune && purple_status_is_active(tune)) {
 		artist = purple_status_get_attr_string(tune, PURPLE_TUNE_ARTIST);
 		title = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE);
@@ -743,7 +742,6 @@
 		}
 
 		if((found_jbr = jabber_buddy_find_resource(jb, NULL))) {
-			const char *message;
 			jabber_google_presence_incoming(js, buddy_name, found_jbr);
 			purple_prpl_got_user_status(js->gc->account, buddy_name, jabber_buddy_state_get_status_id(found_jbr->state), "priority", found_jbr->priority, "message", found_jbr->status, NULL);
 		} else {