# HG changeset patch # User Mark Doliner # Date 1141306852 0 # Node ID a6b846c71358090177138df4b95a28c93b98c47b # Parent 14d1892e09328420b2a232ad9c34d0aec23ebec0 [gaim-migrate @ 15748] Set a handle for the "You've been disconnected, Reconnect? Modify Account?" dialog so that Gaim closes the dialog if you delete the account. This prevents a crash when doing the following. 1. An account gets disconnected (you can reproduce this by setting your oscar login host to "DoesNotExist" 2. Click on the error button to bring up the dialog 3. Delete the account from the account editor 4. Click on Connect or Modify in the error dialog gaim_request dialogs have a high potential for crashes if the handle is not specified. committer: Tailor Script diff -r 14d1892e0932 -r a6b846c71358 src/gtkblist.c --- a/src/gtkblist.c Thu Mar 02 05:58:21 2006 +0000 +++ b/src/gtkblist.c Thu Mar 02 13:40:52 2006 +0000 @@ -3493,7 +3493,7 @@ primary = g_strdup_printf(_("%s disconnected"), gaim_account_get_username(account)); text = g_hash_table_lookup(gtkblist->connection_errors, account); - + if (gaim_account_is_connected(account)) { gaim_notify_formatted(NULL, _("Connection Error"), @@ -3502,12 +3502,12 @@ else { gboolean enabled = gaim_account_get_enabled(account, gaim_core_get_ui()); - gaim_request_action(NULL, _("Connection Error"), primary, text, 2, + gaim_request_action(account, _("Connection Error"), primary, text, 2, account, 3, _("OK"), NULL, _("Modify Account"), GAIM_CALLBACK(ce_modify_account_cb), enabled ? _("Connect") : _("Enable Account"), - enabled ? GAIM_CALLBACK(gaim_account_connect) : + enabled ? GAIM_CALLBACK(gaim_account_connect) : GAIM_CALLBACK(ce_enable_account_cb)); } gtk_widget_destroy(GTK_WIDGET(widget));