# HG changeset patch # User Nathan Walp # Date 1054918402 0 # Node ID 147f4c25af154628896994ff24bbb4745253bf3d # Parent 171fdd5493b96653f6cf61e491564998254b7c03 [gaim-migrate @ 6201] compile fixes and cleanups committer: Tailor Script diff -r 171fdd5493b9 -r 147f4c25af15 src/blist.c --- a/src/blist.c Fri Jun 06 16:20:52 2003 +0000 +++ b/src/blist.c Fri Jun 06 16:53:22 2003 +0000 @@ -761,7 +761,7 @@ hb.name = normalize(n); hb.account = account; hb.group = group; - if (buddy = g_hash_table_lookup(gaimbuddylist->buddies, &hb)) + if ((buddy = g_hash_table_lookup(gaimbuddylist->buddies, &hb)) != NULL) return buddy; group = ((GaimBlistNode*)group)->next; } diff -r 171fdd5493b9 -r 147f4c25af15 src/conversation.c --- a/src/conversation.c Fri Jun 06 16:20:52 2003 +0000 +++ b/src/conversation.c Fri Jun 06 16:53:22 2003 +0000 @@ -421,7 +421,7 @@ gaim_prefs_get_bool("/core/conversations/away_back_on_send")) { if (awaymessage != NULL) { - do_im_back(); + do_im_back(NULL, NULL); } else if (gc->away) { serv_set_away(gc, GAIM_AWAY_CUSTOM, NULL); diff -r 171fdd5493b9 -r 147f4c25af15 src/server.c --- a/src/server.c Fri Jun 06 16:20:52 2003 +0000 +++ b/src/server.c Fri Jun 06 16:53:22 2003 +0000 @@ -1149,7 +1149,7 @@ gaim_blist_update_buddy_presence(b, loggedin); /* Now, update the rest of the buddies in the list */ - while (b = gaim_find_buddy(gc->account, NULL)) { + while ((b = gaim_find_buddy(gc->account, NULL)) != NULL) { gaim_blist_update_buddy_presence(b, loggedin); gaim_blist_update_buddy_idle(b, idle); gaim_blist_update_buddy_evil(b, evil);