# HG changeset patch # User Mark Doliner # Date 1065375036 0 # Node ID 669af8c0801af5f9f6fc38776b4b4d0026f2d5f4 # Parent aee5fd893aba314b81bfbff52892e22e088e77e2 [gaim-migrate @ 7726] This fixes the following crash bug: 1) Open account dialog 2) Edit an account 3) Close account dialog 4) Save account committer: Tailor Script diff -r aee5fd893aba -r 669af8c0801a src/gtkaccount.c --- a/src/gtkaccount.c Sun Oct 05 16:55:20 2003 +0000 +++ b/src/gtkaccount.c Sun Oct 05 17:30:36 2003 +0000 @@ -79,8 +79,6 @@ { GaimGtkAccountDialogType type; - AccountsWindow *accounts_window; - GaimAccount *account; GaimProtocol protocol; char *protocol_id; @@ -1125,19 +1123,19 @@ } /* Adds the account to the list, or modify the existing entry. */ - if (dialog->accounts_window != NULL) { + if (accounts_window != NULL) { index = g_list_index(gaim_accounts_get_all(), dialog->account); if (index != -1 && (gtk_tree_model_iter_nth_child( - GTK_TREE_MODEL(dialog->accounts_window->model), &iter, + GTK_TREE_MODEL(accounts_window->model), &iter, NULL, index))) { - set_account(dialog->accounts_window->model, &iter, + set_account(accounts_window->model, &iter, dialog->account); } else { - add_account(dialog->accounts_window, dialog->account); + add_account(accounts_window, dialog->account); gaim_accounts_add(dialog->account); } } @@ -1173,7 +1171,6 @@ dialog = g_new0(AccountPrefsDialog, 1); - dialog->accounts_window = accounts_window; dialog->account = account; dialog->type = type; dialog->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -1454,6 +1451,7 @@ accedit_win_destroy_cb(GtkWidget *w, GdkEvent *event, AccountsWindow *dialog) { gaim_gtk_accounts_window_hide(); + return 0; } @@ -1573,7 +1571,7 @@ { gtk_widget_destroy(dialog->window); - accedit_win_destroy_cb(NULL, NULL, dialog); + gaim_gtk_accounts_window_hide(); } static void