rpms/evolution/devel evolution-2.21.5-crash-on-startup.patch, NONE, 1.1 evolution.spec, 1.315, 1.316

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10379

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.21.5-crash-on-startup.patch 
Log Message:

* Tue Jan 15 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.5-2.fc9
- Add patch for GNOME bug #509741 (crash on startup).


evolution-2.21.5-crash-on-startup.patch:

--- NEW FILE evolution-2.21.5-crash-on-startup.patch ---
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);
 	}
 }
 


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- evolution.spec	14 Jan 2008 23:16:30 -0000	1.315
+++ evolution.spec	15 Jan 2008 21:18:23 -0000	1.316
@@ -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 @@
 # 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 @@
 %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 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Tue Jan 15 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.5-2.fc9
+- Add patch for GNOME bug #509741 (crash on startup).
+
 * Mon Jan 14 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.5-1.fc9
 - Update to 2.21.5
 - The backup-restore plugin is stable again.