[Gaim-commits] CVS: gaim/src multi.c,1.111,1.112 server.c,1.223,1.224

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv6203/src

Modified Files:
	multi.c server.c 
Log Message:
But I say it just to reach you.


Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- multi.c	17 Mar 2002 01:22:35 -0000	1.111
+++ multi.c	17 Mar 2002 04:58:38 -0000	1.112
@@ -896,16 +896,17 @@
 	GList *l = GTK_CLIST(list)->selection;
 	int row = -1;
 	struct aim_user *u = NULL;
-	struct prpl *p = find_prpl(u->protocol);
+	struct prpl *p = NULL;
 	while (l) {
 		row = (int)l->data;
 		u = g_slist_nth_data(aim_users, row);
-		serv_login(u);
+		p = find_prpl(u->protocol);
 		if (!u->gc && p && p->login) {
 			struct prpl *p = find_prpl(u->protocol);
 			if (p && !(p->options & OPT_PROTO_NO_PASSWORD) && !u->password[0]) {
 				do_pass_dlg(u);
 			} else {
+				serv_login(u);
 #ifdef USE_APPLET
 				set_user_state(signing_on);
 #endif /* USE_APPLET */
@@ -914,6 +915,10 @@
 		} else if (u->gc) {
 			u->gc->wants_to_die = TRUE;
 			signoff(u->gc);
+		} else {
+			do_error_dialog(_("You cannot log this account in; you do not have "
+					  "the protocol it uses loaded, or the protocol does "
+					  "not have a login function."), _("Login Error"));
 		}
 		l = l->next;
 	}

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- server.c	16 Mar 2002 00:32:53 -0000	1.223
+++ server.c	17 Mar 2002 04:58:38 -0000	1.224
@@ -58,10 +58,6 @@
 
 		debug_printf(PACKAGE " " VERSION " logging in %s using %s\n", user->username, p->name());
 		p->login(user);
-	} else {
-		do_error_dialog(_("You cannot log this account in; you do not have "
-				  "the protocol it uses loaded, or the protocol does "
-				  "not have a login function."), _("Login Error"));
 	}
 }