diff src/gtkmain.c @ 10428:04c663ccbcb1

[gaim-migrate @ 11680] Shuffle some things around in blist.c and make some things more uniform. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 27 Dec 2004 04:43:49 +0000
parents 9903182f2aac
children f7f06cb69d5e
line wrap: on
line diff
--- a/src/gtkmain.c	Sun Dec 26 23:37:55 2004 +0000
+++ b/src/gtkmain.c	Mon Dec 27 04:43:49 2004 +0000
@@ -617,16 +617,22 @@
 
 	gaim_plugins_probe(NULL);
 
-	/* XXX - Remove this check.  Maybe in 2005.  --KingAnt, 25 Jul 2004 */
+	/* 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_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();