Mercurial > pidgin.yaz
changeset 7835:4ed0c93816f6
[gaim-migrate @ 8488]
what the hell was I thinking?
oh, and whitespace fixen for the ChangeLog
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Fri, 12 Dec 2003 01:41:14 +0000 |
| parents | 99ffabc6ce73 |
| children | 3738e3ac6d88 |
| files | ChangeLog src/protocols/jabber/presence.c |
| diffstat | 2 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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