# HG changeset patch # User Will Thompson # Date 1194818989 0 # Node ID 3c0b20dd2805c043d8fd9d75f72bd6b9502ff6c1 # Parent 8ffb65f3c0e94bad30e94d01fbc1bf43e164c61b Don't open a dialog window on connection errors --- they're shown in the buddy list with mini-dialogs now. diff -r 8ffb65f3c0e9 -r 3c0b20dd2805 pidgin/gtkconn.c --- a/pidgin/gtkconn.c Sun Nov 11 21:56:58 2007 +0000 +++ b/pidgin/gtkconn.c Sun Nov 11 22:09:49 2007 +0000 @@ -136,43 +136,6 @@ } 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 @@ 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