changeset 3483:abaee81fdea2

[gaim-migrate @ 3537] Thanks, deryni committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Fri, 30 Aug 2002 21:37:09 +0000
parents 25eea0717f72
children 5d1dff030d8b
files ChangeLog src/aim.c
diffstat 2 files changed, 19 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Aug 30 20:57:22 2002 +0000
+++ b/ChangeLog	Fri Aug 30 21:37:09 2002 +0000
@@ -61,6 +61,8 @@
 	* aim:// URI's supported with gaim-remote command
 	* Don't auto-login if an existing Gaim session is already
 	  running.
+	* Login all auto-login accounts from login window (Thanks
+	  Etan Reisner)
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)
--- a/src/aim.c	Fri Aug 30 20:57:22 2002 +0000
+++ b/src/aim.c	Fri Aug 30 21:37:09 2002 +0000
@@ -153,6 +153,18 @@
 	serv_login(u);
 }
 
+static void dologin_all(GtkWidget *widget, GtkWidget *w)
+{
+	struct aim_user *u;
+	GSList *users = aim_users;
+
+	while (users) {
+		u = users->data;
+		if (u->options & OPT_USR_AUTO)
+			serv_login(u);
+		users = users->next;
+	}
+}
 
 static void doenter(GtkWidget *widget, GtkWidget *w)
 {
@@ -202,6 +214,7 @@
 
 void show_login()
 {
+	GtkWidget *signon_all;
 	GtkWidget *options;
 #ifdef GAIM_PLUGINS
 	GtkWidget *plugs;
@@ -326,7 +339,7 @@
 	gtk_box_pack_start(GTK_BOX(sbox), hbox, TRUE, TRUE, 0);
 	gtk_widget_show(hbox);
 
-	reg = gtk_button_new_with_label(_("About"));
+	reg = gtk_button_new_with_label(_("Auto-login"));
 	options = gtk_button_new_with_label(_("Options"));
 #ifdef GAIM_PLUGINS
 	plugs = gtk_button_new_with_label(_("Plugins"));
@@ -339,16 +352,16 @@
 #endif
 	}
 
-	gtk_signal_connect(GTK_OBJECT(reg), "clicked", GTK_SIGNAL_FUNC(show_about), NULL);
+	gtk_signal_connect(GTK_OBJECT(reg), "clicked", GTK_SIGNAL_FUNC(dologin_all), NULL);
 	gtk_signal_connect(GTK_OBJECT(options), "clicked", GTK_SIGNAL_FUNC(show_prefs), NULL);
 #ifdef GAIM_PLUGINS
 	gtk_signal_connect(GTK_OBJECT(plugs), "clicked", GTK_SIGNAL_FUNC(show_plugins), NULL);
 #endif
 
-	gtk_box_pack_start(GTK_BOX(hbox), reg, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), plugs, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), options, TRUE, TRUE, 0);
 #ifdef GAIM_PLUGINS
-	gtk_box_pack_start(GTK_BOX(hbox), plugs, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), reg, TRUE, TRUE, 0);
 #endif
 
 	gtk_widget_show(reg);