changeset 2531:93b50fa8f410

[gaim-migrate @ 2544] 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. committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Thu, 18 Oct 2001 00:44:43 +0000
parents f909dc7dbb43
children e0be17484d62
files ChangeLog src/aim.c src/server.c
diffstat 3 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 18 00:30:34 2001 +0000
+++ b/ChangeLog	Thu Oct 18 00:44:43 2001 +0000
@@ -18,6 +18,8 @@
 	* Redesigned Modify Account window (thanks Sean Egan)
 	* Add buddy dialog now lets you select which protocol
 	  to add the buddy to
+	* Attempting to sign on to accounts, from the main screen,  
+	  which do not require a password now functions properly.
 
 version 0.45 (10/04/2001):
 	* New plugin event: event_chat_send_invite
--- a/src/aim.c	Thu Oct 18 00:30:34 2001 +0000
+++ b/src/aim.c	Thu Oct 18 00:44:43 2001 +0000
@@ -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);
--- a/src/server.c	Thu Oct 18 00:30:34 2001 +0000
+++ b/src/server.c	Thu Oct 18 00:44:43 2001 +0000
@@ -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 {