[Gaim-commits] CVS: gaim/src connection.c,1.85,1.86 util.h,1.73,1.74

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18990/src

Modified Files:
	connection.c util.h 
Log Message:
We no longer call "serv_add_buddies" at log in.  Any PRPL that relied on
that should look through the buddy list itself and do whatever it needs
to after calling gaim_connection_set_state(gc, GAIM_CONNECTED);


Index: connection.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -p -r1.85 -r1.86
--- connection.c	19 Apr 2005 03:16:43 -0000	1.85
+++ connection.c	25 Apr 2005 03:55:07 -0000	1.86
@@ -265,11 +265,9 @@ gaim_connection_set_state(GaimConnection
 	}
 
 	if (gc->state == GAIM_CONNECTED) {
-		GaimBlistNode *gnode,*cnode,*bnode;
 #if 0
 		GList *wins;
 #endif
-		GList *add_buds = NULL;
 		GaimAccount *account;
 		GaimPresence *presence;
 
@@ -311,32 +309,6 @@ gaim_connection_set_state(GaimConnection
 #endif
 		gaim_signal_emit(gaim_connections_get_handle(), "signed-on", gc);
 
-		/* let the prpl know what buddies we pulled out of the local list */
-		/* XXX - Remove this and let the prpl take care of it itself? */
-		for (gnode = gaim_get_blist()->root; gnode; gnode = gnode->next) {
-			if(!GAIM_BLIST_NODE_IS_GROUP(gnode))
-				continue;
-			for(cnode = gnode->child; cnode; cnode = cnode->next) {
-				if(!GAIM_BLIST_NODE_IS_CONTACT(cnode))
-					continue;
-				for(bnode = cnode->child; bnode; bnode = bnode->next) {
-					GaimBuddy *b;
-					if(!GAIM_BLIST_NODE_IS_BUDDY(bnode))
-						continue;
-
-					b = (GaimBuddy *)bnode;
-					if(b->account == gc->account) {
-						add_buds = g_list_append(add_buds, b);
-					}
-				}
-			}
-		}
-
-		if(add_buds) {
-			serv_add_buddies(gc, add_buds);
-			g_list_free(add_buds);
-		}
-
 		serv_set_permit_deny(gc);
 
 		update_keepalive(gc, TRUE);

Index: util.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -p -r1.73 -r1.74
--- util.h	26 Mar 2005 02:43:45 -0000	1.73
+++ util.h	25 Apr 2005 03:55:07 -0000	1.74
@@ -350,6 +350,7 @@ const gchar *gaim_home_dir(void);
 
 /**
  * Returns the gaim settings directory in the user's home directory.
+ * This is usually ~/.gaim
  *
  * @return The gaim settings directory.
  *