# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 956550082 0
# Node ID e9414f13d8b7708552b7e90fd9ea780dc42bf55e
# Parent  aad89d9bce85e623a3b4d8f93ac13ef5c819bced
[gaim-migrate @ 168]
Finally. The correct default user is now chosen. Stupid bugs.

committer: Tailor Script <tailor@pidgin.im>

diff -r aad89d9bce85 -r e9414f13d8b7 src/aim.c
--- a/src/aim.c	Mon Apr 24 03:06:25 2000 +0000
+++ b/src/aim.c	Mon Apr 24 04:21:22 2000 +0000
@@ -196,11 +196,9 @@
 	if (widget == name) {
 		gtk_entry_set_text(GTK_ENTRY(pass),"");
 		gtk_entry_select_region(GTK_ENTRY(GTK_COMBO(name)->entry), 0, 0);
-		gtk_window_set_focus(GTK_WINDOW(mainwindow), pass);
+		gtk_widget_grab_focus(pass);
 	} else if (widget == pass) {
-		gtk_window_set_focus(GTK_WINDOW(mainwindow), signon);
-	} else {
-		g_print("what did you press enter on?\n");
+		gtk_widget_grab_focus(signon);
 	}
 
 }
@@ -208,11 +206,10 @@
 
 static void combo_changed(GtkWidget *w, GtkWidget *combo)
 {
-        char *txt = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(combo)->entry), 0, -1);
+        char *txt = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry));
         struct aim_user *u;
         
         if (!(general_options & OPT_GEN_REMEMBER_PASS)) {
-		g_free(txt);
                 return;
         }
 
@@ -224,7 +221,6 @@
                 gtk_entry_set_text(GTK_ENTRY(pass), "");
         }
        
-	g_free(txt); 
         return;
 }
 
@@ -409,13 +405,15 @@
 		int length = g_list_length(all) - g_list_length(srch);
 		
 		gtk_combo_set_value_in_list(GTK_COMBO(name), length, 0);
-                if ((general_options & OPT_GEN_REMEMBER_PASS)) {
-                        combo_changed(NULL, name);
+		if ((general_options & OPT_GEN_REMEMBER_PASS)) {
+			combo_changed(NULL, name);
 			gtk_widget_grab_focus(signon);
-                } else
+		} else {
 			gtk_widget_grab_focus(pass);
-	} else
+		}
+	} else {
 		gtk_widget_grab_focus(name);
+	}
 
 
 	gtk_signal_connect(GTK_OBJECT(remember), "clicked", GTK_SIGNAL_FUNC(set_general_option), (int *)OPT_GEN_REMEMBER_PASS);
diff -r aad89d9bce85 -r e9414f13d8b7 src/gaimrc.c
--- a/src/gaimrc.c	Mon Apr 24 03:06:25 2000 +0000
+++ b/src/gaimrc.c	Mon Apr 24 04:21:22 2000 +0000
@@ -378,8 +378,9 @@
                 p = parse_line(buf);
 
                 if (!strcmp(p->option, "current_user")) {
-                        cur = 1;;
+                        cur = 1;
                 } else if (strcmp(p->option, "user")) {
+			cur = 0;
                         continue;
                 }