From 4f9238a9f31cee61579491706b3f89078299ec83 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Tue, 15 Jan 2008 21:18:23 +0000
Subject: [PATCH] - Add patch for GNOME bug #509741 (crash on startup).

---
 evolution-2.21.5-crash-on-startup.patch | 18 ++++++++++++++++++
 evolution.spec                          |  9 ++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 evolution-2.21.5-crash-on-startup.patch

diff --git a/evolution-2.21.5-crash-on-startup.patch b/evolution-2.21.5-crash-on-startup.patch
new file mode 100644
index 0000000..10f8da8
--- /dev/null
+++ b/evolution-2.21.5-crash-on-startup.patch
@@ -0,0 +1,18 @@
+diff -up evolution-2.21.5/mail/mail-session.c.crash-on-startup evolution-2.21.5/mail/mail-session.c
+--- evolution-2.21.5/mail/mail-session.c.crash-on-startup	2008-01-10 04:20:18.000000000 -0500
++++ evolution-2.21.5/mail/mail-session.c	2008-01-15 16:15:51.000000000 -0500
+@@ -351,7 +351,13 @@ user_message_exec (struct _user_message_
+ 		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);
+ 	}
+ }
+ 
diff --git a/evolution.spec b/evolution.spec
index 53772d0..26d3fc9 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.21.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -88,6 +88,9 @@ Patch17: evolution-2.9.1-im-context-reset.patch
 # RH bug #215478 / GNOME bug #383842
 Patch18: evolution-2.9.3-source-path-entry.patch
 
+# GNOME bug #509741
+Patch19: evolution-2.21.5-crash-on-startup.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -232,6 +235,7 @@ This package contains the plugin to filter junk mail using SpamAssassin.
 %patch16 -p1 -b .kill-ememory
 %patch17 -p1 -b .im-context-reset
 %patch18 -p1 -b .source-path-entry
+%patch19 -p1 -b .crash-on-startup
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -666,6 +670,9 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Tue Jan 15 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.5-2.fc9
+- Add patch for GNOME bug #509741 (crash on startup).
+
 * Mon Jan 14 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.5-1.fc9
 - Update to 2.21.5
 - The backup-restore plugin is stable again.