evolution r34841 - trunk/mail

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Jan 17 02:22:02 2008
New Revision: 34841
URL: http://svn.gnome.org/viewvc/evolution?rev=34841&view=rev

Log:
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.



Modified:
   trunk/mail/ChangeLog
   trunk/mail/mail-session.c

Modified: trunk/mail/mail-session.c
==============================================================================
--- trunk/mail/mail-session.c	(original)
+++ trunk/mail/mail-session.c	Thu Jan 17 02:22:02 2008
@@ -351,7 +351,13 @@
 		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);
 	}
 }