rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Add patch for GNOME bug #509741 (crash on startup).

Browse Source
This commit is contained in:
Matthew Barnes 2008-01-15 21:18:23 +00:00
parent 1fe0c31d20
commit 4f9238a9f3
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
evolution-2.21.5-crash-on-startup.patch Normal file
View File

@ -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);
}
}

9
evolution.spec
View File

@ -45,7 +45,7 @@
Name: evolution Name: evolution
Version: 2.21.5 Version: 2.21.5
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 and GFDL+ License: GPLv2 and GFDL+
Group: Applications/Productivity Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite 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 # RH bug #215478 / GNOME bug #383842
Patch18: evolution-2.9.3-source-path-entry.patch Patch18: evolution-2.9.3-source-path-entry.patch
# GNOME bug #509741
Patch19: evolution-2.21.5-crash-on-startup.patch
## Dependencies ### ## Dependencies ###
Requires(post): GConf2 Requires(post): GConf2
@ -232,6 +235,7 @@ This package contains the plugin to filter junk mail using SpamAssassin.
%patch16 -p1 -b .kill-ememory %patch16 -p1 -b .kill-ememory
%patch17 -p1 -b .im-context-reset %patch17 -p1 -b .im-context-reset
%patch18 -p1 -b .source-path-entry %patch18 -p1 -b .source-path-entry
%patch19 -p1 -b .crash-on-startup
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -666,6 +670,9 @@ rm -rf $RPM_BUILD_ROOT
%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
%changelog %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 * Mon Jan 14 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.5-1.fc9
- Update to 2.21.5 - Update to 2.21.5
- The backup-restore plugin is stable again. - The backup-restore plugin is stable again.