callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let Esc behave like Cancel in Reply questions and do not leak message

Browse Source
This commit is contained in:
Milan Crha
2011-03-01 15:56:41 +01:00
parent 29cc2891d8
commit 5dfb6cdf0c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mail/e-mail-reader.c
View File

@ -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);