diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-03-01 22:56:41 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-03-01 22:56:41 +0800 |
| commit | 5dfb6cdf0cffed68a5993fa96fa006d636d293b4 (patch) | |
| tree | 69ec310afc30b5d54911fd648ded955822affb7b | |
| parent | 29cc2891d8bc37e76dbd103f0dea953d4191e2b6 (diff) | |
| download | gsoc2013-evolution-5dfb6cdf0cffed68a5993fa96fa006d636d293b4.tar.gz gsoc2013-evolution-5dfb6cdf0cffed68a5993fa96fa006d636d293b4.tar.zst gsoc2013-evolution-5dfb6cdf0cffed68a5993fa96fa006d636d293b4.zip | |
Let Esc behave like Cancel in Reply questions and do not leak message
| -rw-r--r-- | mail/e-mail-reader.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 6a90fe6b9e..b70bebb7b9 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -1284,8 +1284,10 @@ action_mail_reply_all_check (CamelFolder *folder, if (response == GTK_RESPONSE_NO) type = E_MAIL_REPLY_TO_SENDER; - else if (response == GTK_RESPONSE_CANCEL) + else if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) { + g_object_unref (message); return; + } } e_mail_reader_reply_to_message (reader, message, type); @@ -1437,8 +1439,10 @@ action_mail_reply_sender_check (CamelFolder *folder, type = E_MAIL_REPLY_TO_ALL; else if (response == GTK_RESPONSE_OK) type = E_MAIL_REPLY_TO_LIST; - else if (response == GTK_RESPONSE_CANCEL) + else if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) { + g_object_unref (message); goto exit; + } } else if (ask_list_reply_to) { GtkWidget *dialog; @@ -1487,8 +1491,10 @@ action_mail_reply_sender_check (CamelFolder *folder, type = E_MAIL_REPLY_TO_FROM; else if (response == GTK_RESPONSE_OK) type = E_MAIL_REPLY_TO_LIST; - else if (response == GTK_RESPONSE_CANCEL) + else if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) { + g_object_unref (message); goto exit; + } } e_mail_reader_reply_to_message (reader, message, type); |