# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1071193274 0
# Node ID 4ed0c93816f6ae4cfc9b57091ec6499700bec8f2
# Parent  99ffabc6ce736742071e95aae0fa0c6c262ef74f
[gaim-migrate @ 8488]
what the hell was I thinking?

oh, and whitespace fixen for the ChangeLog

committer: Tailor Script <tailor@pidgin.im>

diff -r 99ffabc6ce73 -r 4ed0c93816f6 ChangeLog
--- a/ChangeLog	Fri Dec 12 00:14:40 2003 +0000
+++ b/ChangeLog	Fri Dec 12 01:41:14 2003 +0000
@@ -1161,7 +1161,7 @@
 	* All of the major and I believe all of the minor memory leaks are 
 	  now fixed
 	  (Thanks to Peter Teichman, Larry Ewing, Jeramey Crawford, and me)
-	
+
 version 0.9.11 (03/22/2000):
 	* <STRIKE>Strike Tag Support</STRIKE> :-)
 	* Another memory leak fix
@@ -1216,7 +1216,7 @@
 	* Multiple browser support, some Netscape buggies fixed.
 	* Permit/Deny preferences moved to 'Permit' pane on buddylist.
 	* Fixed problem with _, ', and \ in passwords
-	  
+
 version 0.9.6  (08/01/1999):
 	* Fixed 'log all conversation' segfault
 	* Added NAS support
diff -r 99ffabc6ce73 -r 4ed0c93816f6 src/protocols/jabber/presence.c
--- a/src/protocols/jabber/presence.c	Fri Dec 12 00:14:40 2003 +0000
+++ b/src/protocols/jabber/presence.c	Fri Dec 12 01:41:14 2003 +0000
@@ -145,7 +145,7 @@
 	JabberID *jid;
 	JabberChat *chat;
 	JabberBuddy *jb;
-	JabberBuddyResource *jbr = FALSE;
+	JabberBuddyResource *jbr = NULL;
 	GaimBuddy *b;
 	char *buddy_name;
 	int state = 0;
@@ -351,10 +351,7 @@
 					status);
 		}
 
-		if(!jbr)
-			jbr = jabber_buddy_find_resource(jb, jid->resource);
-
-		if(jbr)
+		if((jbr = jabber_buddy_find_resource(jb, NULL)))
 			serv_got_update(js->gc, buddy_name, 1, 0, b->signon, b->idle,
 					jbr->state);
 		else