pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16226] branches/soc-2006-blist-efficiency/src/blist.c

[<aar...@us...>]

Revision: 16226
Author:   aaronsheldon
Date:     2006-06-06 10:42:02 -0700 (Tue, 06 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16226&view=rev

Log Message:
-----------
Fixes a potential segfault in blist.c in gaim_blist_add_account where a 
check existed but was _after_ the questionable assignment.

Modified Paths:
--------------
    branches/soc-2006-blist-efficiency/src/blist.c
Modified: branches/soc-2006-blist-efficiency/src/blist.c
===================================================================
--- branches/soc-2006-blist-efficiency/src/blist.c	2006-06-06 05:14:42 UTC (rev 16225)
+++ branches/soc-2006-blist-efficiency/src/blist.c	2006-06-06 17:42:02 UTC (rev 16226)
@@ -2244,10 +2244,11 @@
 
 void gaim_blist_add_account(GaimAccount *account)
 {
-	GaimBlistUiOps *ops = gaimbuddylist->ui_ops;
+	GaimBlistUiOps *ops;
 	GaimBlistNode *gnode, *cnode, *bnode;
 
 	g_return_if_fail(gaimbuddylist != NULL);
+	ops = gaimbuddylist->ui_ops;
 
 	if (!ops || !ops->update)
 		return;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16261] branches/soc-2006-blist-efficiency/src/blist.c

[<aar...@us...>]

Revision: 16261
Author:   aaronsheldon
Date:     2006-06-11 21:23:04 -0700 (Sun, 11 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16261&view=rev

Log Message:
-----------
Saves 1 (pointless) check/loop through blist_node_next.

Modified Paths:
--------------
    branches/soc-2006-blist-efficiency/src/blist.c
Modified: branches/soc-2006-blist-efficiency/src/blist.c
===================================================================
--- branches/soc-2006-blist-efficiency/src/blist.c	2006-06-11 21:48:41 UTC (rev 16260)
+++ branches/soc-2006-blist-efficiency/src/blist.c	2006-06-12 04:23:04 UTC (rev 16261)
@@ -731,13 +731,15 @@
 GaimBlistNode *gaim_blist_node_next(GaimBlistNode *node, gboolean offline)
 {
 	GaimBlistNode *ret = node;
-	
+
+	if (offline)
+		return get_next_node(ret, TRUE);
 	do
 	{
 		ret = get_next_node(ret, TRUE);
-	} while (ret && !offline && GAIM_BLIST_NODE_IS_BUDDY(ret) &&
+	} while (ret && GAIM_BLIST_NODE_IS_BUDDY(ret) &&
 			!gaim_account_is_connected(gaim_buddy_get_account((GaimBuddy *)ret)));
-	
+
 	return ret;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.