diff src/aim.c @ 1030:38452403563b

[gaim-migrate @ 1040] updating the buddy list to work better with multiple connections. there are still a bunch of things fucked up with this but i wanted more people to start working on it than just me, especially since i won't be here this weekend. committer: Tailor Script <[e-mail]>

--- a/src/aim.c	Thu Oct 26 18:05:29 2000 +0000
+++ b/src/aim.c	Fri Oct 27 07:53:32 2000 +0000
@@ -60,12 +60,9 @@
 static GtkWidget *name;
 static GtkWidget *pass;
 
-GList *permit = NULL;
-GList *deny = NULL;
 GList *log_conversations = NULL;
 GList *buddy_pounces = NULL;
 GSList *away_messages = NULL;
-GSList *groups = NULL;
 GList *conversations = NULL;
 GList *chat_rooms = NULL;
 
@@ -160,11 +157,12 @@
 		return;
 	}
 
-	u = find_user(username);
+	/* 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 = g_new0(struct aim_user, 1);
 		g_snprintf(u->username, sizeof(u->username), "%s", username);
-		g_snprintf(u->password, sizeof(u->password), "%s", password);
 		u->protocol = PROTO_TOC;
 		u->options = OPT_USR_REM_PASS;
 		aim_users = g_list_append(aim_users, u);
@@ -193,7 +191,7 @@
 	char *txt = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry));
 	struct aim_user *u;
 
-	u = find_user(txt);
+	u = find_user(txt, -1);
 
 	if (u && u->options & OPT_USR_REM_PASS) {
 		gtk_entry_set_text(GTK_ENTRY(pass), u->password);
@@ -438,7 +436,8 @@
 
 int main(int argc, char *argv[])
 {
-	char opt, i;
+	char opt;
+	int i;
 	int opt_acct = 0, opt_help = 0, opt_version = 0,
 	    opt_user = 0, opt_login = 0, do_login_ret = -1;
 	char *opt_user_arg = NULL, *opt_login_arg = NULL;