OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=24

2007-12-19 13:45:48 +00:00 · 2007-12-19 13:45:48 +00:00 · 25bbf9ae9f
commit 25bbf9ae9f
parent ce74b35928
28 changed files with 482 additions and 742 deletions
--- a/abuild.patch
+++ b/abuild.patch
@ -1,71 +1,57 @@
-Index: evolution-2.11.6.1/calendar/conduits/memo/memo-conduit.c
-===================================================================
--- evolution-2.11.6.1.orig/calendar/conduits/memo/memo-conduit.c
-+++ evolution-2.11.6.1/calendar/conduits/memo/memo-conduit.c
-@@ -471,6 +471,8 @@ local_record_to_pilot_record (EMemoLocal
- 	pi_buffer_t * buffer;
- #endif
- 
-+	memset(&p, 0, sizeof (p));
-+
- 	g_assert (local->comp != NULL);
- 	g_assert (local->memo != NULL );
- 	
-Index: evolution-2.11.6.1/calendar/conduits/todo/todo-conduit.c
-===================================================================
--- evolution-2.11.6.1.orig/calendar/conduits/todo/todo-conduit.c
-+++ evolution-2.11.6.1/calendar/conduits/todo/todo-conduit.c
-@@ -618,6 +618,8 @@ local_record_to_pilot_record (EToDoLocal
- 	
- 	LOG (g_message ( "local_record_to_pilot_record\n" ));
- 
-+	memset(&p, 0, sizeof (p));
-+
- 	p.ID = local->local.ID;
- 	p.category = local->local.category;
- 	p.attr = local->local.attr;
-Index: evolution-2.11.6.1/addressbook/conduit/address-conduit.c
-===================================================================
--- evolution-2.11.6.1.orig/addressbook/conduit/address-conduit.c
-+++ evolution-2.11.6.1/addressbook/conduit/address-conduit.c
-@@ -810,6 +810,8 @@ local_record_to_pilot_record (EAddrLocal
- #ifdef PILOT_LINK_0_12
- 	pi_buffer_t * buffer;
- #endif
-+
-+	memset(&p, 0, sizeof (p));
- 	
- 	g_assert (local->addr != NULL );
- 	
-Index: evolution-2.11.6.1/calendar/conduits/calendar/calendar-conduit.c
-===================================================================
--- evolution-2.11.6.1.orig/calendar/conduits/calendar/calendar-conduit.c
-+++ evolution-2.11.6.1/calendar/conduits/calendar/calendar-conduit.c
-@@ -838,6 +838,8 @@ local_record_to_pilot_record (ECalLocalR
- 	pi_buffer_t * buffer;
+=== modified file 'addressbook/gui/merging/eab-contact-merging.c'
+--- addressbook/gui/merging/eab-contact-merging.c	2007-12-18 20:23:31 +0000
+++ addressbook/gui/merging/eab-contact-merging.c	2007-12-18 20:44:13 +0000
+@@ -343,6 +343,7 @@
+ 		     value = 1;
+ 		     break;
+ 	case GTK_RESPONSE_CANCEL:
+	default:
+ 	             value = 0;
+ 		     break;
+ 	}
+
+=== modified file 'calendar/conduits/calendar/calendar-conduit.c'
+--- calendar/conduits/calendar/calendar-conduit.c	2007-12-18 20:23:31 +0000
+++ calendar/conduits/calendar/calendar-conduit.c	2007-12-18 20:44:13 +0000
+@@ -840,6 +840,8 @@
+ 	static char record[0xffff];
 #endif
 
 +	memset(&p, 0, sizeof (p));
 +
 	g_assert (local->comp != NULL);
 	g_assert (local->appt != NULL );
- 	
-Index: evolution-2.11.6.1/addressbook/gui/merging/eab-contact-merging.c
-===================================================================
--- evolution-2.11.6.1.orig/addressbook/gui/merging/eab-contact-merging.c
-+++ evolution-2.11.6.1/addressbook/gui/merging/eab-contact-merging.c
-@@ -343,6 +343,7 @@ mergeit (EContactMergingLookup *lookup)
- 		     value = 1;
- 		     break;
- 	case GTK_RESPONSE_CANCEL:
-+	default:
- 	             value = 0;
- 		     break;  
- 	}
-Index: evolution-2.11.6.1/plugins/exchange-operations/exchange-delegates-user.c
-===================================================================
--- evolution-2.11.6.1.orig/plugins/exchange-operations/exchange-delegates-user.c
-+++ evolution-2.11.6.1/plugins/exchange-operations/exchange-delegates-user.c
+ 
+
+=== modified file 'calendar/conduits/memo/memo-conduit.c'
+--- calendar/conduits/memo/memo-conduit.c	2007-12-18 20:23:31 +0000
+++ calendar/conduits/memo/memo-conduit.c	2007-12-18 20:44:13 +0000
+@@ -473,6 +473,8 @@
+ 	static char record[0xffff];
+ #endif
+ 
+	memset(&p, 0, sizeof (p));
+
+ 	g_assert (local->comp != NULL);
+ 	g_assert (local->memo != NULL );
+ 
+
+=== modified file 'calendar/conduits/todo/todo-conduit.c'
+--- calendar/conduits/todo/todo-conduit.c	2007-12-18 20:23:31 +0000
+++ calendar/conduits/todo/todo-conduit.c	2007-12-18 20:44:13 +0000
+@@ -621,6 +621,8 @@
+ 
+ 	memset (&p, 0, sizeof (GnomePilotRecord));
+ 
+	memset(&p, 0, sizeof (p));
+
+ 	p.ID = local->local.ID;
+ 	p.category = local->local.category;
+ 	p.attr = local->local.attr;
+
+=== modified file 'plugins/exchange-operations/exchange-delegates-user.c'
+--- plugins/exchange-operations/exchange-delegates-user.c	2007-12-18 20:23:31 +0000
+++ plugins/exchange-operations/exchange-delegates-user.c	2007-12-18 20:44:13 +0000
@@ -30,8 +30,11 @@
 #include <mail/mail-component.h>
 #include <mail/mail-send-recv.h>
@ -87,3 +73,4 @@ Index: evolution-2.11.6.1/plugins/exchange-operations/exchange-delegates-user.c
 #include <string.h>
 
 
+
--- a/bgo-325960-evo-foldersubscription.diff
+++ b/bgo-325960-evo-foldersubscription.diff
@ -1,11 +1,7 @@
-Index: plugins/exchange-operations/exchange-folder-subscription.c
-===================================================================
-RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-folder-subscription.c,v
-retrieving revision 1.8
-diff -u -p -r1.8 exchange-folder-subscription.c
--- plugins/exchange-operations/exchange-folder-subscription.c	3 Feb 2006 10:27:26 -0000	1.8
-+++ plugins/exchange-operations/exchange-folder-subscription.c	21 Apr 2006 04:09:05 -0000
-@@ -215,6 +215,7 @@ subscribe_to_folder (GtkWidget *dialog, 
+=== modified file 'plugins/exchange-operations/exchange-folder-subscription.c'
+--- plugins/exchange-operations/exchange-folder-subscription.c	2007-12-18 20:23:31 +0000
+++ plugins/exchange-operations/exchange-folder-subscription.c	2007-12-18 20:35:58 +0000
+@@ -240,6 +240,7 @@
 			g_free (folder_name);
 			switch (result) {
 				case EXCHANGE_ACCOUNT_FOLDER_OK:
@ -13,9 +9,9 @@ diff -u -p -r1.8 exchange-folder-subscription.c
 					break;
 				case EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS:
 					e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL);
-@@ -265,6 +266,11 @@ create_folder_subscription_dialog (Excha
+@@ -296,6 +297,11 @@
 	GladeXML *glade_xml;
- 	GtkWidget *dialog;
+ 	GtkWidget *dialog, *ok_button;
 	SubscriptionInfo *subscription_info;
 +	int mode;
 +
@ -25,3 +21,4 @@ diff -u -p -r1.8 exchange-folder-subscription.c
 
 	subscription_info = g_new0 (SubscriptionInfo, 1);
 	subscription_info->account = account;
+
--- a/bnc-153807-msg-composer-dont-raise.patch
+++ b/bnc-153807-msg-composer-dont-raise.patch
@ -1,10 +1,12 @@
--- mail/em-composer-utils.c.orig	2006-03-24 00:16:39.179722801 +0100
-+++ mail/em-composer-utils.c	2006-03-24 00:21:34.066550119 +0100
-@@ -710,6 +710,7 @@ em_utils_post_to_folder (CamelFolder *fo
+=== modified file 'mail/em-composer-utils.c'
+--- mail/em-composer-utils.c	2007-12-18 20:27:05 +0000
+++ mail/em-composer-utils.c	2007-12-18 20:33:57 +0000
+@@ -733,6 +733,7 @@
 	e_msg_composer_drop_editor_undo (composer);
- 	
+ 
 	gtk_widget_show ((GtkWidget *) composer);
 +       gdk_window_raise (((GtkWidget *) composer)->window);
 }
 
 /**
+
--- a/bnc-156353-evo-crash-adding-apt.patch
+++ b/bnc-156353-evo-crash-adding-apt.patch
@ -1,6 +1,7 @@
--- shell/e-shell-nm.c.orig	2006-03-13 01:06:30.533701917 +0100
-+++ shell/e-shell-nm.c	2006-03-13 01:09:37.587986006 +0100
-@@ -54,11 +54,17 @@ static DBusHandlerResult e_shell_network
+=== modified file 'shell/e-shell-nm.c'
+--- shell/e-shell-nm.c	2007-12-18 20:28:43 +0000
+++ shell/e-shell-nm.c	2007-12-18 20:30:19 +0000
+@@ -68,11 +68,17 @@
 	DBusError error;
 	const char *object;
 	ShellLineStatus status;
@ -10,14 +11,14 @@
 +	EShell *shell = NULL;
 	GNOME_Evolution_ShellState shell_state;
 	EShellLineStatus line_status;
-	
-+
-+	if (!user_data || !E_IS_SHELL_WINDOW (user_data))
-+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+
-+	window = E_SHELL_WINDOW (user_data);
-+	shell = e_shell_window_peek_shell (window);
+ 
+ 	if (!user_data || !E_IS_SHELL_WINDOW (user_data))
+ 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ 
+ 	window = E_SHELL_WINDOW (user_data);
+ 	shell = e_shell_window_peek_shell (window);
 +
 	dbus_error_init (&error);
 	object = dbus_message_get_path (message);
 
+
--- a/bnc-160049-change-gw-passwd-no-auth-prompt.patch
+++ b/bnc-160049-change-gw-passwd-no-auth-prompt.patch
@ -1,24 +1,18 @@
-Index: calendar/common/authentication.c
-===================================================================
-RCS file: /cvs/gnome/evolution/calendar/common/authentication.c,v
-retrieving revision 1.10
-diff -u -p -r1.10 authentication.c
--- calendar/common/authentication.c	23 Feb 2005 18:56:56 -0000	1.10
-+++ calendar/common/authentication.c	24 Mar 2006 15:33:25 -0000
-@@ -29,6 +29,7 @@
- #include <bonobo/bonobo-i18n.h>
+=== modified file 'calendar/common/authentication.c'
+--- calendar/common/authentication.c	2007-12-18 20:23:31 +0000
+++ calendar/common/authentication.c	2007-12-18 20:35:33 +0000
+@@ -30,6 +30,7 @@
+ #include <libedataserver/e-source.h>
 #include <libedataserverui/e-passwords.h>
 #include "authentication.h"
 +#include <libedataserver/e-url.h>
 
 static GHashTable *source_lists_hash = NULL;
 
-@@ -52,6 +53,44 @@ auth_func_cb (ECal *ecal, const char *pr
- 						     NULL);
- 
+@@ -55,6 +56,44 @@
 	return password;
-+}
-+
+ }
+ 
 +static char *
 +build_pass_key (ECal *ecal)
 +{
@ -55,16 +49,15 @@ diff -u -p -r1.10 authentication.c
 +	e_passwords_forget_password (component_name, key);
 +
 +	g_free (key);
- }
- 
+}
+
 ECal *
-Index: calendar/common/authentication.h
-===================================================================
-RCS file: /cvs/gnome/evolution/calendar/common/authentication.h,v
-retrieving revision 1.2
-diff -u -p -r1.2 authentication.h
--- calendar/common/authentication.h	4 Feb 2004 21:31:57 -0000	1.2
-+++ calendar/common/authentication.h	24 Mar 2006 15:33:25 -0000
+ auth_new_cal_from_default (ECalSourceType type)
+ {
+
+=== modified file 'calendar/common/authentication.h'
+--- calendar/common/authentication.h	2007-12-18 20:23:31 +0000
+++ calendar/common/authentication.h	2007-12-18 20:35:33 +0000
@@ -30,5 +30,6 @@
 ECal *auth_new_cal_from_default (ECalSourceType type);
 ECal *auth_new_cal_from_source (ESource *source, ECalSourceType type);
@ -72,14 +65,35 @@ diff -u -p -r1.2 authentication.h
 +void auth_cal_forget_password (ECal *ecal);
 
 #endif
-Index: calendar/gui/gnome-cal.c
-===================================================================
-RCS file: /cvs/gnome/evolution/calendar/gui/gnome-cal.c,v
-retrieving revision 1.398
-diff -u -p -r1.398 gnome-cal.c
--- calendar/gui/gnome-cal.c	6 Mar 2006 07:20:00 -0000	1.398
-+++ calendar/gui/gnome-cal.c	24 Mar 2006 15:33:26 -0000
-@@ -2366,6 +2366,10 @@ client_cal_opened_cb (ECal *ecal, ECalen
+
+=== modified file 'calendar/gui/e-tasks.c'
+--- calendar/gui/e-tasks.c	2007-12-18 20:23:31 +0000
+++ calendar/gui/e-tasks.c	2007-12-18 20:35:33 +0000
+@@ -962,6 +962,9 @@
+ 	priv = tasks->priv;
+ 
+ 	source = e_cal_get_source (ecal);
+	
+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED)
+		auth_cal_forget_password (ecal);
+ 
+ 	switch (status) {
+ 	case E_CALENDAR_STATUS_OK :
+@@ -1008,6 +1011,9 @@
+ 
+ 	source = e_cal_get_source (ecal);
+ 
+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED)
+		auth_cal_forget_password (ecal);
+
+ 	switch (status) {
+ 	case E_CALENDAR_STATUS_OK :
+ 		g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, default_client_cal_opened_cb, NULL);
+
+=== modified file 'calendar/gui/gnome-cal.c'
+--- calendar/gui/gnome-cal.c	2007-12-18 20:23:31 +0000
+++ calendar/gui/gnome-cal.c	2007-12-18 20:35:33 +0000
+@@ -2642,6 +2642,10 @@
 	default:
 		break;
 	}
@ -90,40 +104,4 @@ diff -u -p -r1.398 gnome-cal.c
 	switch (status) {
 	case E_CALENDAR_STATUS_OK:
 		break;
-@@ -2459,6 +2463,9 @@ default_client_cal_opened_cb (ECal *ecal
- 		break;
- 	}
- 	
-+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED && source_type == E_CAL_SOURCE_TYPE_EVENT)
-+		auth_cal_forget_password (ecal);
-+
- 	switch (status) {
- 	case E_CALENDAR_STATUS_OK:
- 		break;
-Index: calendar/gui/e-tasks.c
-===================================================================
-RCS file: /cvs/gnome/evolution/calendar/gui/e-tasks.c,v
-retrieving revision 1.130
-diff -u -p -r1.130 e-tasks.c
--- calendar/gui/e-tasks.c	3 Mar 2006 13:24:39 -0000	1.130
-+++ calendar/gui/e-tasks.c	24 Mar 2006 15:33:26 -0000
-@@ -876,6 +876,9 @@ client_cal_opened_cb (ECal *ecal, ECalen
- 	priv = tasks->priv;
- 
- 	source = e_cal_get_source (ecal);
-+	
-+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED)
-+		auth_cal_forget_password (ecal);
- 
- 	switch (status) {
- 	case E_CALENDAR_STATUS_OK :
-@@ -921,6 +924,9 @@ default_client_cal_opened_cb (ECal *ecal
- 	priv = tasks->priv;
- 
- 	source = e_cal_get_source (ecal);
-+
-+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED)
-+		auth_cal_forget_password (ecal);
- 
- 	switch (status) {
- 	case E_CALENDAR_STATUS_OK :
+
--- a/bnc-167638.patch
+++ b/bnc-167638.patch
@ -1,18 +1,19 @@
-Index: mail/mail-component.c
-===================================================================
--- mail/mail-component.c.orig
-+++ mail/mail-component.c
-@@ -817,10 +817,13 @@ impl_quit(PortableServer_Servant servant
+=== modified file 'mail/mail-component.c'
+--- mail/mail-component.c	2007-12-18 20:23:31 +0000
+++ mail/mail-component.c	2007-12-18 20:42:30 +0000
+@@ -826,11 +826,14 @@
 	mail_config_prune_proxies ();
 	switch (mc->priv->quit_state) {
 	case MC_QUIT_START: {
 +		extern int camel_application_is_exiting;
 		int now = time(NULL)/60/60/24, days;
 		gboolean empty_junk;
- 		
- 		GConfClient *gconf = mail_config_get_gconf_client();
-+		
-+		camel_application_is_exiting = TRUE;
 
+ 		GConfClient *gconf = mail_config_get_gconf_client();
+ 
+		camel_application_is_exiting = TRUE;
+
 		mail_vfolder_shutdown();
 
+ 		mc->priv->quit_expunge = gconf_client_get_bool(gconf, "/apps/evolution/mail/trash/empty_on_exit", NULL)
+
--- a/bnc-173186.patch
+++ b/bnc-173186.patch
@ -1,16 +1,13 @@
-Index: shell/e-shell-nm.c
-===================================================================
-RCS file: /cvs/gnome/evolution/shell/e-shell-nm.c,v
-retrieving revision 1.1.2.2
-diff -u -r1.1.2.2 e-shell-nm.c
--- shell/e-shell-nm.c	19 Apr 2006 21:14:44 -0000	1.1.2.2
-+++ shell/e-shell-nm.c	17 May 2006 18:55:43 -0000
-@@ -73,7 +73,7 @@
+=== modified file 'shell/e-shell-nm.c'
+--- shell/e-shell-nm.c	2007-12-18 20:30:19 +0000
+++ shell/e-shell-nm.c	2007-12-18 20:42:48 +0000
+@@ -83,7 +83,7 @@
 	object = dbus_message_get_path (message);
- 	
+ 
 	if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") &&
 -		 strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
 +	    object && !strcmp (object, DBUS_PATH_LOCAL)) {
 		dbus_connection_unref (dbus_connection);
 		dbus_connection = NULL;
- 		
+ 
+
--- a/bnc-178778-evo-open-appt-crash.diff
+++ b/bnc-178778-evo-open-appt-crash.diff
@ -1,6 +1,20 @@
--- widgets/misc/e-calendar-item.c
-+++ widgets/misc/e-calendar-item.c
-@@ -434,10 +434,10 @@
+=== modified file 'calendar/gui/dialogs/recurrence-page.c'
+--- calendar/gui/dialogs/recurrence-page.c	2007-12-18 20:23:31 +0000
+++ calendar/gui/dialogs/recurrence-page.c	2007-12-18 20:43:23 +0000
+@@ -850,7 +850,7 @@
+ 	/* If our component has not been set yet through ::fill_widgets(), we
+ 	 * cannot preview the recurrence.
+ 	 */
+-	if (!priv->comp || e_cal_component_is_instance (priv->comp))
+	if (!priv || !priv->comp || e_cal_component_is_instance (priv->comp))
+ 		return;
+ 
+ 	/* Create a scratch component with the start/end and
+
+=== modified file 'widgets/misc/e-calendar-item.c'
+--- widgets/misc/e-calendar-item.c	2007-12-18 20:23:31 +0000
+++ widgets/misc/e-calendar-item.c	2007-12-18 20:43:23 +0000
+@@ -430,9 +430,9 @@
 		calitem->styles = NULL;
 	}
 
@ -13,14 +27,3 @@
 
 	if (calitem->font_desc) {

--- calendar/gui/dialogs/recurrence-page.c
-+++ calendar/gui/dialogs/recurrence-page.c
-@@ -846,7 +849,7 @@
- 	/* If our component has not been set yet through ::fill_widgets(), we
- 	 * cannot preview the recurrence.
- 	 */
-	if (!priv->comp || e_cal_component_is_instance (priv->comp))
-+	if (!priv || !priv->comp || e_cal_component_is_instance (priv->comp))
- 		return;
- 
- 	/* Create a scratch component with the start/end and
--- a/bnc-302017-print-100pc.diff
+++ b/bnc-302017-print-100pc.diff
@ -1,68 +0,0 @@
-Index: mail/em-format.c
-===================================================================
--- mail/em-format.c	(revision 34224)
-+++ mail/em-format.c	(working copy)
-@@ -224,6 +224,38 @@ em_format_class_add_handler(EMFormatClas
- 	g_hash_table_insert(emfc->type_handlers, info->mime_type, info);
- }
- 
-+struct _class_handlers {
-+	EMFormatClass *old;
-+	EMFormatClass *new;
-+};	
-+static void
-+merge_missing (gpointer key, gpointer value, gpointer userdata)
-+{
-+	struct _class_handlers *classes = (struct _class_handlers *) userdata;
-+	EMFormatHandler *info, *oldinfo;
-+	
-+	oldinfo = (EMFormatHandler *) value;
-+	info = g_hash_table_lookup (classes->new->type_handlers, key);
-+	if (!info) {
-+		/* Might be from a plugin */
-+		g_hash_table_insert (classes->new->type_handlers, key, value);
-+	}
-+
-+}
-+
-+void
-+em_format_merge_handler(EMFormat *new, EMFormat *old)
-+{
-+	EMFormatClass *oldc = (EMFormatClass *)G_OBJECT_GET_CLASS(old);
-+	EMFormatClass *newc = (EMFormatClass *)G_OBJECT_GET_CLASS(new);
-+	struct _class_handlers fclasses;
-+
-+	fclasses.old = oldc;
-+	fclasses.new = newc;
-+
-+	g_hash_table_foreach (oldc->type_handlers, merge_missing, &fclasses);
-+
-+}
- /**
-  * em_format_class_remove_handler:
-  * @emfc: 
-Index: mail/em-format.h
-===================================================================
--- mail/em-format.h	(revision 34224)
-+++ mail/em-format.h	(working copy)
-@@ -328,5 +328,6 @@ void em_format_format_text(EMFormat *emf
- 
- void em_format_part_as(EMFormat *emf, struct _CamelStream *stream, struct _CamelMimePart *part, const char *mime_type);
- void em_format_part(EMFormat *emf, struct _CamelStream *stream, struct _CamelMimePart *part);
-+void em_format_merge_handler(EMFormat *new, EMFormat *old);
- 
- #endif /* ! _EM_FORMAT_H */
-Index: mail/em-folder-view.c
-===================================================================
--- mail/em-folder-view.c	(revision 34224)
-+++ mail/em-folder-view.c	(working copy)
-@@ -2193,6 +2193,9 @@ em_folder_view_print (EMFolderView *emfv
- 	em_format_set_session (
- 		(EMFormat *) efhp,
- 		((EMFormat *) emfv->preview)->session);
-+	em_format_merge_handler ((EMFormat *) efhp,
-+		(EMFormat *) emfv->preview);
-+
- 	em_format_html_print_message (
- 		efhp, emfv->folder, uids->pdata[0]);
- 	g_object_unref (efhp);
--- a/bnc-308959-mail-attachment-icon.patch
+++ b/bnc-308959-mail-attachment-icon.patch
@ -1,134 +0,0 @@
--- calendar/gui/dialogs/comp-editor.c	2007-10-03 15:40:10.213280750 +0200
-+++ calendar/gui/dialogs/comp-editor.c	2007-10-03 15:43:06.801273004 +0200
-@@ -1487,8 +1487,8 @@ static BonoboUIVerb verbs [] = {
- };
- 
- static EPixmap pixmaps[] = {
-	E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU),
-+	E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
-+	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
- 	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),	
- 
- 	E_PIXMAP_END
-@@ -1548,7 +1548,7 @@ setup_widgets (CompEditor *editor)
- 	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5);
- 	expander_hbox = gtk_hbox_new (FALSE, 0);
- 	
-	attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
-+	attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
- 	priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf);
- 	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5);
- 	gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1);
-Index: mail/em-folder-browser.c
-===================================================================
--- mail/em-folder-browser.c	(revision 34234)
-+++ mail/em-folder-browser.c	(working copy)
-@@ -218,7 +218,7 @@ static EMFBSearchBarItem temp_view_items
- 	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},
- 	{{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL},
- 	{{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL},
-	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "stock_attach"},
-+	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"},
- 	{{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"},
- 	{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"},
- /* 	{ NULL, 0, NULL }, */
-Index: mail/message-list.c
-===================================================================
--- mail/message-list.c	(revision 34234)
-+++ mail/message-list.c	(working copy)
-@@ -223,7 +223,7 @@ static struct {
- 	{ "stock_mail-unread-multiple",        NULL },
- 	{ "stock_mail-open-multiple",          NULL },
- 	{ NULL,                                NULL },
-	{ "stock_attach",                      NULL },
-+	{ "mail-attachment",                   NULL },
- 	{ "emblem-important",                  NULL },
- 	{ "stock_score-lowest",                NULL },
- 	{ "stock_score-lower",                 NULL },
-Index: composer/e-msg-composer.c
-===================================================================
--- composer/e-msg-composer.c	(revision 34234)
-+++ composer/e-msg-composer.c	(working copy)
-@@ -2208,11 +2208,11 @@ static BonoboUIVerb verbs [] = {
- };
- 
- static EPixmap pixcache [] = {
-	E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
-+	E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
- 	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
- 	E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,
- 	
-/*	E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */
-+/*	E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */
- 	E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU),
- 	E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU),
- 	E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU),
-@@ -3989,7 +3989,7 @@ create_composer (int visible_mask)
- 	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5);
- 	expander_hbox = gtk_hbox_new (FALSE, 0);
- 	
-	p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU);
-+	p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU);
- 	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5);
- 	gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1);
- 
-Index: widgets/misc/e-attachment-bar.c
-===================================================================
--- widgets/misc/e-attachment-bar.c	(revision 34234)
-+++ widgets/misc/e-attachment-bar.c	(working copy)
-@@ -281,8 +281,7 @@ update (EAttachmentBar *bar)
- 		attachment = priv->attachments->pdata[i];
- 		
- 		if (!attachment->is_available_local || !attachment->body) {
-			/* stock_attach would be better, but its fugly scaled up */
-			if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) {
-+			if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) {
- 				attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");
- 				g_object_unref (pixbuf);
- 			}
-@@ -373,8 +372,7 @@ update (EAttachmentBar *bar)
- 			pixbuf = e_icon_for_mime_type (mime_type, 48);
- 			if (pixbuf == NULL) {
- 				g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
-				/* stock_attach would be better, but its fugly scaled up */
-				pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
-+				pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG);
- 			}
- 			g_free (mime_type);
- 		}
-Index: calendar/gui/e-day-view.c
-===================================================================
--- calendar/gui/e-day-view.c	(revision 34234)
-+++ calendar/gui/e-day-view.c	(working copy)
-@@ -1419,7 +1419,7 @@ e_day_view_realize (GtkWidget *widget)
- 	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
- 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
- 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
-	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); 
-+	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
- 
- 
- 	/* Set the canvas item colors. */
-@@ -1493,7 +1493,7 @@ e_day_view_realize (GtkWidget *widget)
- 	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
- 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
- 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
-	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); 
-+	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
- 
- 
- 	/* Set the canvas item colors. */
-Index: calendar/gui/e-week-view.c
-===================================================================
--- calendar/gui/e-week-view.c	(revision 34234)
-+++ calendar/gui/e-week-view.c	(working copy)
-@@ -693,7 +693,7 @@ e_week_view_realize (GtkWidget *widget)
- 	week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
- 	week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
- 	week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
-	week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
-+	week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
- 	week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
- }
- 
--- a/bnc-339266-evo-folder-size-offline.diff
+++ b/bnc-339266-evo-folder-size-offline.diff
@ -1,11 +1,7 @@
-Index: plugins/exchange-operations/exchange-account-setup.c
-===================================================================
-RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-account-setup.c,v
-retrieving revision 1.32
-diff -u -p -r1.32 exchange-account-setup.c
--- plugins/exchange-operations/exchange-account-setup.c	22 Apr 2006 07:49:03 -0000	1.32
-+++ plugins/exchange-operations/exchange-account-setup.c	22 Apr 2006 07:50:25 -0000
-@@ -927,6 +927,7 @@ org_gnome_exchange_show_folder_size_fact
+=== modified file 'plugins/exchange-operations/exchange-account-setup.c'
+--- plugins/exchange-operations/exchange-account-setup.c	2007-12-18 20:23:31 +0000
+++ plugins/exchange-operations/exchange-account-setup.c	2007-12-18 20:41:16 +0000
+@@ -939,6 +939,7 @@
 	GtkVBox *vbx;
 	GtkHBox *hbx_size;
 	char *folder_name, *folder_size;
@ -13,16 +9,15 @@ diff -u -p -r1.32 exchange-account-setup.c
 
 	service = CAMEL_SERVICE (camel_folder_get_parent_store (cml_folder));
 	if (!service)
-@@ -938,11 +939,16 @@ org_gnome_exchange_show_folder_size_fact
- 
+@@ -951,10 +952,15 @@
 	if (g_ascii_strcasecmp (provider->protocol, "exchange"))
 		return NULL;
+ 
+ 	account = exchange_operations_get_exchange_account ();
+ 	exchange_account_is_offline (account, &mode);
+ 	if (mode == OFFLINE_MODE)
+ 		return NULL;
 +
-+	account = exchange_operations_get_exchange_account ();
-+	exchange_account_is_offline (account, &mode);
-+	if (mode == OFFLINE_MODE)
-+		return NULL;
- 	
 	folder_name = (char*) camel_folder_get_name (cml_folder);
 	if (!folder_name)
 		folder_name = g_strdup ("name");
@ -30,4 +25,5 @@ diff -u -p -r1.32 exchange-account-setup.c
 +
 	model = exchange_account_folder_size_get_model (account);
 	if (model)
- 		folder_size = g_strdup_printf ("%s KB", exchange_folder_size_get_val (model, folder_name));
+ 		folder_size = g_strdup_printf (_("%s KB"), exchange_folder_size_get_val (model, folder_name));
+
--- a/build-fixes.diff
+++ b/build-fixes.diff
@ -1,7 +1,6 @@
-Index: addressbook/gui/widgets/e-minicard.c
-===================================================================
--- addressbook/gui/widgets/e-minicard.c.orig
-+++ addressbook/gui/widgets/e-minicard.c
+=== modified file 'addressbook/gui/widgets/e-minicard.c'
+--- addressbook/gui/widgets/e-minicard.c	2007-12-18 20:23:31 +0000
+++ addressbook/gui/widgets/e-minicard.c	2007-12-18 21:21:35 +0000
@@ -30,6 +30,7 @@
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <text/e-text.h>
@ -10,11 +9,11 @@ Index: addressbook/gui/widgets/e-minicard.c
 #include <misc/e-canvas-utils.h>
 #include <misc/e-canvas.h>
 #include <libebook/e-book.h>
-Index: calendar/gui/calendar-component.c
-===================================================================
--- calendar/gui/calendar-component.c.orig
-+++ calendar/gui/calendar-component.c
-@@ -1321,6 +1321,8 @@ create_local_item_cb (EUserCreatableItem
+
+=== modified file 'calendar/gui/calendar-component.c'
+--- calendar/gui/calendar-component.c	2007-12-18 20:27:05 +0000
+++ calendar/gui/calendar-component.c	2007-12-18 21:21:35 +0000
+@@ -1333,6 +1333,8 @@
 		calendar_setup_new_calendar (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (component_view->calendar))));
 }
 
@ -23,17 +22,19 @@ Index: calendar/gui/calendar-component.c
 static CalendarComponentView *
 create_component_view (CalendarComponent *calendar_component)
 {
-Index: calendar/gui/e-week-view-event-item.c
-===================================================================
--- calendar/gui/e-week-view-event-item.c.orig
-+++ calendar/gui/e-week-view-event-item.c
-@@ -1097,6 +1097,9 @@ e_week_view_event_item_draw (GnomeCanvas
- 			cairo_save (cr);
+
+=== modified file 'calendar/gui/e-week-view-event-item.c'
+--- calendar/gui/e-week-view-event-item.c	2007-12-18 20:23:31 +0000
+++ calendar/gui/e-week-view-event-item.c	2007-12-18 21:21:35 +0000
+@@ -1112,6 +1112,10 @@
 			gdk_cairo_set_source_color (cr,  &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
 			cairo_set_line_width (cr, 0.7);
-+			/*  XXX: rect_x2 needs to be initialized, this code is stolen and might
-+				 not work at all.  */
-+			rect_x2 = rect_x + rect_w - 1;
+ 			/* rect_x2 is used uninitialized here */
+			/* XXX: rect_x2 needs to be initialized, this code
+			   is stolen and might not work at all.  */
+ 			rect_x2 = rect_x + rect_w - 1;
+			
 			cairo_move_to (cr, rect_x2, y2);
 			cairo_line_to (cr, rect_x2, y2);
 			cairo_stroke (cr);
+
--- a/calendar-sendbutton.patch
+++ b/calendar-sendbutton.patch
@ -1,84 +1,7 @@
-Index: ui/evolution-editor.xml
-===================================================================
--- ui/evolution-editor.xml.orig
-+++ ui/evolution-editor.xml
-@@ -1,6 +1,8 @@
- <Root>
-   <commands>
- 	  <cmd name="FileSave" _tip="Click here to save the current window" accel="*Control*s" pixtype="stock" pixname="gtk-save"/>
-+	  <cmd name="FileSend" _tip="Click here to send" accel="*Control*s" pixtype="pixbuf" />
-+	  
- 	  <cmd name="FileClose" _tip="Click here to close the current window" accel="*Control*w" pixtype="stock" pixname="gtk-close"/>
- 	  
-     	  <cmd name="EditCut" _tip="Cut selected text to the clipboard" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
-@@ -18,6 +20,8 @@
-     <submenu name="File" _label="_File">
-       <placeholder name="FileOps">
-         <menuitem name="FileSave" verb="" _label="_Save"/>
-+        <menuitem name="FileSend" verb="" _label="_Send"/>
-+	      
-       </placeholder>
-       <placeholder name="FileWindow">
- 	<menuitem name="FileClose" verb="" _label="_Close"/>
-@@ -53,7 +57,9 @@
- 
-   <dockitem name="Toolbar">
-   
-    <toolitem name="FileSave" verb="" _label="Save"/>
-+	  <toolitem name="FileSave" verb="" _label="Save"/>
-+	  <toolitem name="FileSend" verb="" _label="Send" pixtype="pixbuf"/>
-+	  
-     <toolitem name="FileClose" verb="" _label="Close"/>
-     <separator f="" name="editor1"/>
- 
-Index: calendar/gui/dialogs/comp-editor.h
-===================================================================
--- calendar/gui/dialogs/comp-editor.h.orig
-+++ calendar/gui/dialogs/comp-editor.h
-@@ -53,9 +53,9 @@ typedef struct {
- 	BonoboWindowClass parent_class;
- 
- 	/* Virtual functions */
-+	void (* object_created) (CompEditor *page);
- 	void (* set_e_cal) (CompEditor *page, ECal *client);
- 	void (* edit_comp) (CompEditor *page, ECalComponent *comp);
-	void (* object_created) (CompEditor *page);
- 	gboolean (* send_comp) (CompEditor *page, ECalComponentItipMethod method);
- } CompEditorClass;
- 
-Index: calendar/gui/dialogs/event-editor.c
-===================================================================
--- calendar/gui/dialogs/event-editor.c.orig
-+++ calendar/gui/dialogs/event-editor.c
-@@ -618,7 +618,8 @@ event_editor_construct (EventEditor *ee,
- 
- 		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS))
- 			event_page_show_options (priv->event_page);
-
-+		
-+		comp_editor_set_needs_send (COMP_EDITOR (ee), TRUE);
- 		comp_editor_set_group_item (COMP_EDITOR (ee), TRUE);
-   		if (!((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM))) 
- 			bonobo_ui_component_set_prop (editor->uic, "/commands/ActionFreeBusy", "hidden", "1", NULL);
-Index: calendar/gui/dialogs/task-editor.c
-===================================================================
--- calendar/gui/dialogs/task-editor.c.orig
-+++ calendar/gui/dialogs/task-editor.c
-@@ -444,6 +444,9 @@ task_editor_construct (TaskEditor *te, E
- 			read_only = TRUE;
- 
- 	if (priv->is_assigned) {
-+		
-+		comp_editor_set_needs_send (COMP_EDITOR (te), TRUE);
-+		
- 		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS))
- 			task_page_show_options (priv->task_page);
- 	
-Index: calendar/gui/dialogs/comp-editor.c
-===================================================================
--- calendar/gui/dialogs/comp-editor.c.orig
-+++ calendar/gui/dialogs/comp-editor.c
-@@ -880,8 +880,8 @@ save_comp_with_send (CompEditor *editor)
+=== modified file 'calendar/gui/dialogs/comp-editor.c'
+--- calendar/gui/dialogs/comp-editor.c	2007-12-18 20:23:31 +0000
+++ calendar/gui/dialogs/comp-editor.c	2007-12-18 20:33:31 +0000
+@@ -880,8 +880,8 @@
 	if (!save_comp (editor))
 		return FALSE;
 
@ -89,23 +12,23 @@ Index: calendar/gui/dialogs/comp-editor.c
  			if (e_cal_component_get_vtype (priv->comp) == E_CAL_COMPONENT_JOURNAL)
 				return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_PUBLISH);
 			else
-@@ -1470,6 +1470,7 @@ menu_help_cb (BonoboUIComponent *uic,
+@@ -1476,6 +1476,7 @@
 static BonoboUIVerb verbs [] = {
 
 	BONOBO_UI_VERB ("FileSave", menu_file_save_cb),
 +    BONOBO_UI_VERB ("FileSend", menu_file_save_cb),
 	BONOBO_UI_VERB ("CalendarPrint", menu_file_print_cb),
- 	BONOBO_UI_VERB ("CalendarPrintPreview", menu_file_print_preview_cb),		
+ 	BONOBO_UI_VERB ("CalendarPrintPreview", menu_file_print_preview_cb),
 	BONOBO_UI_VERB ("FileClose", menu_file_close_cb),
-@@ -1488,6 +1489,7 @@ static BonoboUIVerb verbs [] = {
- static EPixmap pixmaps[] = {
- 	E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
- 	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU),
-+	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),	
+@@ -1503,6 +1504,7 @@
+ 	E_PIXMAP ("/Toolbar/FileSave", "document-save", E_ICON_SIZE_LARGE_TOOLBAR),
+ 	E_PIXMAP ("/Toolbar/FileClose", "window-close", E_ICON_SIZE_LARGE_TOOLBAR),
+ 	E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
+    E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
 
 	E_PIXMAP_END
 };
-@@ -1619,6 +1621,9 @@ comp_editor_init (CompEditor *editor)
+@@ -1634,6 +1636,9 @@
 	bonobo_ui_component_thaw (editor->uic, NULL);
 
 	bonobo_ui_component_set_prop (editor->uic, "/commands/FileSave", "sensitive", "0", NULL);
@ -115,7 +38,7 @@ Index: calendar/gui/dialogs/comp-editor.c
 
 	/* DND support */
 	gtk_drag_dest_set (GTK_WIDGET (editor), GTK_DEST_DEFAULT_ALL,  drop_types, num_drop_types, GDK_ACTION_COPY|GDK_ACTION_ASK|GDK_ACTION_MOVE);
-@@ -1844,9 +1849,10 @@ comp_editor_set_changed (CompEditor *edi
+@@ -1859,9 +1864,10 @@
 	priv = editor->priv;
 
 	priv->changed = changed;
@ -128,7 +51,7 @@ Index: calendar/gui/dialogs/comp-editor.c
 }
 
 /**
-@@ -1912,6 +1918,11 @@ comp_editor_set_needs_send (CompEditor *
+@@ -1927,6 +1933,11 @@
 	priv = editor->priv;
 
 	priv->needs_send = needs_send;
@ -140,3 +63,78 @@ Index: calendar/gui/dialogs/comp-editor.c
 }
 
 /**
+
+=== modified file 'calendar/gui/dialogs/comp-editor.h'
+--- calendar/gui/dialogs/comp-editor.h	2007-12-18 20:23:31 +0000
+++ calendar/gui/dialogs/comp-editor.h	2007-12-18 20:33:31 +0000
+@@ -53,9 +53,9 @@
+ 	BonoboWindowClass parent_class;
+ 
+ 	/* Virtual functions */
+	void (* object_created) (CompEditor *page);
+ 	void (* set_e_cal) (CompEditor *page, ECal *client);
+ 	void (* edit_comp) (CompEditor *page, ECalComponent *comp);
+-	void (* object_created) (CompEditor *page);
+ 	gboolean (* send_comp) (CompEditor *page, ECalComponentItipMethod method);
+ } CompEditorClass;
+ 
+
+=== modified file 'calendar/gui/dialogs/event-editor.c'
+--- calendar/gui/dialogs/event-editor.c	2007-12-18 20:23:31 +0000
+++ calendar/gui/dialogs/event-editor.c	2007-12-18 20:33:31 +0000
+@@ -619,7 +619,8 @@
+ 
+ 		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS))
+ 			event_page_show_options (priv->event_page);
+-
+		
+		comp_editor_set_needs_send (COMP_EDITOR (ee), TRUE);
+ 		comp_editor_set_group_item (COMP_EDITOR (ee), TRUE);
+   		if (!((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM)))
+ 			bonobo_ui_component_set_prop (editor->uic, "/commands/ActionFreeBusy", "hidden", "1", NULL);
+
+=== modified file 'calendar/gui/dialogs/task-editor.c'
+--- calendar/gui/dialogs/task-editor.c	2007-12-18 20:23:31 +0000
+++ calendar/gui/dialogs/task-editor.c	2007-12-18 20:33:31 +0000
+@@ -446,6 +446,9 @@
+ 			read_only = TRUE;
+ 
+ 	if (priv->is_assigned) {
+		
+		comp_editor_set_needs_send (COMP_EDITOR (te), TRUE);
+		
+ 		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS))
+ 			task_page_show_options (priv->task_page);
+ 
+
+=== modified file 'ui/evolution-editor.xml'
+--- ui/evolution-editor.xml	2007-12-18 20:23:31 +0000
+++ ui/evolution-editor.xml	2007-12-18 20:33:31 +0000
+@@ -1,6 +1,7 @@
+ <Root>
+   <commands>
+ 	  <cmd name="FileSave" _tip="Click here to save the current window" accel="*Control*s" pixtype="pixbuf"/>
+          <cmd name="FileSend" _tip="Click here to send" accel="*Control*s" pixtype="pixbuf" />
+ 	  <cmd name="FileClose" _tip="Click here to close the current window" accel="*Control*w" pixtype="pixbuf"/>
+ 	  
+     	  <cmd name="EditCut" _tip="Cut selected text to the clipboard" accel="*Control*x" pixtype="pixbuf"/>
+@@ -18,6 +19,8 @@
+     <submenu name="File" _label="_File">
+       <placeholder name="FileOps">
+         <menuitem name="FileSave" verb="" _label="_Save"/>
+        <menuitem name="FileSend" verb="" _label="_Send"/>
+	      
+       </placeholder>
+       <placeholder name="FileWindow">
+ 	<menuitem name="FileClose" verb="" _label="_Close"/>
+@@ -53,7 +56,8 @@
+ 
+   <dockitem name="Toolbar">
+   
+-    <toolitem name="FileSave" verb="" _label="Save" pixtype="pixbuf"/>
+	  <toolitem name="FileSave" verb="" _label="Save"/>
+ 	  <toolitem name="FileSend" verb="" _label="Send" pixtype="pixbuf"/>
+     <toolitem name="FileClose" verb="" _label="Close" pixtype="pixbuf"/>
+     <separator f="" name="editor1"/>
+ 
+
--- a/evo-2.8.2-build-break.fix
+++ b/evo-2.8.2-build-break.fix
@ -1,38 +0,0 @@
--- data/Makefile.am.orig	2006-11-21 11:18:28.552759057 +0100
-+++ data/Makefile.am	2006-11-21 11:22:08.661273800 +0100
-@@ -25,10 +25,10 @@ kdedesktop_file = $(desktop_in_in_file:.
- install-kde-applnk:
- 	$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir);	\
- 	$(INSTALL_DATA) $(kdedesktop_file) \
-		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
-+		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
- 
- uninstall-kde-applnk:
-	rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
-+	rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
- 
- else
- 
-@@ -45,16 +45,16 @@ SUBDIRS = cde_app_root
- install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
- 	$(mkinstalldirs) $(DESTDIR)$(desktopdir);							\
- 	$(INSTALL_DATA) $(desktop_file)									\
-			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop ;	\
-+			$(DESTDIR)$(desktopdir)/$(desktop_file) ;	\
- 	$(mkinstalldirs) $(DESTDIR)$(keysdir);								\
-	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys ;	\
-+	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file) ;	\
- 	$(mkinstalldirs) $(DESTDIR)$(mimedir);								\
-	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime ;
-+	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file) ;
- 
- uninstall-local: uninstall-kde-applnk
-	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; 	\
-	rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
-	rm -rf $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
-+	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file); 	\
-+	rm -rf $(DESTDIR)$(keysdir)/$(keys_file) ;	\
-+	rm -rf $(DESTDIR)$(mimedir)/$(mime_file) ;
- 
- # CDE Stuff
- 
--- a/evolution-2.0.1-de-po.patch
+++ b/evolution-2.0.1-de-po.patch
@ -1,20 +1,22 @@
--- evolution-2.0.2/po/de.po
-+++ evolution-2.0.2/po/de.po
-@@ -588,7 +588,7 @@
+=== modified file 'po/de.po'
+--- po/de.po	2007-12-18 20:23:31 +0000
+++ po/de.po	2007-12-18 20:25:01 +0000
+@@ -1007,7 +1007,7 @@
 
- #: addressbook/gui/component/ldap-config.glade.h:19
+ #: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 -msgstr "Eindeutiger Name"
 +msgstr "\"Distinguished\" Name"
 
- #: addressbook/gui/component/ldap-config.glade.h:20
+ #: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
-@@ -733,7 +730,7 @@
+@@ -1187,7 +1187,7 @@
 
- #: addressbook/gui/component/ldap-config.glade.h:40
+ #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 -msgstr "Eindeutigen Namen (EN) verwenden"
 +msgstr "\"Distinguished\" Namen (DN) verwenden"
 
- #: addressbook/gui/component/ldap-config.glade.h:41
+ #: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
+
--- a/evolution-2.11.6.1-cal-busy-recursion.patch
+++ b/evolution-2.11.6.1-cal-busy-recursion.patch
@ -1,14 +0,0 @@
--- evolution-2.11.6.1/calendar/gui/e-cal-model.c~	2007-07-30 10:19:22.000000000 -0400
-+++ evolution-2.11.6.1/calendar/gui/e-cal-model.c	2007-08-16 15:48:33.000000000 -0400
-@@ -1536,11 +1536,6 @@ cal_opened_cb (ECal *client, ECalendarSt
- 	ECalModel *model = (ECalModel *) user_data;
- 	ECalModelClient *client_data;
- 
-	if (status == E_CALENDAR_STATUS_BUSY) {
-		e_cal_open_async (client, FALSE);
-		return;
-	}
-	
- 	if (status != E_CALENDAR_STATUS_OK) {
- 		e_cal_model_remove_client (model, client);
- 
--- a/evolution-2.12.0.tar.bz2
+++ b/evolution-2.12.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1b9fc4f02d297c797bf3953f0742f745efc2c0ebb893d126c0e3a9bac84fe56
-size 25562079
--- a/evolution-2.21.4.tar.bz2
+++ b/evolution-2.21.4.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fab730358871e516c30e9211d893d8c288276038dc5fbb3b080d6ac3e22b779
+size 25605844
--- a/evolution-configure.patch
+++ b/evolution-configure.patch
@ -1,10 +0,0 @@
--- evolution-2.3.6.1/configure.in
-+++ evolution-2.3.6.1/configure.in
-@@ -1677,7 +1677,6 @@
- plugins/mail-to-meeting/Makefile
- plugins/mail-to-task/Makefile
- plugins/mail-remote/Makefile
-plugins/mono/Makefile
- plugins/new-mail-notify/Makefile
- plugins/subject-thread/Makefile
- plugins/save-attachments/Makefile
--- a/evolution-desktop.patch
+++ b/evolution-desktop.patch
@ -1,14 +1,13 @@
-Index: data/evolution.desktop.in.in
-===================================================================
--- data/evolution.desktop.in.in.orig
-+++ data/evolution.desktop.in.in
+=== modified file 'data/evolution.desktop.in.in'
+--- data/evolution.desktop.in.in	2007-12-18 20:23:31 +0000
+++ data/evolution.desktop.in.in	2007-12-18 20:28:10 +0000
@@ -1,14 +1,15 @@
 [Desktop Entry]
 Encoding=UTF-8
- _Name=Evolution
+ _Name=Evolution Mail and Calendar
 -_GenericName=Groupware Suite
 +_GenericName=The Evolution Groupware Suite
- _Comment=The Evolution PIM and Email Client
+ _Comment=Manage your email, contacts and schedule
 Exec=evolution
 Icon=evolution
 Terminal=false
@ -20,3 +19,4 @@ Index: data/evolution.desktop.in.in
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=Evolution
 X-GNOME-Bugzilla-Component=Miscellaneous
+
--- a/evolution-morewarnings.patch
+++ b/evolution-morewarnings.patch
@ -1,7 +1,6 @@
-Index: calendar/gui/e-calendar-view.c
-===================================================================
--- calendar/gui/e-calendar-view.c.orig
-+++ calendar/gui/e-calendar-view.c
+=== modified file 'calendar/gui/e-calendar-view.c'
+--- calendar/gui/e-calendar-view.c	2007-12-18 20:23:31 +0000
+++ calendar/gui/e-calendar-view.c	2007-12-18 20:28:29 +0000
@@ -42,6 +42,7 @@
 #include <e-util/e-error.h>
 #include <e-util/e-dialog-utils.h>
@ -10,10 +9,10 @@ Index: calendar/gui/e-calendar-view.c
 #include "e-calendar-marshal.h"
 #include <libecal/e-cal-time-util.h>
 #include <libecal/e-cal-component.h>
-Index: calendar/gui/e-meeting-list-view.c
-===================================================================
--- calendar/gui/e-meeting-list-view.c.orig
-+++ calendar/gui/e-meeting-list-view.c
+
+=== modified file 'calendar/gui/e-meeting-list-view.c'
+--- calendar/gui/e-meeting-list-view.c	2007-12-18 20:23:31 +0000
+++ calendar/gui/e-meeting-list-view.c	2007-12-18 20:28:29 +0000
@@ -46,6 +46,7 @@
 #include <misc/e-cell-renderer-combo.h>
 #include <libebook/e-destination.h>
@ -22,3 +21,4 @@ Index: calendar/gui/e-meeting-list-view.c
 
 struct _EMeetingListViewPrivate {
 	EMeetingStore *store;
+
--- a/evolution-stringcompare.patch
+++ b/evolution-stringcompare.patch
@ -1,22 +0,0 @@
--- composer/e-msg-composer.c
-+++ composer/e-msg-composer.c
-@@ -5026,7 +5026,7 @@
- {
- 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
- 	
-	set_editor_text (composer, text, len, TRUE, text == "");
-+	set_editor_text (composer, text, len, TRUE, strlen(text) == 0);
- }
- 
- /**
--- shell/e-user-creatable-items-handler.c
-+++ shell/e-user-creatable-items-handler.c
-@@ -265,7 +265,7 @@
- 				    && strcmp (corba_item->id, "message") == 0)
- 					default_verb = item->verb;
- 
-				if (corba_item->iconName == "") {
-+				if (strlen(corba_item->iconName) == 0) {
- 					item->icon = NULL;
- 				} else {
- 					item->icon = e_icon_factory_get_icon (corba_item->iconName, E_ICON_SIZE_MENU);
--- a/evolution-warnings.patch
+++ b/evolution-warnings.patch
@ -1,8 +1,7 @@
-Index: calendar/gui/calendar-component.c
-===================================================================
--- calendar/gui/calendar-component.c.orig
-+++ calendar/gui/calendar-component.c
-@@ -1272,7 +1272,7 @@ create_new_event (CalendarComponent *cal
+=== modified file 'calendar/gui/calendar-component.c'
+--- calendar/gui/calendar-component.c	2007-12-18 20:23:31 +0000
+++ calendar/gui/calendar-component.c	2007-12-18 20:27:05 +0000
+@@ -1284,7 +1284,7 @@
 	} else {
 		ECalComponent *comp;
 		EventEditor *editor;
@ -11,10 +10,10 @@ Index: calendar/gui/calendar-component.c
 
 		flags = COMP_EDITOR_USER_ORG | COMP_EDITOR_NEW_ITEM;
 		if (is_meeting)
-Index: mail/em-composer-prefs.c
-===================================================================
--- mail/em-composer-prefs.c.orig
-+++ mail/em-composer-prefs.c
+
+=== modified file 'mail/em-composer-prefs.c'
+--- mail/em-composer-prefs.c	2007-12-18 20:23:31 +0000
+++ mail/em-composer-prefs.c	2007-12-18 20:27:05 +0000
@@ -56,6 +56,7 @@
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkimage.h>
@ -23,10 +22,10 @@ Index: mail/em-composer-prefs.c
 #include <gtk/gtkcolorbutton.h>
 #include <gtk/gtkfilechooserbutton.h>
 
-Index: mail/em-composer-utils.c
-===================================================================
--- mail/em-composer-utils.c.orig
-+++ mail/em-composer-utils.c
+
+=== modified file 'mail/em-composer-utils.c'
+--- mail/em-composer-utils.c	2007-12-18 20:23:31 +0000
+++ mail/em-composer-utils.c	2007-12-18 20:27:05 +0000
@@ -55,6 +55,7 @@
 #include <camel/camel-stream-mem.h>
 #include <camel/camel-nntp-address.h>
@ -35,11 +34,11 @@ Index: mail/em-composer-utils.c
 
 #ifdef G_OS_WIN32
 /* Undef the similar macro from pthread.h, it doesn't check if
-Index: plugins/save-calendar/ical-format.c
-===================================================================
--- plugins/save-calendar/ical-format.c.orig
-+++ plugins/save-calendar/ical-format.c
-@@ -109,7 +109,7 @@ do_save_calendar_ical (FormatHandler *ha
+
+=== modified file 'plugins/save-calendar/ical-format.c'
+--- plugins/save-calendar/ical-format.c	2007-12-18 20:23:31 +0000
+++ plugins/save-calendar/ical-format.c	2007-12-18 20:27:05 +0000
+@@ -105,7 +105,7 @@
 		return;
 
 	/* open source client */
@ -48,3 +47,4 @@ Index: plugins/save-calendar/ical-format.c
 	if (!e_cal_open (source_client, TRUE, &error)) {
 		display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error->message);
 		g_object_unref (source_client);
+
--- a/evolution.changes
+++ b/evolution.changes
@ -1,3 +1,57 @@
+-------------------------------------------------------------------
+Tue Dec 18 14:26:04 CST 2007 - maw@suse.de
+
+- Update to version 2.21.4:
+  + The large version bump is due to evolution and related packages
+    synchronizing their version numbers with those of GNOME
+  + Bugs (bugzilla.gnome.org) fixed: #220846, #263236, #329578,
+    #329706, #336074, #340267, #347328, #347329, #354265, #392747,
+    #408170, #409121, #430369, #437579, #438769, #444227, #446029,
+    #458824, #466241, #466497, #466499, #466503, #468277, #474043,
+    #474651, #475508, #492702, #500210, #500561, #501474, #501677,
+    #501969, #502188, #502312, #502318, #502501, #503111, #214645,
+    #216485, #216485, #256899, #271551, #325730, #335931, #346693,
+    #353807, #380644, #391062, #400213, #401337, #401523, #458237,
+    #479081, #480514, #484603, #489652, #493783, #494414, #494425,
+    #495123, #495711, #495872, #495875, #495951, #497810, #498173,
+    #498551, #499644, #499920, #500024, #231166, #255051, #315101,
+    #318592, #318604, #334675, #341085, #343011, #346693, #351932,
+    #353779, #353780, #359267, #463946, #478704, #483785, #209425,
+    #484064, #487318, #488298, #491345, #492058, #492102, #492106,
+    #492170, #492692, #493646, #228832, #230339, #261165, #271734,
+    #300693, #311179, #323977, #324472, #329823, #329823, #331421,
+    #331578, #337539, #340748, #342283, #346146, #346686, #351333,
+    #353656, #360134, #395272, #412360, #413420, #417999, #423401,
+    #428402, #428402, #437579, #461195, #461272, #467364, #468736,
+    #469657, #470837, #473903, #474000, #474557, #476389, #476926,
+    #477045, #477045, #478871, #479257, #479257, #479716, #480621,
+    #480804, #481235, #481325, #481325, #482575, #482603, #483301,
+    #483989, #484635, #484814, #486406, #489027, and #489661
+  + New plugin: external-editor, which will make it possible to
+     use an external editor as the mail composer
+  + Support for Google Calendar
+  + New Tango look icons
+  + Fixes some CPU usage issue whenever (un)read count is updated
+  + Added a preference to disable Magic Spacebar
+  + Fix an implicit function declaration
+  + Bump libgtkhtml requirement to 3.17.3 due to bug
+    (bugzilla.gnome.org) #271551
+  + Cleanup of attachment reminder
+  + Move preferences of attachment reminder plugin to the
+    configure tab
+  + Fix capitalization of "Download Messages..." & "Switcher
+    Appearance" menu
+  + Basic support for non-intrusive error reporting and error
+    logging in Mailer
+  + Add basic support for crash detection
+  + Basic Message tagging support (aka Custom labels)
+  + Updated translations
+- Remove the following upstreamed patches: evolution-configure.patch,
+  evolution-2.11.6.1-cal-busy-recursion.patch,
+  bnc-308959-mail-attachment-icon.patch, 
+  evolution-stringcompare.patch, and
+  bnc-302017-print-100pc.diff.
+
 -------------------------------------------------------------------
 Wed Dec  5 01:20:11 CET 2007 - maw@suse.de

--- a/evolution.spec
+++ b/evolution.spec
@ -1,5 +1,5 @@
 #
-# spec file for package evolution (Version 2.12.0)
+# spec file for package evolution (Version 2.21.4)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@ -17,11 +17,14 @@ Group:          Productivity/Networking/Email/Clients
 Obsoletes:      evoltn
 Provides:       evoltn
 AutoReqProv:    on
-Version:        2.12.0
-Release:        38
+# This should be updated upon major version changes, and used in place of
+# BASE_VERSION (as defined in configure.in).
+%define evolution_base_version 2.22
+Version:        2.21.4
+Release:        1
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 #Source:         ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2
-Source:         %{name}-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 Source1:        summerdance-about2.png
 Source2:        evolution-email.desktop
 Source3:        evolution-addressbook.desktop
@ -33,7 +36,7 @@ Source8:        ximian-evolution-calendar.png
 Source9:        ximian-evolution-tasks.png
 Patch1:         evolution-2.0.1-de-po.patch
 Patch15:        nss-nspr.patch
-Patch16:        evolution-configure.patch
+### Patch16:        evolution-configure.patch
 Patch17:        evolution-warnings.patch
 Patch19:        evolution-2.2.0-port-to-pilot-link-0.12.patch
 Patch20:        evolution-desktop.patch
@ -53,16 +56,11 @@ Patch78:        bnc-173186.patch
 Patch88:        bnc-178778-evo-open-appt-crash.diff 
 Patch89:        bnc-214647-add-prefer-plain-plugin.patch
 Patch90:        fix-security-gtkhtml-moreui.diff
-Patch91:        evo-2.8.2-build-break.fix
+### Patch91:        evo-2.8.2-build-break.fix
 Patch92:        evo-2.8.2-regression-fix.patch
 Patch100:       abuild.patch
-#Patch101:       xsltproc-no-net.patch
-Patch102:       evolution-2.11.6.1-cal-busy-recursion.patch
-Patch103:       bnc-302017-print-100pc.diff
 Patch104:       bnc-294999-subs-other-user-folder.patch
-Patch105:       bnc-308959-mail-attachment-icon.patch
 Patch999:       build-fixes.diff
-Patch1000:      evolution-stringcompare.patch
 Url:            http://gnome.org/projects/evolution/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       yelp
@ -281,18 +279,13 @@ Authors:
 %lang_package
 %prep
 %setup -q 
-#%patch0
-%patch1 -p 1
-#%patch15
-%patch16 -p1
+%patch1 -p0
 %patch17
-#%patch18
 %if %suse_version > 1000
 # FIXME: somebody with time should fix this patch up and make it apply once more
 # %patch19 -p1
 %endif
 %patch20
-#%patch23
 %patch24
 %patch25
 %patch30
@ -306,21 +299,11 @@ Authors:
 %patch71
 %patch78
 %patch88
-# 89 is uptream now
 # %patch89
 # FIXME: 90 breaks the build.  need to re-do.
-# %patch90
-# 91 and 92 upsream too
-#%patch91
-# %patch92
-%patch100 -p1
-#%patch101 -p1
-%patch102 -p1
-%patch103
+%patch100
 %patch104
-%patch105
 %patch999
-%patch1000

 %build
 autoreconf -f -i
@ -343,24 +326,28 @@ sed -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
 	--enable-nss=yes\
 	--enable-ipv6=yes\
 	--enable-default-binary=yes
+# Processing the files in help uses _lots_ of memory, so running that part
+# in parallel is bad.
+pushd help
+make
 make %{?jobs:-j%jobs}

 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/2.12/images/about-box.png
+cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/%evolution_base_version/images/about-box.png
 %suse_update_desktop_file -G "Mail and Calendar" evolution Core-Office
 for xml in $RPM_BUILD_ROOT/%{_datadir}/gnome/help/evolution-*/*/evolution-*.xml; do
    meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
 done
 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/applications/
-%suse_update_desktop_file -G "Mail" -D "evolution-2.12/evolution-2.12.xml?usage-mail" evolution-email
-%suse_update_desktop_file -G "Address Book" -D "evolution-2.12/evolution-2.12.xml?usage-contact" evolution-addressbook
-%suse_update_desktop_file -G "Schedule Manager" -D "evolution-2.12/evolution-2.12.xml?usage-calendar" evolution-calendar
-%suse_update_desktop_file -G "Task List" -D "evolution-2.12/evolution-2.12.xml?usage-calendar-todo" evolution-tasklist
+%suse_update_desktop_file -G "Mail" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-mail" evolution-email
+%suse_update_desktop_file -G "Address Book" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-contact" evolution-addressbook
+%suse_update_desktop_file -G "Schedule Manager" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-calendar" evolution-calendar
+%suse_update_desktop_file -G "Task List" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-calendar-todo" evolution-tasklist
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 cp %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
-%find_lang evolution-2.12
-%find_lang evolution evolution-2.12.lang
+%find_lang evolution-%evolution_base_version
+%find_lang evolution evolution-%evolution_base_version.lang
 %find_gconf_schemas
 cat %{name}.schemas_list >%{name}.lst
 rm $RPM_BUILD_ROOT%{_libdir}/evolution/*/*/*.*a
@ -411,7 +398,7 @@ fi
 %{_prefix}/lib/evolution/*/evolution-*
 %{_prefix}/lib/evolution/*/killev

-%files lang -f evolution-2.12.lang
+%files lang -f evolution-%evolution_base_version.lang

 %files devel 
 %defattr(-,root,root)
@ -426,6 +413,57 @@ fi
 %{_libdir}/evolution/*/conduits/*.so

 %changelog
+* Tue Dec 18 2007 - maw@suse.de
+- Update to version 2.21.4:
+  + The large version bump is due to evolution and related packages
+  synchronizing their version numbers with those of GNOME
+  + Bugs (bugzilla.gnome.org) fixed: #220846, #263236, #329578,
+  [#329706], #336074, #340267, #347328, #347329, #354265, #392747,
+  [#408170], #409121, #430369, #437579, #438769, #444227, #446029,
+  [#458824], #466241, #466497, #466499, #466503, #468277, #474043,
+  [#474651], #475508, #492702, #500210, #500561, #501474, #501677,
+  [#501969], #502188, #502312, #502318, #502501, #503111, #214645,
+  [#216485], #216485, #256899, #271551, #325730, #335931, #346693,
+  [#353807], #380644, #391062, #400213, #401337, #401523, #458237,
+  [#479081], #480514, #484603, #489652, #493783, #494414, #494425,
+  [#495123], #495711, #495872, #495875, #495951, #497810, #498173,
+  [#498551], #499644, #499920, #500024, #231166, #255051, #315101,
+  [#318592], #318604, #334675, #341085, #343011, #346693, #351932,
+  [#353779], #353780, #359267, #463946, #478704, #483785, #209425,
+  [#484064], #487318, #488298, #491345, #492058, #492102, #492106,
+  [#492170], #492692, #493646, #228832, #230339, #261165, #271734,
+  [#300693], #311179, #323977, #324472, #329823, #329823, #331421,
+  [#331578], #337539, #340748, #342283, #346146, #346686, #351333,
+  [#353656], #360134, #395272, #412360, #413420, #417999, #423401,
+  [#428402], #428402, #437579, #461195, #461272, #467364, #468736,
+  [#469657], #470837, #473903, #474000, #474557, #476389, #476926,
+  [#477045], #477045, #478871, #479257, #479257, #479716, #480621,
+  [#480804], #481235, #481325, #481325, #482575, #482603, #483301,
+  [#483989], #484635, #484814, #486406, #489027, and #489661
+  + New plugin: external-editor, which will make it possible to
+  use an external editor as the mail composer
+  + Support for Google Calendar
+  + New Tango look icons
+  + Fixes some CPU usage issue whenever (un)read count is updated
+  + Added a preference to disable Magic Spacebar
+  + Fix an implicit function declaration
+  + Bump libgtkhtml requirement to 3.17.3 due to bug
+  (bugzilla.gnome.org) #271551
+  + Cleanup of attachment reminder
+  + Move preferences of attachment reminder plugin to the
+  configure tab
+  + Fix capitalization of "Download Messages..." & "Switcher
+  Appearance" menu
+  + Basic support for non-intrusive error reporting and error
+  logging in Mailer
+  + Add basic support for crash detection
+  + Basic Message tagging support (aka Custom labels)
+  + Updated translations
+- Remove the following upstreamed patches: evolution-configure.patch,
+  evolution-2.11.6.1-cal-busy-recursion.patch,
+  bnc-308959-mail-attachment-icon.patch,
+  evolution-stringcompare.patch, and
+  bnc-302017-print-100pc.diff.
 * Wed Dec 05 2007 - maw@suse.de
 - Build with openldap2-devel, not openldap2.
 * Tue Nov 13 2007 - psankar@suse.de
--- a/fix-exchange-menuitem.diff
+++ b/fix-exchange-menuitem.diff
@ -1,10 +1,6 @@
-Index: plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml
-===================================================================
-RCS file: /cvs/gnome/evolution/plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml,v
-retrieving revision 1.2
-diff -u -p -r1.2 org-gnome-exchange-ab-subscription.xml
--- plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml	10 Jan 2006 18:38:04 -0000	1.2
-+++ plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml	20 Apr 2006 10:18:10 -0000
+=== modified file 'plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml'
+--- plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml	2007-12-18 20:23:31 +0000
+++ plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml	2007-12-18 20:36:19 +0000
@@ -1,6 +1,6 @@
 <Root>
   <commands>
@ -13,13 +9,10 @@ diff -u -p -r1.2 org-gnome-exchange-ab-subscription.xml
       _tip="Subscribe to Other User's Contacts"/>
   </commands>
 
-Index: plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml
-===================================================================
-RCS file: /cvs/gnome/evolution/plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml,v
-retrieving revision 1.1
-diff -u -p -r1.1 org-gnome-exchange-cal-subscription.xml
--- plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml	22 Jul 2005 10:25:22 -0000	1.1
-+++ plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml	20 Apr 2006 10:18:10 -0000
+
+=== modified file 'plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml'
+--- plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml	2007-12-18 20:23:31 +0000
+++ plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml	2007-12-18 20:36:19 +0000
@@ -1,6 +1,6 @@
 <Root>
   <commands>
@ -28,13 +21,10 @@ diff -u -p -r1.1 org-gnome-exchange-cal-subscription.xml
       _tip="Subscribe to Other User's Calendar"/>
   </commands>
 
-Index: plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml
-===================================================================
-RCS file: /cvs/gnome/evolution/plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml,v
-retrieving revision 1.2
-diff -u -p -r1.2 org-gnome-exchange-tasks-subscription.xml
--- plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml	10 Jan 2006 18:38:04 -0000	1.2
-+++ plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml	20 Apr 2006 10:18:10 -0000
+
+=== modified file 'plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml'
+--- plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml	2007-12-18 20:23:31 +0000
+++ plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml	2007-12-18 20:36:19 +0000
@@ -1,6 +1,6 @@
 <Root>
   <commands>
@ -43,13 +33,10 @@ diff -u -p -r1.2 org-gnome-exchange-tasks-subscription.xml
       _tip="Subscribe to Other User's Tasks"/>
   </commands>
 
-Index: plugins/exchange-operations/org-gnome-folder-subscription.xml
-===================================================================
-RCS file: /cvs/gnome/evolution/plugins/exchange-operations/org-gnome-folder-subscription.xml,v
-retrieving revision 1.3
-diff -u -p -r1.3 org-gnome-folder-subscription.xml
--- plugins/exchange-operations/org-gnome-folder-subscription.xml	10 Jan 2006 18:38:04 -0000	1.3
-+++ plugins/exchange-operations/org-gnome-folder-subscription.xml	20 Apr 2006 10:18:10 -0000
+
+=== modified file 'plugins/exchange-operations/org-gnome-folder-subscription.xml'
+--- plugins/exchange-operations/org-gnome-folder-subscription.xml	2007-12-18 20:23:31 +0000
+++ plugins/exchange-operations/org-gnome-folder-subscription.xml	2007-12-18 20:36:19 +0000
@@ -1,6 +1,6 @@
 <Root>
   <commands>
@ -58,3 +45,4 @@ diff -u -p -r1.3 org-gnome-folder-subscription.xml
       _tip="Subscribe to Other User's Folder"/>
   </commands>
 
+
--- a/fix-sendrecv.diff
+++ b/fix-sendrecv.diff
@ -1,12 +1,8 @@
-Index: ui/evolution.xml
-===================================================================
-RCS file: /cvs/gnome/evolution/ui/evolution.xml,v
-retrieving revision 1.110
-diff -u -p -r1.110 evolution.xml
--- ui/evolution.xml	30 Jan 2006 05:16:26 -0000	1.110
-+++ ui/evolution.xml	21 Apr 2006 04:24:58 -0000
-@@ -38,7 +38,7 @@
-       _tip="Submit a bug report using Bug Buddy"/>
+=== modified file 'ui/evolution.xml'
+--- ui/evolution.xml	2007-12-18 20:23:31 +0000
+++ ui/evolution.xml	2007-12-18 20:39:20 +0000
+@@ -43,7 +43,7 @@
+       _tip="Open the Frequently Asked Questions webpage"/>
 
     <cmd name="SendReceive"
 -     _tip="Send queued items and retrieve new items"
@ -14,16 +10,7 @@ diff -u -p -r1.110 evolution.xml
      pixtype="pixbuf"/>
 
     <cmd name="ForgetPasswords"
-@@ -65,7 +65,7 @@
- 
-       <separator f="" name="eshell4"/>
-       
-      <menuitem name="SendReceive" verb="" _label="Send / _Receive" accel="F9"/>
-+      <menuitem name="SendReceive" verb="" _label="Get Mail" accel="F9"/>
- 
-       <placeholder name="FileOps"/>
- 
-@@ -171,7 +171,7 @@
+@@ -182,7 +182,7 @@
     <separator f="" name="eshell4"/>
 
     <toolitem name="SendReceive" verb="SendReceive"
@ -32,3 +19,4 @@ diff -u -p -r1.110 evolution.xml
      pixtype="pixbuf"/>
 
     <separator f="" name="global1"/>
+
--- a/remove-nm-dep.patch
+++ b/remove-nm-dep.patch
@ -1,11 +1,8 @@
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/evolution/configure.in,v
-retrieving revision 1.881
-diff -u -p -w -r1.881 configure.in
--- configure.in	13 Feb 2006 16:18:43 -0000	1.881
-+++ configure.in	16 Feb 2006 10:04:58 -0000
-@@ -1203,22 +1203,16 @@ dnl --- evolution (shell) flags
+=== modified file 'configure.in'
+--- configure.in	2007-12-18 20:23:31 +0000
+++ configure.in	2007-12-18 20:28:43 +0000
+@@ -1456,23 +1456,17 @@
+ dnl --- evolution (shell) flags
 
 NM_SUPPORT_PACKAGES=""
 +NM_SUPPORT_GLIB="no"
@ -32,14 +29,11 @@ diff -u -p -w -r1.881 configure.in
 AM_CONDITIONAL(NM_SUPPORT, test x$NM_SUPPORT = xyes)
 
 
-Index: shell/e-shell-nm.c
-===================================================================
-RCS file: /cvs/gnome/evolution/shell/e-shell-nm.c,v
-retrieving revision 1.1
-diff -u -p -w -r1.1 e-shell-nm.c
--- shell/e-shell-nm.c	22 Dec 2005 02:12:34 -0000	1.1
-+++ shell/e-shell-nm.c	16 Feb 2006 10:04:58 -0000
-@@ -31,7 +31,11 @@
+
+=== modified file 'shell/e-shell-nm.c'
+--- shell/e-shell-nm.c	2007-12-18 20:23:31 +0000
+++ shell/e-shell-nm.c	2007-12-18 20:28:43 +0000
+@@ -33,7 +33,11 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib.h>
@ -50,5 +44,6 @@ diff -u -p -w -r1.1 e-shell-nm.c
 +#define NM_DBUS_INTERFACE       "org.freedesktop.NetworkManager"
 +
 
- int shell_dbus_initialize (EShellWindow *window);
- 
+ typedef enum _ShellLineStatus {
+ 	E_SHELL_LINE_DOWN,
+