aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/mail-session.c8
2 files changed, 16 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f21ec45370..ea589613bf 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-16 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes bug #509741
+
+ * mail-session.c (user_message_exec):
+ Fix a crash that occurs when prompted to accept a certificate.
+ This is just a quick temporary fix; Srini and I have a more
+ sophisticated solution in mind.
+
2008-01-16 Milan Crha <mcrha@redhat.com>
** Fix for bug #509697
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 010b758146..9ff70224ca 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -351,7 +351,13 @@ user_message_exec (struct _user_message_msg *m)
g_signal_connect (
user_message_dialog, "response",
G_CALLBACK (user_message_response), m);
- em_utils_show_error_silent (user_message_dialog);
+
+ /* If the dialog has no "primary" text, there's nothing to
+ * display in the status bar. So just show the dialog. */
+ if (g_object_get_data (user_message_dialog, "primary"))
+ em_utils_show_error_silent (user_message_dialog);
+ else
+ gtk_widget_show (user_message_dialog);
}
}