diff options
| -rw-r--r-- | addressbook/ChangeLog | 9 | ||||
| -rw-r--r-- | addressbook/gui/widgets/eab-gui-util.c | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 31baa3aacf..27e23fed75 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,12 @@ +2004-03-22 Chris Toshok <toshok@ximian.com> + + [ fixes bug #53653, and a couple other instances ] + + * gui/widgets/eab-gui-util.c (file_exists): REJECT -> CANCEL, so + esc works (patch from Pratik V. Parikh <pratikvp@despammed.com>) + (save_it): REJECT -> CANCEL. + (eab_select_source): same. + 2004-03-17 Hans Petter Jansson <hpj@ximian.com> Fixes #53625. diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 1a5d06f2a2..efa128e93a 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -233,7 +233,7 @@ file_exists(GtkFileSelection *filesel, const char *filename) _("%s already exists\nDo you want to overwrite it?"), filename); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Overwrite"), GTK_RESPONSE_ACCEPT, NULL); @@ -263,7 +263,7 @@ save_it(GtkWidget *widget, SaveAsInfo *info) case GTK_RESPONSE_ACCEPT : /* Overwrite */ e_write_file(filename, info->vcard, O_WRONLY | O_CREAT | O_TRUNC); break; - case GTK_RESPONSE_REJECT : /* cancel */ + case GTK_RESPONSE_CANCEL : /* cancel */ return; } } else if (error != 0) { @@ -351,7 +351,7 @@ eab_select_source (const gchar *title, const gchar *message, const gchar *select NULL); gtk_window_set_default_size (GTK_WINDOW (dialog), 200, 350); - cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT); + cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT); gtk_widget_set_sensitive (ok_button, FALSE); |