--- a/ChangeLog Fri Mar 03 12:25:02 2006 +0000
+++ b/ChangeLog Fri Mar 03 13:09:33 2006 +0000
@@ -1,3 +1,10 @@
+2006-03-03 Jeff Cai <[email protected]>
+
+ * evolution.spec:
+ * patches/evolution-03-init-config.diff:
+ * patches/evolution-04-remove-uri.diff:
+ * patches/evolution-05-show-border.diff: fix a startup crash.
+
2006-03-03 Harry Lu <[email protected]>
* evolution-jescs.spec: add patch evolution-jescs-01-bonobo.diff
--- a/evolution.spec Fri Mar 03 12:25:02 2006 +0000
+++ b/evolution.spec Fri Mar 03 13:09:33 2006 +0000
@@ -16,6 +16,9 @@
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.5/%{name}-%{version}.tar.bz2
Patch1: evolution-01-display-mail.diff
Patch2: evolution-02-conduit.diff
+Patch3: evolution-03-init-config.diff
+Patch4: evolution-04-remove-uri.diff
+Patch5: evolution-05-show-border.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/evolution
@@ -89,6 +92,9 @@
%setup -q
%patch1 -p0
%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
%build
@@ -197,6 +203,11 @@
%{_datadir}/gnome-pilot/*
%changelog
+* Fri Mar 3 2006 - [email protected]
+- add three patches:
+ evolution-03-init-config.diff
+ evolution-04-remove-uri.diff
+ evolution-05-show-border.diff
* Tue Feb 28 2006 - [email protected]
- Bump to 2.5.92.
- Remove upstreamed patches:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/evolution-03-init-config.diff Fri Mar 03 13:09:33 2006 +0000
@@ -0,0 +1,25 @@
+Index: calendar/gui/calendar-config.c
+===================================================================
+RCS file: /cvs/gnome/evolution/calendar/gui/calendar-config.c,v
+retrieving revision 1.85
+diff -u -r1.85 calendar-config.c
+--- calendar/gui/calendar-config.c 13 Jan 2006 11:02:13 -0000 1.85
++++ calendar/gui/calendar-config.c 3 Mar 2006 12:52:32 -0000
+@@ -718,6 +718,8 @@
+ char *
+ calendar_config_get_primary_tasks (void)
+ {
++ calendar_config_init ();
++
+ return gconf_client_get_string (config, CALENDAR_CONFIG_PRIMARY_TASKS, NULL);
+ }
+
+@@ -780,6 +782,8 @@
+ char *
+ calendar_config_get_primary_memos (void)
+ {
++ calendar_config_init ();
++
+ return gconf_client_get_string (config, CALENDAR_CONFIG_PRIMARY_MEMOS, NULL);
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/evolution-04-remove-uri.diff Fri Mar 03 13:09:33 2006 +0000
@@ -0,0 +1,17 @@
+Index: mail/em-folder-tree-model.c
+===================================================================
+RCS file: /cvs/gnome/evolution/mail/em-folder-tree-model.c,v
+retrieving revision 1.74
+diff -u -r1.74 em-folder-tree-model.c
+--- mail/em-folder-tree-model.c 10 Jan 2006 08:10:30 -0000 1.74
++++ mail/em-folder-tree-model.c 3 Mar 2006 12:49:00 -0000
+@@ -898,7 +898,8 @@
+ gtk_tree_row_reference_free (row);
+ }
+
+- em_folder_tree_model_remove_uri (model, uri);
++ if (uri)
++ em_folder_tree_model_remove_uri (model, uri);
+
+ gtk_tree_store_remove ((GtkTreeStore *) model, toplevel);
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/evolution-05-show-border.diff Fri Mar 03 13:09:33 2006 +0000
@@ -0,0 +1,24 @@
+Index: widgets/misc/e-combo-button.c
+===================================================================
+RCS file: /cvs/gnome/evolution/widgets/misc/e-combo-button.c,v
+retrieving revision 1.21
+diff -u -r1.21 e-combo-button.c
+--- widgets/misc/e-combo-button.c 21 Feb 2005 17:59:40 -0000 1.21
++++ widgets/misc/e-combo-button.c 3 Mar 2006 12:51:20 -0000
+@@ -146,10 +146,12 @@
+ GTK_WIDGET_STATE (widget), shadow_type,
+ area, widget, "button",
+ x, y, separator_x, height);
+- gtk_paint_box (widget->style, widget->window,
+- GTK_WIDGET_STATE (widget), shadow_type,
+- area, widget, "button",
+- separator_x, y, width - separator_x, height);
++
++ if (width - separator_x > 0)
++ gtk_paint_box (widget->style, widget->window,
++ GTK_WIDGET_STATE (widget), shadow_type,
++ area, widget, "button",
++ separator_x, y, width - separator_x, height);
+
+ if (GTK_WIDGET_HAS_FOCUS (widget)) {
+ if (interior_focus) {