[evolution/webkit] Let Esc behave like Cancel in Reply questions and do not leak message

[Dan VrÃtil <dvratil src gnome org>]

commit 5d7d19a17a3fac596c4a3af95ceda25286655232
Author: Milan Crha <mcrha redhat com>
Date:   Tue Mar 1 15:56:41 2011 +0100

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

 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 6a90fe6..b70bebb 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);