[evolution/gnome-3-2] Bug #666490 - Crash in e-mail-session.c:user_message_response

[Milan Crha <mcrha src gnome org>]

commit 88f6f209069e5f66b4607823596fd8bea4ad9dfa
Author: Milan Crha <mcrha redhat com>
Date:   Thu Dec 22 17:06:17 2011 +0100

    Bug #666490 - Crash in e-mail-session.c:user_message_response

 mail/e-mail-session.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 7addaec..7a19c75 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -136,9 +136,10 @@ static void user_message_exec (struct _user_message_msg *m,
 
 static void
 user_message_response_free (GtkDialog *dialog,
-                            gint button,
-                            struct _user_message_msg *m)
+                            gint button)
 {
+	struct _user_message_msg *m = NULL;
+
 	gtk_widget_destroy ((GtkWidget *) dialog);
 
 	user_message_dialog = NULL;
@@ -161,12 +162,12 @@ user_message_response (GtkDialog *dialog,
                        struct _user_message_msg *m)
 {
 	/* if !allow_cancel, then we've already replied */
-	if (m->allow_cancel) {
+	if (m && m->allow_cancel) {
 		m->result = button == GTK_RESPONSE_OK;
 		e_flag_set (m->done);
 	}
 
-	user_message_response_free (dialog, button, m);
+	user_message_response_free (dialog, button);
 }
 
 static void
@@ -220,7 +221,7 @@ user_message_exec (struct _user_message_msg *m,
 	} else {
 		g_signal_connect (
 			user_message_dialog, "response",
-			G_CALLBACK (user_message_response), m);
+			G_CALLBACK (user_message_response), NULL);
 		gtk_widget_show (user_message_dialog);
 	}
 }