diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/mail-mt.c | 12 |
2 files changed, 14 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index c4f6f4a882..de3f37837a 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-09-27 Ettore Perazzoli <ettore@ximian.com> + + * mail-mt.c (do_user_message): Always make the Cancel button the + last one. + 2001-09-27 <NotZed@Ximian.com> * mail-folder-cache.c (real_note_folder): No such event finalized! @@ -79,8 +84,6 @@ * component-factory.c (component_factory_init): warn and exit if oaf_active_server_register returns OAF_REG_ALREADY_ACTIVE. ->>>>>>> 1.1748 ->>>>>>> 1.1752 2001-09-26 Jeffrey Stedfast <fejj@ximian.com> * mail-config.c (config_read): Oops, translate the fake account diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 972a89787f..c9be99a772 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -653,18 +653,24 @@ static void do_user_message (struct _mail_msg *mm) { struct _user_message_msg *m = (struct _user_message_msg *)mm; + int dialog_result; GtkWidget *dialog; dialog = gnome_message_box_new (m->prompt, m->type, - m->allow_cancel ? GNOME_STOCK_BUTTON_CANCEL : GNOME_STOCK_BUTTON_OK, - m->allow_cancel ? GNOME_STOCK_BUTTON_OK: NULL, + GNOME_STOCK_BUTTON_OK, + m->allow_cancel ? GNOME_STOCK_BUTTON_CANCEL : NULL, NULL); gnome_dialog_set_default (GNOME_DIALOG (dialog), 1); gtk_window_set_policy (GTK_WINDOW (dialog), TRUE, TRUE, TRUE); /* hrm, we can't run this async since the gui_port from which we're called will reply to our message for us */ - m->result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) != 0; + dialog_result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); + + if (dialog_result == -1 || dialog_result == 1) + m->result = FALSE; + else + m->result = TRUE; } struct _mail_msg_op user_message_op = { |