changeset 6243:34d553c43e8b

[gaim-migrate @ 6737] This doesn't fix the "moving Buddies Causes Lockup" bug, but I looked into it. Gaim is looping at the end of serv_got_update(), in the while loop on line 1146 I see two possible causes for this: 1) gaim_find_buddy() is incorrectly iterating through the blist 2) dragging buddies like there's no tomorrow messes up the order of the blist Someone with more knowledge of how the blist works should look into this before 0.67 It is not an oscar problem :-) committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 20 Jul 2003 07:35:32 +0000
parents f0b0c5bca588
children 519028f52516
files src/server.c
diffstat 1 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/server.c	Sun Jul 20 05:11:14 2003 +0000
+++ b/src/server.c	Sun Jul 20 07:35:32 2003 +0000
@@ -978,6 +978,7 @@
 
 		/* XXX UGLY HACK OF THE YEAR
 		 * Robot101 will fix this after his exams. honest.
+		 * I guess he didn't specify WHICH exams, exactly...
 		 */
 		if (docklet_count &&
 		    gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages") &&
@@ -1037,8 +1038,7 @@
 	}
 
 	if (!b) {
-		gaim_debug(GAIM_DEBUG_ERROR, "server",
-				   "No such buddy: %s\n", name);
+		gaim_debug(GAIM_DEBUG_ERROR, "server", "No such buddy: %s\n", name);
 		return;
 	}
 
@@ -1054,8 +1054,7 @@
 		gaim_pounce_execute(gc->account, b->name, GAIM_POUNCE_IDLE);
 		gaim_event_broadcast(event_buddy_idle, gc, b->name);
 		system_log(log_idle, gc, b, OPT_LOG_BUDDY_IDLE);
-	}
-	if (b->idle && !idle) {
+	} else if (b->idle && !idle) {
 		gaim_pounce_execute(gc->account, b->name, GAIM_POUNCE_IDLE_RETURN);
 		gaim_event_broadcast(event_buddy_unidle, gc, b->name);
 		system_log(log_unidle, gc, b, OPT_LOG_BUDDY_IDLE);
@@ -1134,7 +1133,16 @@
 	
 	gaim_blist_update_buddy_presence(b, loggedin);
 
-	/* Now, update the rest of the buddies in the list */
+	/*
+	 * Now, update the rest of the buddies in the list.  This is weird, by 
+	 * the way.  Basically we call gaim_find_buddy() until it returns null.  
+	 * Calling gaim_find_buddy() with a name sets a static variable.  Then 
+	 * calling it without a name uses that static reference to return other 
+	 * stuff.  We can't be sure that the above code didn't call 
+	 * gaim_find_buddy() again with another buddy name, so we "reseed" the 
+	 * function here.
+	 */
+	b = gaim_find_buddy(account, name);
 	while ((b = gaim_find_buddy(gc->account, NULL)) != NULL) {
 		gaim_blist_update_buddy_presence(b, loggedin);
 		gaim_blist_update_buddy_idle(b, idle);