# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 976522266 0
# Node ID 5395053cdee1a1c39a14227f50e0207d292d7d7f
# Parent  229bf438c59142a95d5f28feab06d3fefc4b22b1
[gaim-migrate @ 1240]
ok. it works.

committer: Tailor Script <tailor@pidgin.im>

diff -r 229bf438c591 -r 5395053cdee1 src/buddy.c
--- a/src/buddy.c	Mon Dec 11 07:42:19 2000 +0000
+++ b/src/buddy.c	Mon Dec 11 08:11:06 2000 +0000
@@ -1313,11 +1313,10 @@
 		u = find_user(b->pouncer, b->protocol); /* find our user */
 		if (u == NULL) continue;
 
+		/* check and see if we're signed on as the pouncer */
+		if (u->gc == NULL) continue;
+		
                 if (!strcasecmp(who, normalize(b->name))) { /* find someone to pounce */
-			/* check and see if we're signed on as the pouncer */
-
-			if (u->gc == NULL) continue;
-			
 			if (b->popup == 1)
 			{
 				c = find_conversation(name);
diff -r 229bf438c591 -r 5395053cdee1 src/dialogs.c
--- a/src/dialogs.c	Mon Dec 11 07:42:19 2000 +0000
+++ b/src/dialogs.c	Mon Dec 11 08:11:06 2000 +0000
@@ -1105,6 +1105,7 @@
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
 	gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu),
 			g_list_index(aim_users, ((struct gaim_connection *)connections->data)->user));
+	b->user = ((struct gaim_connection *)connections->data)->user;
 
 	b->menu = optmenu;
 }