im.pidgin.cpw.resiak.disconnectreason: 8dd1c3bae575806fdbbaf15b21ff9b9ad63b2156

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 8dd1c3bae575806fdbbaf15b21ff9b9ad63b2156
Ancestor: a26d74591bee77c9d74d3458951aca7d66a13c6a
Author: resiak at soc.pidgin.im
Date: 2007-11-11T22:09:49
Branch: im.pidgin.cpw.resiak.disconnectreason

Modified files:
        pidgin/gtkconn.c

ChangeLog: 

Don't open a dialog window on connection errors --- they're shown in the buddy
list with mini-dialogs now.

-------------- next part --------------
============================================================
--- pidgin/gtkconn.c	c4ce035ad4d46c129fcf9fb770f73b2b01fe4cbe
+++ pidgin/gtkconn.c	56b9a1c2e1b1c647d4df32b5020c89d285915eb0
@@ -136,43 +136,6 @@ static void
 }
 
 static void
-notify_account_disabled(PurpleAccount *account,
-                        PurpleConnectionError reason,
-                        const char *text)
-{
-	const char *username = purple_account_get_username(account);
-	const char *alias = purple_account_get_alias(account);
-	const char *protocol = purple_account_get_protocol_name(account);
-	char *p, *s, *n;
-
-	if (alias)
-		n = g_strdup_printf("%s (%s) (%s)", username, alias, protocol);
-	else
-		n = g_strdup_printf("%s (%s)", username, protocol);
-
-	p = g_strdup_printf(_("%s disconnected"), n);
-
-	if(reason == PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT)
-		s = g_strdup_printf(
-			_("%s\n\n"
-			"%s will not attempt to reconnect the account until you "
-			"re-enable the account.  See %s for information on how to "
-			"compile %s with SSL support."), text, PIDGIN_NAME,
-			"http://developer.pidgin.im/wiki/FAQssl", PIDGIN_NAME);
-	else
-		s = g_strdup_printf(
-			_("%s\n\n"
-			"%s will not attempt to reconnect the account until you "
-			"correct the error and re-enable the account."), text,
-			PIDGIN_NAME);
-
-	purple_notify_error(NULL, NULL, p, s);
-	g_free(p);
-	g_free(s);
-	g_free(n);
-}
-
-static void
 pidgin_connection_report_disconnect_reason (PurpleConnection *gc,
                                             PurpleConnectionError reason,
                                             const char *text)
@@ -199,9 +162,6 @@ pidgin_connection_report_disconnect_reas
 		if (info != NULL)
 			g_hash_table_remove(auto_reconns, account);
 
-		if (reason != PURPLE_CONNECTION_ERROR_NAME_IN_USE)
-			notify_account_disabled(account, reason, text);
-
 		/*
 		 * TODO: Do we really want to disable the account when it's
 		 * disconnected by wants_to_die?  This happens when you sign