diff src/gtkmain.c @ 10738:55af3fa46329

[gaim-migrate @ 12340] Lots of changes here. A lot of it stems from chaning gaim_account_connect() so that it DOES NOT have the GaimStatus parameter. It will attempt to use the GaimStatus of your account from the last time it was connected (which doesn't work quite right yet). My goal here was to save and load each account's GaimStatuses to accounts.xml, so if you were "away" when you signed off then you'll be "away" when you sign back on. Not quite there yet. committer: Tailor Script <[e-mail]>

--- a/src/gtkmain.c	Sat Mar 26 19:19:33 2005 +0000
+++ b/src/gtkmain.c	Sat Mar 26 20:08:43 2005 +0000
@@ -114,14 +114,14 @@
 			account = gaim_accounts_find(names[i], NULL);
 			if (account != NULL) { /* found a user */
 				ret = 0;
-				gaim_account_connect(account, gaim_account_get_status(account, "online"));
+				gaim_account_connect(account);
 			}
 		}
 		g_strfreev(names);
 	} else { /* no name given, use the first account */
 		account = (GaimAccount *)gaim_accounts_get_all()->data;
 		ret = 0;
-		gaim_account_connect(account, gaim_account_get_status(account, "online"));
+		gaim_account_connect(account);
 	}
 
 	return ret;
@@ -456,7 +456,6 @@
 	int opt;
 	gboolean gui_check;
 	gboolean debug_enabled;
-	gchar *gaimrc, *accountsxml;
 #if HAVE_SIGNAL_H
 	char errmsg[BUFSIZ];
 #endif
@@ -624,21 +623,6 @@
 		abort();
 	}
 
-	/* TODO: Remove this check.  Maybe in 2005.  --KingAnt, 25 Jul 2004 */
-	gaimrc = g_build_filename(gaim_home_dir(), ".gaimrc", NULL);
-	accountsxml = g_build_filename(gaim_user_dir(), "accounts.xml", NULL);
-	if (g_file_test(gaimrc, G_FILE_TEST_EXISTS) &&
-		!g_file_test(accountsxml, G_FILE_TEST_EXISTS))
-	{
-		gaim_notify_error(NULL, NULL, _("Unable to load preferences"),
-						  _("Gaim was not able to load your preferences "
-							"because they are stored in an old format "
-							"that is no longer used.  Please reconfigure "
-							"your settings using the Preferences window."));
-	}
-	g_free(gaimrc);
-	g_free(accountsxml);
-
 	/* TODO: Move blist loading into gaim_blist_init() */
 	gaim_set_blist(gaim_blist_new());
 	gaim_blist_load();
@@ -681,8 +665,10 @@
 		}
 	}
 
-	if (!opt_acct && !opt_nologin)
-		gaim_accounts_auto_login(GAIM_GTK_UI);
+	if (!opt_acct && opt_nologin)
+	{
+		/* TODO: Need to disable all accounts or set them all to offline */
+	}
 
 	if (opt_acct || (gaim_accounts_get_all() == NULL)) {
 		gaim_gtk_accounts_window_show();