[evolution/email-factory-3-4: 42/53] commit 8ad132c58be4ed401450d79f9d0cc3511d61f210 Author: Milan Crha <mcrha redhat com> Date: Thu De

[Srinivasa Ragavan <sragavan src gnome org>]

commit 16f87ae53eeb4481d3bf5862df18dedbc57d7f3a
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Tue Jan 3 13:01:38 2012 +0530

    commit 8ad132c58be4ed401450d79f9d0cc3511d61f210
    Author: Milan Crha <mcrha redhat com>
    Date:   Thu Dec 22 17:05:44 2011 +0100
    
        Bug #666490 - Crash in e-mail-session.c:user_message_response

 mail/e-mail-ui-session.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index e6258b0..7203465 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -124,9 +124,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;
@@ -148,13 +149,13 @@ user_message_response (GtkDialog *dialog,
                        gint button,
                        struct _user_message_msg *m)
 {
-	/* if !allow_cancel, then we've already replied */
-	if (m->button_captions) {
+	/* if !m or !button_captions, then we've already replied */
+	if (m && m->button_captions) {
 		m->result = button;
 		e_flag_set (m->done);
 	}
 
-	user_message_response_free (dialog, button, m);
+	user_message_response_free (dialog, button);
 }
 
 static void
@@ -224,7 +225,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);
 	}
 }