[Gaim-commits] CVS: gaim/src aim.c,1.167,1.168 server.c,1.200,1.201

[Rob F. <rob...@us...>]

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

Modified Files:
	aim.c server.c 
Log Message:
This was kinda annoying. I was trying to sign on to my IRC account from the
first screen. Wouldn't let me. It kept bitching about my password being empty.
This should fix it.



Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- aim.c	2001/10/15 19:52:44	1.167
+++ aim.c	2001/10/18 00:44:42	1.168
@@ -141,13 +141,10 @@
 		return;
 	}
 
-	if (!strlen(password)) {
-		do_error_dialog(_("Please enter your password"), _("Signon Error"));
-		return;
-	}
+	/* if there is more than one user of the same name, then fuck 
+	 * them, they just have to use the account editor to sign in 
+	 * the second one */
 
-	/* if there is more than one user of the same name, then fuck them, they just have
-	 * to use the account editor to sign in the second one */
 	u = find_user(username, -1);
 	if (!u)
 		u = new_user(username, DEFAULT_PROTO, OPT_USR_REM_PASS);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- server.c	2001/10/15 02:43:44	1.200
+++ server.c	2001/10/18 00:44:43	1.201
@@ -44,9 +44,16 @@
 void serv_login(struct aim_user *user)
 {
 	struct prpl *p = find_prpl(user->protocol);
+	
 	if (user->gc != NULL)
 		return;
+
 	if (p && p->login) {
+		if (!strlen(user->password) && !(p->options & OPT_PROTO_NO_PASSWORD)) {
+			do_error_dialog(_("Please enter your password"), _("Signon Error"));
+			return;
+		}
+
 		debug_printf("Logging in using %s\n", (*p->name)());
 		(*p->login)(user);
 	} else {