diff src/gtkconn.c @ 11638:3a05b53a589e

[gaim-migrate @ 13914] Some bits'n'pieces: A bunch of memory leak fixes Fix newly created accounts to connect in the currently active global status Fix the modify account dialog to only show relevant user options etc. Update sametime to use some more of the new status stuff, it still needs more love though. Some s/online/available/ for consistency across prpls Fix a racyness in disconnecting connections that want to die (fixes the Yahoo crash when signing on somewhere else) Sorry if I caused any conflicts! committer: Tailor Script <[e-mail]>

--- a/src/gtkconn.c	Mon Oct 10 12:29:30 2005 +0000
+++ b/src/gtkconn.c	Mon Oct 10 17:59:48 2005 +0000
@@ -187,13 +187,15 @@
 				  gaim_account_get_protocol_name(account));
 	    }
 	
-	    p = g_strdup_printf(_("%s could not connect"), n);
-	    s = g_strdup_printf(_("%s was unable to connect due to an error. %s The account has been disabled. "
-				  "Correct the error and reenable to account to connect."), n, text);
+	    p = g_strdup_printf(_("%s disconnected"), n);
+	    s = g_strdup_printf(_("%s was disconnected due to an error. %s The account has been disabled. "
+				  "Correct the error and reenable the account to connect."), n, text);
 	    gaim_notify_error(NULL, NULL, p, s);
 	    g_free(p);
 	    g_free(s);
 	    g_free(n);
+		/* XXX: do we really want to disable the account when it's disconnected by wants_to_die?
+		 *      This normally happens when you sign on from somewhere else. */
 	    gaim_account_set_enabled(account, GAIM_GTK_UI, FALSE);
 	}
 }