dist-git conversion

Contacts combo boxes don't work).

.cvsignore

@@ -1 +0,0 @@
-evolution-2.10.1.tar.bz2

.gitignore

@@ -0,0 +1 @@
+evolution-2.10.3.tar.bz2

Makefile

@@ -1,6 +0,0 @@
-# Makefile for source rpm: evolution
-# $Id$
-NAME := evolution
-SPECFILE = $(firstword $(wildcard *.spec))
-
-include ../common/Makefile.common

evolution-2.10.0-e-source-combo-box.patch

@@ -1,5 +1,6 @@
---- evolution-2.10.0/widgets/misc/e-pilot-settings.c.e-source-combo-box	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-pilot-settings.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/widgets/misc/e-pilot-settings.c.e-source-combo-box evolution-2.10.3/widgets/misc/e-pilot-settings.c
+--- evolution-2.10.3/widgets/misc/e-pilot-settings.c.e-source-combo-box	2007-04-09 09:10:24.000000000 -0400
++++ evolution-2.10.3/widgets/misc/e-pilot-settings.c	2007-08-30 09:59:24.000000000 -0400
 @@ -27,7 +27,7 @@
  
  #include <gtk/gtk.h>
@@ -9,7 +10,7 @@
  #include "e-pilot-settings.h"
  
  struct _EPilotSettingsPrivate 
-@@ -102,7 +102,7 @@
+@@ -102,7 +102,7 @@ build_ui (EPilotSettings *ps, ESourceLis
  
  	lbl = gtk_label_new (_("Sync with:"));
  	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
@@ -18,7 +19,7 @@
  	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, 0, 1);
  	gtk_table_attach_defaults (GTK_TABLE (ps), priv->source, 1, 2, 0, 1);
  	gtk_widget_show (lbl);
-@@ -152,8 +152,9 @@
+@@ -152,8 +152,9 @@ e_pilot_settings_get_source (EPilotSetti
  	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), FALSE);
  
  	priv = ps->priv;
@@ -30,7 +31,7 @@
  }
  
  void
-@@ -166,7 +167,8 @@
+@@ -166,7 +167,8 @@ e_pilot_settings_set_source (EPilotSetti
  
  	priv = ps->priv;
  
@@ -40,8 +41,9 @@
  }
  
  gboolean
---- evolution-2.10.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box	2007-02-26 04:59:58.000000000 -0500
-+++ evolution-2.10.0/plugins/itip-formatter/itip-formatter.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/plugins/itip-formatter/itip-formatter.c.e-source-combo-box evolution-2.10.3/plugins/itip-formatter/itip-formatter.c
+--- evolution-2.10.3/plugins/itip-formatter/itip-formatter.c.e-source-combo-box	2007-04-09 09:09:15.000000000 -0400
++++ evolution-2.10.3/plugins/itip-formatter/itip-formatter.c	2007-08-30 09:59:24.000000000 -0400
 @@ -39,7 +39,7 @@
  #include <camel/camel-store.h>
  #include <libecal/e-cal.h>
@@ -51,8 +53,9 @@
  #include <libedataserverui/e-source-selector.h>
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <mail/em-format-hook.h>
---- evolution-2.10.0/plugins/itip-formatter/itip-view.c.e-source-combo-box	2007-01-03 10:34:04.000000000 -0500
-+++ evolution-2.10.0/plugins/itip-formatter/itip-view.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/plugins/itip-formatter/itip-view.c.e-source-combo-box evolution-2.10.3/plugins/itip-formatter/itip-view.c
+--- evolution-2.10.3/plugins/itip-formatter/itip-view.c.e-source-combo-box	2007-04-09 09:09:15.000000000 -0400
++++ evolution-2.10.3/plugins/itip-formatter/itip-view.c	2007-08-30 09:59:24.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <camel/camel-mime-message.h>
  #include <libedataserver/e-time-utils.h>
@@ -62,7 +65,7 @@
  #include <libecal/e-cal.h>
  #include <libecal/e-cal-time-util.h>
  #include <gtkhtml/gtkhtml-embedded.h>
-@@ -104,8 +104,8 @@
+@@ -104,8 +104,8 @@ struct _ItipViewPrivate {
  	char *description;
  
  	GtkWidget *selector_box;
@@ -73,7 +76,7 @@
  	ESourceList *source_list;
  	
  	GtkWidget *rsvp_box;
-@@ -1664,10 +1664,12 @@
+@@ -1664,10 +1664,12 @@ itip_view_clear_lower_info_items (ItipVi
  }
  
  static void
@@ -89,7 +92,7 @@
  	g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
  }
  
-@@ -1684,40 +1686,42 @@
+@@ -1684,40 +1686,42 @@ itip_view_set_source_list (ItipView *vie
  	if (priv->source_list)
  		g_object_unref (priv->source_list);
  
@@ -149,7 +152,7 @@
  }
  
  ESourceList *
-@@ -1743,10 +1747,11 @@
+@@ -1743,10 +1747,11 @@ itip_view_set_source (ItipView *view, ES
  	
  	priv = view->priv;
  
@@ -163,7 +166,7 @@
  }
  
  ESource *
-@@ -1759,10 +1764,11 @@
+@@ -1759,10 +1764,11 @@ itip_view_get_source (ItipView *view)
  	
  	priv = view->priv;
  	
@@ -177,8 +180,9 @@
  }
  
  void
---- evolution-2.10.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box	2007-01-03 10:34:02.000000000 -0500
-+++ evolution-2.10.0/plugins/bbdb/gaimbuddies.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/plugins/bbdb/gaimbuddies.c.e-source-combo-box evolution-2.10.3/plugins/bbdb/gaimbuddies.c
+--- evolution-2.10.3/plugins/bbdb/gaimbuddies.c.e-source-combo-box	2007-05-25 02:43:33.000000000 -0400
++++ evolution-2.10.3/plugins/bbdb/gaimbuddies.c	2007-08-30 09:59:24.000000000 -0400
 @@ -44,7 +44,7 @@
  #include <string.h>
  
@@ -188,8 +192,9 @@
  
  #include <sys/time.h>
  #include <sys/stat.h>
---- evolution-2.10.0/plugins/bbdb/bbdb.c.e-source-combo-box	2007-01-03 10:34:02.000000000 -0500
-+++ evolution-2.10.0/plugins/bbdb/bbdb.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/plugins/bbdb/bbdb.c.e-source-combo-box evolution-2.10.3/plugins/bbdb/bbdb.c
+--- evolution-2.10.3/plugins/bbdb/bbdb.c.e-source-combo-box	2007-06-30 15:29:42.000000000 -0400
++++ evolution-2.10.3/plugins/bbdb/bbdb.c	2007-08-30 10:03:58.000000000 -0400
 @@ -40,7 +40,7 @@
  #include <string.h>
  
@@ -199,17 +204,84 @@
  
  #include <e-util/e-config.h>
  #include <mail/em-config.h>
-@@ -341,7 +341,8 @@
+@@ -71,10 +71,49 @@ static gboolean bbdb_timeout (gpointer d
+ static void bbdb_do_it (EBook *book, const char *name, const char *email);
+ static void add_email_to_contact (EContact *contact, const char *email);
+ static void enable_toggled_cb (GtkWidget *widget, gpointer data);
+-static void source_changed_cb (GtkWidget *widget, ESource *source, gpointer data);
++static void source_changed_cb (ESourceComboBox *source_combo_box, struct bbdb_stuff *stuff);
+ static GtkWidget *create_addressbook_option_menu (struct bbdb_stuff *stuff, int type);
+ static void cleanup_cb (GObject *o, gpointer data);
+ 
++static ESource *
++find_esource_by_uri (ESourceList *source_list, const gchar *target_uri)
++{
++	GSList *groups;
++
++	/* XXX This would be unnecessary if the plugin had stored
++	 *     the addressbook's UID instead of the URI in GConf.
++	 *     Too late to change it now, I suppose. */
++
++	if (source_list == NULL || target_uri == NULL)
++		return NULL;
++
++	groups = e_source_list_peek_groups (source_list);
++
++	while (groups != NULL) {
++		GSList *sources;
++
++		sources = e_source_group_peek_sources (groups->data);
++
++		while (sources != NULL) {
++			gchar *uri;
++			gboolean match;
++
++			uri = e_source_get_uri (sources->data);
++			match = (strcmp (uri, target_uri) == 0);
++			g_free (uri);
++
++			if (match)
++				return sources->data;
++
++			sources = g_slist_next (sources);
++		}
++
++		groups = g_slist_next (groups);
++	}
++
++	return NULL;
++}
++
+ int
+ e_plugin_lib_enable (EPluginLib *ep, int enable)
+ {
+@@ -353,8 +392,23 @@ enable_toggled_cb (GtkWidget *widget, gp
  	
  	gtk_widget_set_sensitive (stuff->option_menu, active);
  	if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL)) {
 -		selected_source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (stuff->option_menu));
+-		gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL);
++		const gchar *uri = NULL;
++		GError *error = NULL;
++
 +		selected_source = e_source_combo_box_get_active (
 +			E_SOURCE_COMBO_BOX (stuff->option_menu));
- 		gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL);
++		if (selected_source != NULL)
++			uri = e_source_get_uri (selected_source);
++
++		gconf_client_set_string (
++			stuff->target->gconf,
++			GCONF_KEY_WHICH_ADDRESSBOOK,
++			uri, &error);
++
++		if (error != NULL) {
++			g_warning ("%s", error->message);
++			g_error_free (error);
++		}
  	}
  }
-@@ -360,7 +361,8 @@
+ 
+@@ -372,7 +426,8 @@ enable_gaim_toggled_cb (GtkWidget *widge
  	
  	gtk_widget_set_sensitive (stuff->gaim_option_menu, active);
  	if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL)) {
@@ -219,15 +291,67 @@
  		gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL);
  	}
  }
-@@ -389,31 +391,32 @@
+@@ -384,48 +439,77 @@ synchronize_button_clicked_cb (GtkWidget
+ }
+ 
+ static void
+-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
++source_changed_cb (ESourceComboBox *source_combo_box,
++                   struct bbdb_stuff *stuff)
+ {
+-	struct bbdb_stuff *stuff = (struct bbdb_stuff *) data;
+-	
+-	gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (source), NULL);
++	ESource *source;
++	GError *error = NULL;
++
++	source = e_source_combo_box_get_active (source_combo_box);
++	g_return_if_fail (source != NULL);
++
++	gconf_client_set_string (
++		stuff->target->gconf,
++		GCONF_KEY_WHICH_ADDRESSBOOK,
++		e_source_get_uri (source), &error);
++
++	if (error != NULL) {
++		g_warning ("%s", error->message);
++		g_error_free (error);
++	}
+ }
+ 
+ static void
+-gaim_source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
++gaim_source_changed_cb (ESourceComboBox *source_combo_box,
++                        struct bbdb_stuff *stuff)
+ {
+-	struct bbdb_stuff *stuff = (struct bbdb_stuff *) data;
+-	gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (source), NULL);
++	ESource *source;
++	GError *error = NULL;
++
++	source = e_source_combo_box_get_active (source_combo_box);
++	g_return_if_fail (source != NULL);
++
++	gconf_client_set_string (
++		stuff->target->gconf,
++		GCONF_KEY_WHICH_ADDRESSBOOK_GAIM,
++		e_source_get_uri (source), &error);
++
++	if (error != NULL) {
++		g_warning ("%s", error->message);
++		g_error_free (error);
++	}
+ }
+ 
  static GtkWidget *
  create_addressbook_option_menu (struct bbdb_stuff *stuff, int type)
  {
 -	GtkWidget   *menu;
 +	GtkWidget   *combo_box;
  	ESourceList *source_list;
- 	char        *selected_source_uri;
--	ESource     *selected_source;
+-	char        *selected_source_uri;
+ 	ESource     *selected_source;
++	char        *selected_source_uri;
  
  	GConfClient *gconf = stuff->target->gconf;
  
@@ -239,15 +363,18 @@
  		selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL);
  	else
  		selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL);
- 	if (selected_source_uri != NULL) {
+-	if (selected_source_uri != NULL) {
 -		selected_source = e_source_new_with_absolute_uri ("", selected_source_uri);
 -		e_source_option_menu_select (E_SOURCE_OPTION_MENU (menu), selected_source);
+-		g_free (selected_source_uri);
+-	}
++	selected_source = find_esource_by_uri (
++		source_list, selected_source_uri);
++	g_free (selected_source_uri);
++
++	if (selected_source != NULL)
 +		e_source_combo_box_set_active (
-+			E_SOURCE_COMBO_BOX (combo_box),
-+			e_source_new_with_absolute_uri (
-+				"", selected_source_uri));
- 		g_free (selected_source_uri);
- 	}
++			E_SOURCE_COMBO_BOX (combo_box), selected_source);
  
 -	gtk_widget_show (menu);
 +	gtk_widget_show (combo_box);
@@ -259,8 +386,27 @@
  }
  
  GtkWidget *
---- evolution-2.10.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box	2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-list-editor/contact-list-editor.glade	2007-03-13 16:56:41.000000000 -0400
+@@ -491,7 +575,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH
+ 
+ 	/* Source selection option menu */
+ 	option = create_addressbook_option_menu (stuff, AUTOMATIC_CONTACTS_ADDRESSBOOK);
+-	g_signal_connect (option, "source_selected", G_CALLBACK (source_changed_cb), stuff);
++	g_signal_connect (option, "changed", G_CALLBACK (source_changed_cb), stuff);
+ 	gtk_widget_set_sensitive (option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL));
+ 	gtk_box_pack_start (GTK_BOX (inner_vbox), option, FALSE, FALSE, 0);
+ 	stuff->option_menu = option;
+@@ -527,7 +611,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH
+ 
+ 	/* Gaim Source Selection Option Menu */
+ 	gaim_option = create_addressbook_option_menu (stuff, GAIM_ADDRESSBOOK);
+-	g_signal_connect (gaim_option, "source_selected", G_CALLBACK (gaim_source_changed_cb), stuff);
++	g_signal_connect (gaim_option, "changed", G_CALLBACK (gaim_source_changed_cb), stuff);
+ 	gtk_widget_set_sensitive (gaim_option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL));
+ 	gtk_box_pack_start (GTK_BOX (inner_vbox), gaim_option, FALSE, FALSE, 0);
+ 	stuff->gaim_option_menu = gaim_option;
+diff -up evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade
+--- evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box	2007-05-27 14:11:02.000000000 -0400
++++ evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade	2007-08-30 09:59:24.000000000 -0400
 @@ -158,9 +158,9 @@
  		  </child>
  
@@ -273,8 +419,9 @@
  		      <property name="int1">0</property>
  		      <property name="int2">0</property>
  		      <property name="last_modification_time">Tue, 01 Jun 2004 18:22:38 GMT</property>
---- evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box	2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+--- evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box	2007-04-09 09:07:42.000000000 -0400
++++ evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c	2007-08-30 09:59:24.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gtk/gtktogglebutton.h>
  #include <gtk/gtkdialog.h>
@@ -284,7 +431,7 @@
  
  #include <table/e-table-scrolled.h>
  #include <libgnomevfs/gnome-vfs-ops.h>
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,7 @@ static void select_cb (GtkWidget *w, ECo
  static void list_name_changed_cb (GtkWidget *w, EContactListEditor *editor);
  static void list_image_changed_cb (GtkWidget *w, EContactListEditor *editor);
  static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor);
@@ -293,7 +440,7 @@
  static gboolean email_key_pressed (GtkWidget *w, GdkEventKey *event, EContactListEditor *editor);
  static void email_match_selected (GtkWidget *w, EDestination *destination, EContactListEditor *editor);
  
-@@ -233,7 +233,7 @@
+@@ -233,7 +233,7 @@ e_contact_list_editor_init (EContactList
  	editor->list_name_entry = glade_xml_get_widget (gui, "list-name-entry");
  	editor->list_image = glade_xml_get_widget (gui, "list-image");
  	editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton");
@@ -302,7 +449,7 @@
  
  	editor->ok_button = glade_xml_get_widget (gui, "ok-button");
  	editor->cancel_button = glade_xml_get_widget (gui, "cancel-button");
-@@ -276,7 +276,7 @@
+@@ -276,7 +276,7 @@ e_contact_list_editor_init (EContactList
  			  "changed", G_CALLBACK(list_image_changed_cb), editor);
  
  	g_signal_connect (editor->source_menu,
@@ -311,7 +458,7 @@
  
  	command_state_changed (editor);
  
-@@ -306,8 +306,9 @@
+@@ -306,8 +306,9 @@ new_target_cb (EBook *new_book, EBookSta
  	if (status != E_BOOK_ERROR_OK || new_book == NULL) {
  		eab_load_error_dialog (NULL, e_book_get_source (new_book), status);
  
@@ -323,7 +470,7 @@
  
  		if (new_book)
  			g_object_unref (new_book);
-@@ -332,8 +333,12 @@
+@@ -332,8 +333,12 @@ cancel_load (EContactListEditor *editor)
  }
  
  static void
@@ -337,7 +484,7 @@
  	cancel_load (editor);
  
  	if (e_source_equal (e_book_get_source (editor->book), source))
-@@ -795,28 +800,28 @@
+@@ -795,28 +800,28 @@ select_cb (GtkWidget *w, EContactListEdi
  }
  
  GtkWidget *
@@ -376,7 +523,7 @@
  }
  
  GtkWidget *
-@@ -1262,10 +1267,9 @@
+@@ -1262,10 +1267,9 @@ fill_in_info(EContactListEditor *editor)
  	}
  	
  	if (editor->book) {
@@ -390,8 +537,9 @@
  		gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list);
  		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list);
  	}
---- evolution-2.10.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box	2007-02-26 04:59:17.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-editor/contact-editor.glade	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade
+--- evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box	2007-04-09 09:07:40.000000000 -0400
++++ evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade	2007-08-30 09:59:24.000000000 -0400
 @@ -356,9 +356,9 @@
  		      </child>
  
@@ -404,8 +552,9 @@
  			  <property name="int1">0</property>
  			  <property name="int2">0</property>
  			  <property name="last_modification_time">Tue, 13 Apr 2004 20:47:50 GMT</property>
---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box	2007-02-26 04:59:17.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c
+--- evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box	2007-05-27 12:54:09.000000000 -0400
++++ evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c	2007-08-30 09:59:24.000000000 -0400
 @@ -46,7 +46,7 @@
  #include <text/e-entry.h>
  
@@ -415,7 +564,7 @@
  
  #include <camel/camel.h>
  
-@@ -590,15 +590,16 @@
+@@ -590,15 +590,16 @@ static void
  fill_in_source_field (EContactEditor *editor)
  {
  	GtkWidget *source_menu;
@@ -436,7 +585,7 @@
  }
  
  static void
-@@ -2525,13 +2526,15 @@
+@@ -2525,13 +2526,15 @@ new_target_cb (EBook *new_book, EBookSta
  	editor->load_book      = NULL;
  
  	if (status != E_BOOK_ERROR_OK || new_book == NULL) {
@@ -456,7 +605,7 @@
  
  		if (new_book)
  			g_object_unref (new_book);
-@@ -2555,8 +2558,12 @@
+@@ -2555,8 +2558,12 @@ cancel_load (EContactEditor *editor)
  }
  
  static void
@@ -470,7 +619,7 @@
  	cancel_load (editor);
  
  	if (e_source_equal (e_book_get_source (editor->target_book), source))
-@@ -3330,8 +3337,8 @@
+@@ -3329,8 +3336,8 @@ e_contact_editor_init (EContactEditor *e
  	g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor);
  	widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories");
  	g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor);
@@ -481,7 +630,7 @@
  	label = glade_xml_get_widget (e_contact_editor->gui, "where-label");
  	gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
  	widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok");
-@@ -3782,25 +3789,25 @@
+@@ -3781,25 +3788,25 @@ e_contact_editor_create_web(gchar *name,
  }
  
  GtkWidget *
@@ -489,16 +638,16 @@
 -					    gchar *string1, gchar *string2,
 -					    gint int1, gint int2);
 +e_contact_editor_create_source_combo_box (gchar *name,
-+                                          gchar *string1, gchar *string2,
-+                                          gint int1, gint int2);
++					  gchar *string1, gchar *string2,
++					  gint int1, gint int2);
  
  GtkWidget *
 -e_contact_editor_create_source_option_menu (gchar *name,
 -					    gchar *string1, gchar *string2,
 -					    gint int1, gint int2)
 +e_contact_editor_create_source_combo_box (gchar *name,
-+                                          gchar *string1, gchar *string2,
-+                                          gint int1, gint int2)
++					  gchar *string1, gchar *string2,
++					  gint int1, gint int2)
  {
 -	GtkWidget   *menu;
 +	GtkWidget   *combo_box;
@@ -517,8 +666,9 @@
 +	gtk_widget_show (combo_box);
 +	return combo_box;
  }
---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box	2007-01-03 10:32:45.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c
+--- evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box	2007-04-09 09:07:40.000000000 -0400
++++ evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c	2007-08-30 09:59:24.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <libgnomeui/gnome-app.h>
  #include <libebook/e-book.h>
@@ -528,7 +678,7 @@
  #include <addressbook/gui/component/addressbook.h>
  #include <addressbook/util/eab-book-util.h>
  #include "e-contact-editor.h"
-@@ -267,8 +267,12 @@
+@@ -267,8 +267,12 @@ clicked_cb (GtkWidget *w, gint button, g
  }
  
  static void
@@ -542,7 +692,7 @@
  	if (qa->book) {
  		g_object_unref (qa->book);
  		qa->book = NULL;
-@@ -317,16 +321,20 @@
+@@ -317,16 +321,20 @@ build_quick_add_dialog (QuickAdd *qa)
  
  	gconf_client = gconf_client_get_default ();
  	source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
@@ -567,8 +717,9 @@
  	
  	g_object_unref (source_list);	
  
---- evolution-2.10.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/memo-page.glade	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/calendar/gui/dialogs/memo-page.glade.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/memo-page.glade
+--- evolution-2.10.3/calendar/gui/dialogs/memo-page.glade.e-source-combo-box	2007-04-09 09:10:28.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/memo-page.glade	2007-08-30 09:59:24.000000000 -0400
 @@ -141,7 +141,7 @@
  		  <child>
  		    <widget class="Custom" id="source">
@@ -578,9 +729,10 @@
  		      <property name="int1">0</property>
  		      <property name="int2">0</property>
  		      <property name="last_modification_time">Tue, 13 Jan 2004 22:00:00 GMT</property>
---- evolution-2.10.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/event-page.glade	2007-03-13 16:56:41.000000000 -0400
-@@ -774,7 +774,7 @@
+diff -up evolution-2.10.3/calendar/gui/dialogs/event-page.glade.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/event-page.glade
+--- evolution-2.10.3/calendar/gui/dialogs/event-page.glade.e-source-combo-box	2007-05-27 13:58:15.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/event-page.glade	2007-08-30 09:59:24.000000000 -0400
+@@ -775,7 +775,7 @@
  		      <child>
  			<widget class="Custom" id="source">
  			  <property name="visible">True</property>
@@ -589,8 +741,9 @@
  			  <property name="int1">0</property>
  			  <property name="int2">0</property>
  			  <property name="last_modification_time">Wed, 17 Dec 2003 18:20:26 GMT</property>
---- evolution-2.10.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/task-page.glade	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/calendar/gui/dialogs/task-page.glade.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/task-page.glade
+--- evolution-2.10.3/calendar/gui/dialogs/task-page.glade.e-source-combo-box	2007-04-09 09:10:28.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/task-page.glade	2007-08-30 09:59:24.000000000 -0400
 @@ -618,7 +618,7 @@
  			<widget class="Custom" id="source">
  			  <property name="height_request">24</property>
@@ -600,8 +753,9 @@
  			  <property name="int1">0</property>
  			  <property name="int2">0</property>
  			  <property name="last_modification_time">Thu, 18 Dec 2003 01:58:48 GMT</property>
---- evolution-2.10.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/memo-page.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/calendar/gui/dialogs/memo-page.c.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/memo-page.c
+--- evolution-2.10.3/calendar/gui/dialogs/memo-page.c.e-source-combo-box	2007-04-09 09:10:28.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/memo-page.c	2007-08-30 09:59:24.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <gtk/gtkmessagedialog.h>
  #include <libgnome/gnome-i18n.h>
@@ -611,7 +765,7 @@
  #include <libedataserverui/e-name-selector.h>
  #include <libedataserverui/e-name-selector-entry.h>
  #include <libedataserverui/e-name-selector-list.h>
-@@ -339,7 +339,6 @@
+@@ -339,7 +339,6 @@ memo_page_fill_widgets (CompEditorPage *
  	ECalComponentDateTime d;
  	GSList *l;
  	const char *categories;
@@ -619,7 +773,7 @@
  
  	mpage = MEMO_PAGE (page);
  	priv = mpage->priv;
-@@ -432,8 +431,9 @@
+@@ -432,8 +431,9 @@ memo_page_fill_widgets (CompEditorPage *
  	}
  
  	/* Source */
@@ -631,7 +785,7 @@
  
  	priv->updating = FALSE;
  
-@@ -844,13 +844,12 @@
+@@ -844,13 +844,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -649,7 +803,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -862,8 +861,9 @@
+@@ -862,8 +861,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -661,7 +815,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -973,7 +973,7 @@
+@@ -973,7 +973,7 @@ init_widgets (MemoPage *mpage)
  			    G_CALLBACK (categories_clicked_cb), mpage);
  
  	/* Source selector */
@@ -670,7 +824,7 @@
  			 G_CALLBACK (source_changed_cb), mpage);
  	
  	/* Connect the default signal handler to use to make sure the "changed"
-@@ -1167,21 +1167,22 @@
+@@ -1167,21 +1167,22 @@ memo_page_create_date_edit (void)
  	return dedit;
  }
  
@@ -700,8 +854,9 @@
 +	gtk_widget_show (combo_box);
 +	return combo_box;
  }
---- evolution-2.10.0/calendar/gui/dialogs/event-page.c.e-source-combo-box	2007-03-12 23:45:00.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/dialogs/event-page.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/calendar/gui/dialogs/event-page.c.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/event-page.c
+--- evolution-2.10.3/calendar/gui/dialogs/event-page.c.e-source-combo-box	2007-08-30 09:59:22.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/event-page.c	2007-08-30 09:59:24.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gdk/gdkkeysyms.h>
  #include <libgnome/gnome-i18n.h>
@@ -711,7 +866,7 @@
  #include "common/authentication.h"
  #include "e-util/e-categories-config.h"
  #include "e-util/e-dialog-widgets.h"
-@@ -967,7 +967,6 @@
+@@ -967,7 +967,6 @@ event_page_fill_widgets (CompEditorPage 
  	ECalComponentDateTime start_date, end_date;
  	const char *location, *uid = NULL;
  	const char *categories;
@@ -719,7 +874,7 @@
  	GSList *l;
  	gboolean validated = TRUE;
  	
-@@ -1163,8 +1162,9 @@
+@@ -1163,8 +1162,9 @@ event_page_fill_widgets (CompEditorPage 
  	e_dialog_editable_set (priv->categories, categories);
  	
  	/* Source */
@@ -731,7 +886,7 @@
  
  	e_cal_component_get_uid (comp, &uid);
  	if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) 
-@@ -2566,7 +2566,8 @@
+@@ -2566,7 +2566,8 @@ event_page_sendoptions_clicked_cb (Event
  
  	if (!priv->sod) {
  		priv->sod = e_sendoptions_dialog_new ();
@@ -741,7 +896,7 @@
  		e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
  		priv->sod->data->initialized = TRUE;
  	}	
-@@ -2595,13 +2596,12 @@
+@@ -2595,13 +2596,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -759,7 +914,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -2620,8 +2620,9 @@
+@@ -2620,8 +2620,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -771,7 +926,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -2847,7 +2848,7 @@
+@@ -2847,7 +2848,7 @@ init_widgets (EventPage *epage)
  			    G_CALLBACK (categories_clicked_cb), epage);
  	
  	/* Source selector */
@@ -780,7 +935,7 @@
  			    G_CALLBACK (source_changed_cb), epage);
  	/* Alarms */
  	priv->alarm_list_store = e_alarm_list_new ();
-@@ -3148,23 +3149,24 @@
+@@ -3148,23 +3149,24 @@ make_timezone_entry (void)
  	return w;
  }
  
@@ -812,8 +967,9 @@
  }
  
  GtkWidget *make_status_icons (void);
---- evolution-2.10.0/calendar/gui/dialogs/task-page.c.e-source-combo-box	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/task-page.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/calendar/gui/dialogs/task-page.c.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/task-page.c
+--- evolution-2.10.3/calendar/gui/dialogs/task-page.c.e-source-combo-box	2007-04-09 09:10:28.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/task-page.c	2007-08-30 09:59:24.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <gtk/gtkmessagedialog.h>
  #include <libgnome/gnome-i18n.h>
@@ -823,7 +979,7 @@
  #include <misc/e-dateedit.h>
  #include <e-util/e-dialog-utils.h>
  #include "common/authentication.h"
-@@ -513,7 +513,6 @@
+@@ -513,7 +513,6 @@ task_page_fill_widgets (CompEditorPage *
  	icalcomponent *icalcomp;
  	const char *categories, *uid;
  	icaltimezone *zone, *default_zone;
@@ -831,7 +987,7 @@
  
  	tpage = TASK_PAGE (page);
  	priv = tpage->priv;
-@@ -657,8 +656,9 @@
+@@ -657,8 +656,9 @@ task_page_fill_widgets (CompEditorPage *
  	e_dialog_editable_set (priv->categories, categories);
  
  	/* Source */
@@ -843,7 +999,7 @@
  
  	if (priv->is_assignment) {
  		ECalComponentOrganizer organizer;	
-@@ -1617,13 +1617,12 @@
+@@ -1617,13 +1617,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -861,7 +1017,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -1642,8 +1641,9 @@
+@@ -1642,8 +1641,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -873,7 +1029,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -1655,7 +1655,7 @@
+@@ -1655,7 +1655,7 @@ source_changed_cb (GtkWidget *widget, ES
  			comp_editor_notify_client_changed (
  				COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
  				client);
@@ -882,7 +1038,7 @@
  			if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment)
  				task_page_show_options (tpage);
  			else
-@@ -1679,7 +1679,8 @@
+@@ -1679,7 +1679,8 @@ task_page_sendoptions_clicked_cb (TaskPa
  	if (!priv->sod) {
  		priv->sod = e_sendoptions_dialog_new ();
  		priv->sod->data->initialized = TRUE;
@@ -892,7 +1048,7 @@
  		e_sendoptions_utils_set_default_data (priv->sod, source, "task");
  	}
  	
-@@ -1734,7 +1735,7 @@
+@@ -1734,7 +1735,7 @@ init_widgets (TaskPage *tpage)
  			    G_CALLBACK (categories_clicked_cb), tpage);
  	
  	/* Source selector */
@@ -901,7 +1057,7 @@
  			 G_CALLBACK (source_changed_cb), tpage);
  
  	/* Connect the default signal handler to use to make sure the "changed"
-@@ -1955,21 +1956,22 @@
+@@ -1955,21 +1956,23 @@ task_page_create_date_edit (void)
  	return dedit;
  }
  
@@ -925,14 +1081,16 @@
 -	menu = e_source_option_menu_new (source_list);
 +	combo_box = e_source_combo_box_new (source_list);
  	g_object_unref (source_list);
++	g_object_unref (gconf_client);
  
 -	gtk_widget_show (menu);
 -	return menu;
 +	gtk_widget_show (combo_box);
 +	return combo_box;
  }
---- evolution-2.10.0/calendar/gui/e-itip-control.c.e-source-combo-box	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-itip-control.c	2007-03-13 16:56:41.000000000 -0400
+diff -up evolution-2.10.3/calendar/gui/e-itip-control.c.e-source-combo-box evolution-2.10.3/calendar/gui/e-itip-control.c
+--- evolution-2.10.3/calendar/gui/e-itip-control.c.e-source-combo-box	2007-04-09 09:10:33.000000000 -0400
++++ evolution-2.10.3/calendar/gui/e-itip-control.c	2007-08-30 09:59:24.000000000 -0400
 @@ -44,7 +44,7 @@
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <gtkhtml/gtkhtml-stream.h>
@@ -942,7 +1100,7 @@
  #include <libical/ical.h>
  #include <libecal/e-cal-component.h>
  #include <libecal/e-cal-time-util.h>
-@@ -226,13 +226,13 @@
+@@ -226,13 +226,13 @@ typedef struct {
  } EItipControlFindData;
  
  static void
@@ -961,7 +1119,7 @@
  	if (priv->ok)
  		gtk_widget_set_sensitive (priv->ok, FALSE);
  
-@@ -273,7 +273,7 @@
+@@ -273,7 +273,7 @@ find_cal_opened_cb (ECal *ecal, ECalenda
   cleanup:
  	if (fd->count == 0) {
  		if (fd->show_selector && !priv->current_ecal && priv->vbox) {
@@ -970,7 +1128,7 @@
  			char *uid;
  
  			switch (priv->type) {
-@@ -297,17 +297,17 @@
+@@ -297,17 +297,17 @@ find_cal_opened_cb (ECal *ecal, ECalenda
  			if (!source)
  				source = e_source_list_peek_source_any (priv->source_lists[priv->type]);
  

evolution-2.10.1-e-attachment-bar.patch

@@ -1,11 +0,0 @@
---- evolution-2.10.1/widgets/misc/e-attachment-bar.c.e-attachment-bar	2007-05-01 11:22:41.000000000 -0400
-+++ evolution-2.10.1/widgets/misc/e-attachment-bar.c	2007-05-01 15:10:49.000000000 -0400
-@@ -491,6 +491,8 @@
- 	g_ptr_array_free (temp_arr, TRUE);
- 	
- 	update (bar);
-+
-+	g_signal_emit (bar, signals[CHANGED], 0);
- 	
- 	id++;
- 	

evolution-2.10.1-fix-help.patch

@@ -1,192 +0,0 @@
---- evolution-2.10.1/widgets/misc/e-multi-config-dialog.c.fix-help	2007-04-09 09:10:24.000000000 -0400
-+++ evolution-2.10.1/widgets/misc/e-multi-config-dialog.c	2007-04-13 22:26:25.000000000 -0400
-@@ -192,13 +192,12 @@
- 
- 	switch (response_id) {
- 	case GTK_RESPONSE_HELP:
--		gnome_help_display_desktop (NULL,
--					    "evolution-" BASE_VERSION,
--					    "evolution-" BASE_VERSION ".xml", 
--					    "config-prefs",
--					    &error);
--		if (error != NULL)
-+		gnome_help_display (
-+			"evolution.xml", "config-prefs", &error);
-+		if (error != NULL) {
- 			g_warning ("%s", error->message);
-+			g_error_free (error);
-+		}
- 		break;
- 	case GTK_RESPONSE_CLOSE:
- 	default:
---- evolution-2.10.1/widgets/misc/e-send-options.c.fix-help	2007-04-13 22:25:21.000000000 -0400
-+++ evolution-2.10.1/widgets/misc/e-send-options.c	2007-04-13 22:26:25.000000000 -0400
-@@ -588,34 +588,32 @@
- 
- static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
- {
-+	ESendOptionsDialogPrivate *priv;
-+	ESendOptionsDialog *sod;
-+	GError *error = NULL;     
- 
--    ESendOptionsDialogPrivate *priv;
--    ESendOptionsDialog *sod;
--    GError *error = NULL;     
--
--    sod = func_data;
--    priv = sod->priv;
--	
--    switch (state) {
--	case GTK_RESPONSE_OK:
--	    e_send_options_get_widgets_data (sod);
--	case GTK_RESPONSE_CANCEL:
--	    gtk_widget_hide (priv->main);
--	    gtk_widget_destroy (priv->main);
--	    g_object_unref (priv->xml);
--	    break;
--	case GTK_RESPONSE_HELP:
--	gnome_help_display_desktop (NULL,
--				    "evolution-" BASE_VERSION,
--				    "evolution-" BASE_VERSION ".xml",
--				    priv->help_section,
--				    &error);
--	    if (error != NULL)
--		g_warning ("%s", error->message);
--	    break;
--    }
--    g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
-+	sod = func_data;
-+	priv = sod->priv;
-+
-+	switch (state) {
-+		case GTK_RESPONSE_OK:
-+			e_send_options_get_widgets_data (sod);
-+		case GTK_RESPONSE_CANCEL:
-+			gtk_widget_hide (priv->main);
-+			gtk_widget_destroy (priv->main);
-+			g_object_unref (priv->xml);
-+			break;
-+		case GTK_RESPONSE_HELP:
-+			gnome_help_display (
-+				"evolution.xml", priv->help_section, &error);
-+			if (error != NULL) {
-+				g_warning ("%s", error->message);
-+				g_error_free (error);
-+			}
-+    			break;
-+	}
- 
-+	g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
- }
- 
- gboolean 
---- evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c.fix-help	2007-04-13 22:25:21.000000000 -0400
-+++ evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c	2007-04-13 22:26:25.000000000 -0400
-@@ -191,21 +191,20 @@
- 	
- 	switch (state) {
- 		case GTK_RESPONSE_OK:
--		     exchange_send_options_get_widgets_data (sod);	
-+			exchange_send_options_get_widgets_data (sod);	
- 		case GTK_RESPONSE_CANCEL:
--		     gtk_widget_hide (priv->main);
--	    	     gtk_widget_destroy (priv->main);
--	             g_object_unref (priv->xml);
--	             break;	     
-+			gtk_widget_hide (priv->main);
-+			gtk_widget_destroy (priv->main);
-+			g_object_unref (priv->xml);
-+			break;	     
- 		case GTK_RESPONSE_HELP:
--		     gnome_help_display_desktop (NULL,
--				    "evolution-" BASE_VERSION,
--				    "evolution-" BASE_VERSION ".xml",
--				    priv->help_section,
--				    &error); 	
--		     if (error != NULL)
--			g_warning ("%s", error->message);
--	    	     break;
-+			gnome_help_display (
-+				"evolution.xml", priv->help_section, &error);
-+			if (error != NULL) {
-+				g_warning ("%s", error->message);
-+				g_error_free (error);
-+			}
-+			break;
- 	}
- 	g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
- 
---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c.fix-help	2007-04-13 22:25:21.000000000 -0400
-+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c	2007-04-13 22:26:02.000000000 -0400
-@@ -3235,13 +3235,12 @@
- {
- 	GError *error = NULL;
- 
--	gnome_help_display_desktop (NULL,
--				    "evolution-" BASE_VERSION,
--				    "evolution-" BASE_VERSION ".xml",
--				    "usage-contact-cards",
--				    &error);
--	if (error != NULL)
-+	gnome_help_display (
-+		"evolution.xml", "usage-contact-cards", &error);
-+	if (error != NULL) {
- 		g_warning ("%s", error->message);
-+		g_error_free (error);
-+	}
- }
- 
- static GList *
---- evolution-2.10.1/composer/e-msg-composer.c.fix-help	2007-04-13 22:25:21.000000000 -0400
-+++ evolution-2.10.1/composer/e-msg-composer.c	2007-04-13 22:26:25.000000000 -0400
-@@ -2886,13 +2886,12 @@
- 	GError *error = NULL;
- 	EMsgComposerPrivate *p = composer->priv;
- 
--	gnome_help_display_desktop (NULL,
--				    "evolution-" BASE_VERSION,
--				    "evolution-" BASE_VERSION ".xml",
--				    "usage-composer",
--				    &error);
--	if (error != NULL)
-+	gnome_help_display (
-+		"evolution.xml", "usage-composer", &error);
-+	if (error != NULL) {
- 		g_warning ("%s", error->message);
-+		g_error_free (error);
-+	}
- }
- 
- 
---- evolution-2.10.1/shell/e-shell-window.c.fix-help	2007-04-13 22:25:21.000000000 -0400
-+++ evolution-2.10.1/shell/e-shell-window.c	2007-04-13 22:26:02.000000000 -0400
-@@ -1042,7 +1042,7 @@
- 	bonobo_ui_util_set_ui (priv->ui_component,
- 			       PREFIX,
- 			       xmlfile,
--			       "evolution-" BASE_VERSION, NULL);
-+			       "evolution", NULL);
- 	g_free (xmlfile);
- 
- 	e_shell_window_commands_setup (window);
---- evolution-2.10.1/calendar/gui/dialogs/comp-editor.c.fix-help	2007-04-13 22:25:21.000000000 -0400
-+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor.c	2007-04-13 22:26:25.000000000 -0400
-@@ -1693,13 +1693,12 @@
- 
- 	priv = editor->priv;
- 
--	gnome_help_display_desktop (NULL,
--				    "evolution-" BASE_VERSION,
--				    "evolution-" BASE_VERSION ".xml",
--				    priv->help_section,
--				    &error);
--	if (error != NULL)
-+	gnome_help_display (
-+		"evolution.xml", priv->help_section, &error);
-+	if (error != NULL) {
- 		g_warning ("%s", error->message);
-+		g_error_free (error);
-+	}
- }
- 
- 

evolution-2.10.1-saving-attachments.patch

@@ -1,5 +1,5 @@
---- evolution-2.10.1/mail/em-utils.c.saving-attachments	2007-04-14 14:25:40.000000000 -0400
-+++ evolution-2.10.1/mail/em-utils.c	2007-04-14 15:08:50.000000000 -0400
+--- evolution-2.10.2/mail/em-utils.c.saving-attachments	2007-05-29 00:07:55.000000000 -0400
++++ evolution-2.10.2/mail/em-utils.c	2007-05-29 01:26:46.000000000 -0400
 @@ -354,28 +354,23 @@
  
  /* Saving messages... */
@@ -13,13 +13,13 @@
 -	
 -	if (response == GTK_RESPONSE_OK) {
 -		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel));
-+	const gchar *filename;
- 
+-
 -		if (!e_file_can_save((GtkWindow *)filesel, uri)) {
 -			g_free(uri);
 -			return;
 -		}
--
++	const gchar *filename;
+ 
 -		e_file_update_save_path(gtk_file_chooser_get_current_folder_uri(
 -					GTK_FILE_CHOOSER(filesel)), TRUE);
 -		/* FIXME: popup error if it fails? */
@@ -42,7 +42,7 @@
  }
  
  /**
-@@ -387,83 +382,78 @@
+@@ -387,85 +382,79 @@
   * Saves a mime part to disk (prompting the user for filename).
   **/
  void
@@ -54,6 +54,8 @@
 +	GtkWidget *file_chooser;
 +	const gchar *filename;
 +	gchar *uri = NULL;
++  
++	filename = emu_save_get_filename_for_part (part);
  
 -	name = camel_mime_part_get_filename(part);
 -	if (name == NULL) {
@@ -64,46 +66,25 @@
 -		} else {
 -			name = _("attachment");
 -		}
-+	filename = emu_save_get_filename_for_part (part);
-+
+-	}
 +	file_chooser = e_file_get_save_filesel (
 +		parent, prompt, filename, GTK_FILE_CHOOSER_ACTION_SAVE);
-+
-+	if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK)
-+		goto exit;
-+
-+	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser));
-+
-+	/* XXX Would be nice to mention _why_ we can't save. */
-+	if (!e_file_can_save (GTK_WINDOW (file_chooser), uri)) {
-+		g_warning ("Unable to save %s", uri);
-+		goto exit;
- 	}
  
 -	filesel = e_file_get_save_filesel(parent, prompt, name, GTK_FILE_CHOOSER_ACTION_SAVE);
 -	camel_object_ref(part);
 -	g_signal_connect (filesel, "response", G_CALLBACK (emu_save_part_response), part);
 -	gtk_widget_show (filesel);
-+	e_file_update_save_path (
-+		gtk_file_chooser_get_current_folder_uri (
-+		GTK_FILE_CHOOSER (file_chooser)), TRUE);
-+
-+	mail_save_part (part, uri, NULL, NULL, FALSE);
-+
-+exit:
-+	gtk_widget_destroy (file_chooser);
-+	g_free (uri);
- }
+-}
++	if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK)
++		goto exit;
  
 -static void
 -emu_save_parts_response (GtkWidget *filesel, int response, GSList *parts)
-+void
-+em_utils_save_parts (GtkWidget *parent, const gchar *prompt, GSList *parts)
- {
+-{
 -        GSList *selected;
 -		char *uri = NULL;
 -        if (response == GTK_RESPONSE_OK) {
--		uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (filesel));
+-		uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER (filesel));
 -                e_file_update_save_path(uri, FALSE);
 -
 -                for ( selected = parts; selected != NULL; selected = selected->next) {
@@ -132,11 +113,48 @@
 -				mail_save_part(part, file_path, NULL, NULL, FALSE);
 -			else
 -				g_warning ("Could not save %s. File already exists", file_path);
-+        GtkWidget *file_chooser;
++	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser));
++
++	/* XXX Would be nice to mention _why_ we can't save. */
++	if (!e_file_can_save (GTK_WINDOW (file_chooser), uri)) {
++		g_warning ("Unable to save %s", uri);
++		goto exit;
++	}
++  
++	e_file_update_save_path (
++		gtk_file_chooser_get_current_folder_uri (
++		GTK_FILE_CHOOSER (file_chooser)), TRUE);
+ 
+-			g_free (file_path);
+-			g_free (safe_name);
+-                }
++	mail_save_part (part, uri, NULL, NULL, FALSE);
+ 
+-		g_free (uri);
+-        }
+-	
+-	g_slist_free (parts);
+-	gtk_widget_destroy((GtkWidget *)filesel);
++exit:
++	gtk_widget_destroy (file_chooser);
++	g_free (uri);
+ }
+-
++  
+ void
+-em_utils_save_parts (GtkWidget *parent, const char *prompt, GSList * parts)
++em_utils_save_parts (GtkWidget *parent, const gchar *prompt, GSList *parts)
+ {
+-        GtkWidget *filesel;
++	GtkWidget *file_chooser;
 +	gchar *path_uri;
 +	GSList *iter;
-+
-+        file_chooser = e_file_get_save_filesel (
+ 
+-        filesel = e_file_get_save_filesel (parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+-        g_signal_connect (filesel, "response", G_CALLBACK (emu_save_parts_response), parts);
+-        gtk_widget_show (filesel);
+-}
++	file_chooser = e_file_get_save_filesel (
 +		parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
 +
 +	if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK)
@@ -145,17 +163,14 @@
 +	path_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser));
 +
 +	e_file_update_save_path (path_uri, FALSE);
- 
--			g_free (file_path);
--			g_free (safe_name);
--                }
++  
 +	for (iter = parts; iter != NULL; iter = iter->next) {
 +		CamelMimePart *part = iter->data;
 +		const gchar *filename;
 +		gchar *uri;
 +
 +		filename = emu_save_get_filename_for_part (part);
-+
+ 
 +		uri = g_build_path ("/", path_uri, filename, NULL);
 +
 +		/* XXX Would be nice to mention _why_ we can't save. */
@@ -163,31 +178,20 @@
 +			mail_save_part (part, uri, NULL, NULL, FALSE);
 +		else
 +			g_warning ("Unable to save %s", uri);
- 
- 		g_free (uri);
--        }
--	
--	g_slist_free (parts);
--	gtk_widget_destroy((GtkWidget *)filesel);
--}
++  
++		g_free (uri);
 +	}
- 
--void
--em_utils_save_parts (GtkWidget *parent, const char *prompt, GSList * parts)
--{
--        GtkWidget *filesel;
++  
 +	g_free (path_uri);
- 
--        filesel = e_file_get_save_filesel (parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
--        g_signal_connect (filesel, "response", G_CALLBACK (emu_save_parts_response), parts);
--        gtk_widget_show (filesel);
++  
 +exit:
 +	gtk_widget_destroy (file_chooser);
- }
++}
  
- 
---- evolution-2.10.1/mail/em-format-html-display.c.saving-attachments	2007-04-14 14:25:40.000000000 -0400
-+++ evolution-2.10.1/mail/em-format-html-display.c	2007-04-14 15:08:50.000000000 -0400
+ /**
+  * em_utils_save_part_to_file:
+--- evolution-2.10.2/mail/em-format-html-display.c.saving-attachments	2007-05-29 00:07:55.000000000 -0400
++++ evolution-2.10.2/mail/em-format-html-display.c	2007-05-29 00:07:55.000000000 -0400
 @@ -2099,12 +2099,24 @@
  }
  

evolution-2.10.3-CVE-2008-0072.patch

@@ -0,0 +1,48 @@
+diff -up evolution-2.10.3/mail/em-format.c.CVE-2008-0072 evolution-2.10.3/mail/em-format.c
+--- evolution-2.10.3/mail/em-format.c.CVE-2008-0072	2008-03-04 15:44:32.000000000 -0500
++++ evolution-2.10.3/mail/em-format.c	2008-03-04 15:45:23.000000000 -0500
+@@ -1155,7 +1155,7 @@ emf_application_xpkcs7mime(EMFormat *emf
+ 	opart = camel_mime_part_new();
+ 	valid = camel_cipher_decrypt(context, part, opart, ex);
+ 	if (valid == NULL) {
+-		em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
++		em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
+ 		em_format_part_as(emf, stream, part, NULL);
+ 	} else {
+ 		if (emfc == NULL)
+@@ -1305,7 +1305,7 @@ emf_multipart_encrypted(EMFormat *emf, C
+ 	if (valid == NULL) {
+ 		em_format_format_error(emf, stream, ex->desc?("Could not parse S/MIME message"):_("Could not parse S/MIME message: Unknown error"));
+ 		if (ex->desc)
+-			em_format_format_error(emf, stream, ex->desc);
++			em_format_format_error(emf, stream, "%s", ex->desc);
+ 		em_format_part_as(emf, stream, part, "multipart/mixed");
+ 	} else {
+ 		if (emfc == NULL)
+@@ -1470,7 +1470,7 @@ emf_multipart_signed(EMFormat *emf, Came
+ 		if (valid == NULL) {
+ 			em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
+ 			if (ex->desc)
+-				em_format_format_error(emf, stream, ex->desc);
++				em_format_format_error(emf, stream, "%s", ex->desc);
+ 			em_format_part_as(emf, stream, part, "multipart/mixed");
+ 		} else {
+ 			if (emfc == NULL)
+@@ -1536,7 +1536,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came
+ 	if (!valid) {
+ 		em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
+ 		if (ex->desc)
+-			em_format_format_error(emf, stream, ex->desc);
++			em_format_format_error(emf, stream, "%s", ex->desc);
+ 		em_format_format_source(emf, stream, ipart);
+ 		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
+ 		camel_exception_free(ex);
+@@ -1607,7 +1607,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C
+ 	if (!valid) {
+ 		em_format_format_error(emf, stream, ex->desc?("Could not parse S/MIME message"):_("Could not parse S/MIME message: Unknown error"));
+ 		if (ex->desc)
+-			em_format_format_error(emf, stream, ex->desc);
++			em_format_format_error(emf, stream, "%s", ex->desc);
+ 		em_format_format_source(emf, stream, ipart);
+ 		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
+ 		camel_exception_free(ex);

evolution-2.10.3-CVE-2008-1108.patch

@@ -0,0 +1,310 @@
+diff -up evolution-2.10.3/calendar/gui/e-itip-control.c.CVE-2008-1108 evolution-2.10.3/calendar/gui/e-itip-control.c
+--- evolution-2.10.3/calendar/gui/e-itip-control.c.CVE-2008-1108	2008-06-04 05:55:50.000000000 -0400
++++ evolution-2.10.3/calendar/gui/e-itip-control.c	2008-06-04 06:00:35.000000000 -0400
+@@ -650,7 +650,7 @@ find_attendee (icalcomponent *ical_comp,
+ 
+ static void
+ write_label_piece (EItipControl *itip, ECalComponentDateTime *dt,
+-		   char *buffer, int size,
++                   GString *buffer,
+ 		   const char *stext, const char *etext,
+ 		   gboolean just_date)
+ {
+@@ -675,13 +675,13 @@ write_label_piece (EItipControl *itip, E
+ 		tmp_tm.tm_hour = tmp_tm.tm_min = tmp_tm.tm_sec = 0;
+ 
+ 	if (stext != NULL)
+-		strcat (buffer, stext);
++		g_string_append (buffer, stext);
+ 
+ 	e_time_format_date_and_time (&tmp_tm,
+ 				     calendar_config_get_24_hour_format (),
+ 				     FALSE, FALSE,
+ 				     time_buf, sizeof (time_buf));
+-	strcat (buffer, time_buf);
++	g_string_append (buffer, time_buf);
+ 
+ 	if (!dt->value->is_utc && dt->tzid) {
+ 		zone = icalcomponent_get_timezone (priv->top_level, dt->tzid);
+@@ -693,21 +693,21 @@ write_label_piece (EItipControl *itip, E
+ 		   UTF-8. But it probably is not translated. */
+ 		display_name = icaltimezone_get_display_name (zone);
+ 		if (display_name && *display_name) {
+-			strcat (buffer, " <font size=-1>[");
++			g_string_append_len (buffer, " <font size=-1>[", 16);
+ 
+ 			/* We check if it is one of our builtin timezone names,
+ 			   in which case we call gettext to translate it. */
+ 			if (icaltimezone_get_builtin_timezone (display_name)) {
+-				strcat (buffer, _(display_name));
++				g_string_append_printf (buffer, "%s", _(display_name));
+ 			} else {
+-				strcat (buffer, display_name);
++				g_string_append_printf (buffer, "%s", display_name);
+ 			}
+-			strcat (buffer, "]</font>");
++			g_string_append_len (buffer, "]</font>", 8);
+ 		}
+ 	}
+ 
+ 	if (etext != NULL)
+-		strcat (buffer, etext);
++		g_string_append (buffer, etext);
+ }
+ 
+ static const char *
+@@ -744,19 +744,17 @@ get_dayname (struct icalrecurrencetype *
+ 
+ static void
+ write_recurrence_piece (EItipControl *itip, ECalComponent *comp,
+-			char *buffer, int size)
++                        GString *buffer)
+ {
+ 	GSList *rrules;
+ 	struct icalrecurrencetype *r;
+-	int len, i;
++	int i;
+ 
+-	strcpy (buffer, "<b>Recurring:</b> ");
+-	len = strlen (buffer);
+-	buffer += len;
+-	size -= len;
++	g_string_append_len (buffer, "<b>Recurring:</b> ", 18);
+ 
+ 	if (!e_cal_component_has_simple_recurrence (comp)) {
+-		strcpy (buffer, _("Yes. (Complex Recurrence)"));
++		g_string_append_printf (
++			buffer, "%s", _("Yes. (Complex Recurrence)"));
+ 		return;
+ 	}
+ 
+@@ -772,7 +770,10 @@ write_recurrence_piece (EItipControl *it
+                  Every %d day/days" */
+ 		/* For Translators : 'Every day' is event Recurring every day */
+ 		/* For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit */
+-		sprintf (buffer, ngettext("Every day", "Every %d days", r->interval), r->interval);
++		g_string_append_printf (
++			buffer, ngettext ("Every day",
++			"Every %d days", r->interval),
++			r->interval);
+ 		break;
+ 
+ 	case ICAL_WEEKLY_RECURRENCE:
+@@ -782,29 +783,36 @@ write_recurrence_piece (EItipControl *it
+                          Every %d week/weeks" */			
+ 			/* For Translators : 'Every week' is event Recurring every week */
+ 			/* For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit */
+-			sprintf (buffer, ngettext("Every week", "Every %d weeks", r->interval), r->interval);
++			g_string_append_printf (
++				buffer, ngettext ("Every week",
++				"Every %d weeks", r->interval),
++				r->interval);
+ 		} else {
+ 			/* For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname) */
+ 			/* For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit */
+-			sprintf (buffer, ngettext("Every week on ", "Every %d weeks on ", r->interval), r->interval);
++			g_string_append_printf (
++				buffer, ngettext ("Every week on ",
++				"Every %d weeks on ", r->interval),
++				r->interval);
+ 
+ 			for (i = 1; i < 8 && r->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
+ 				if (i > 1)
+-					strcat (buffer, ", ");
+-				strcat (buffer, get_dayname (r, i - 1));
++					g_string_append_len (buffer, ", ", 2);
++				g_string_append (buffer, get_dayname (r, i - 1));
+ 			}
+ 			if (i > 1)
+ 				/* For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)' */
+-				strcat (buffer, _(" and "));
+-			strcat (buffer, get_dayname (r, i - 1));
++				g_string_append_printf (buffer, "%s", _(" and "));
++			g_string_append (buffer, get_dayname (r, i - 1));
+ 		}
+ 		break;
+ 
+ 	case ICAL_MONTHLY_RECURRENCE:
+ 		if (r->by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
+ 			/* For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.' */
+-			sprintf (buffer, _("The %s day of "),
+-				 nth (r->by_month_day[0]));
++			g_string_append_printf (
++				buffer, _("The %s day of "),
++				nth (r->by_month_day[0]));
+ 		} else {
+ 			int pos;
+ 
+@@ -818,20 +826,21 @@ write_recurrence_piece (EItipControl *it
+ 
+ 			/* For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
+ 			   eg,third monday of every month */
+-			sprintf (buffer, _("The %s %s of "),
+-				 nth (pos), get_dayname (r, 0));
++			g_string_append_printf (
++				buffer, _("The %s %s of "),
++				nth (pos), get_dayname (r, 0));
+ 		}
+ 
+-		len = strlen (buffer);
+-		buffer += len;
+-		size -= len;
+               /* For Translators: In this can also be translated as "With the period of %d
+                  month/months", where %d is a number. The entire sentence is of the form "Recurring:
+                  Every %d month/months" */		
+ 		/* For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.' */
+ 		/* For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
+ 		 %d is a digit */
+-		sprintf (buffer, ngettext("every month","every %d months", r->interval), r->interval);
++		g_string_append_printf (
++			buffer, ngettext ("every month",
++			"every %d months", r->interval),
++			r->interval);
+ 		break;
+ 
+ 	case ICAL_YEARLY_RECURRENCE:
+@@ -840,20 +849,22 @@ write_recurrence_piece (EItipControl *it
+                  Every %d year/years" */		
+ 		/* For Translators : 'Every year' is event Recurring every year */
+ 		/* For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit */
+-		sprintf (buffer, ngettext("Every year", "Every %d years", r->interval), r->interval);
++		g_string_append_printf (
++			buffer, ngettext ("Every year",
++			"Every %d years", r->interval),
++			r->interval);
+ 		break;
+ 
+ 	default:
+ 		g_assert_not_reached ();
+ 	}
+ 
+-	len = strlen (buffer);
+-	buffer += len;
+-	size -= len;
+ 	if (r->count) {
+ 	      /* For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit*/
+ 	      /* For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit*/
+-		sprintf (buffer, ngettext("a total of %d time", " a total of %d times", r->count), r->count);
++		g_string_append_printf (
++			buffer, ngettext ("a total of %d time",
++			" a total of %d times", r->count), r->count);
+ 	} else if (!icaltime_is_null_time (r->until)) {
+ 		ECalComponentDateTime dt;
+ 
+@@ -861,12 +872,12 @@ write_recurrence_piece (EItipControl *it
+ 		dt.value = &r->until;
+ 		dt.tzid = icaltimezone_get_tzid ((icaltimezone *)r->until.zone);
+ 
+-		write_label_piece (itip, &dt, buffer, size,
++		write_label_piece (itip, &dt, buffer, 
+ 				   /* For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'*/
+ 				   _(", ending on "), NULL, TRUE);
+ 	}
+ 
+-	strcat (buffer, "<br>");
++	g_string_append_len (buffer, "<br>", 4);
+ }
+ 
+ static void
+@@ -874,47 +885,51 @@ set_date_label (EItipControl *itip, GtkH
+ 		ECalComponent *comp)
+ {
+ 	ECalComponentDateTime datetime;
+-	static char buffer[1024];
++	GString *buffer;
+ 	gchar *str;
+ 	gboolean wrote = FALSE, task_completed = FALSE;
+ 	ECalComponentVType type;
+ 
++	buffer = g_string_sized_new (1024);
+ 	type = e_cal_component_get_vtype (comp);
+ 
+-	buffer[0] = '\0';
+ 	e_cal_component_get_dtstart (comp, &datetime);
+ 	if (datetime.value) {
+ 		/* For Translators : 'starts' is starts:date implying a task starts on what date */
+ 		str = g_strdup_printf ("<b>%s:</b>", _("Starts"));
+-		write_label_piece (itip, &datetime, buffer, 1024,
+-				  str,
+-				   "<br>", FALSE);
+-		gtk_html_write (html, html_stream, buffer, strlen(buffer));
++		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
++		gtk_html_write (html, html_stream, buffer->str, buffer->len);
+ 		wrote = TRUE;
+ 		g_free (str);
+ 	}
+ 	e_cal_component_free_datetime (&datetime);
+ 
+-	buffer[0] = '\0';
++	/* Reset the buffer. */
++	g_string_truncate (buffer, 0);
++
+ 	e_cal_component_get_dtend (comp, &datetime);
+ 	if (datetime.value){
+ 		/* For Translators : 'ends' is ends:date implying a task ends on what date */
+ 		str = g_strdup_printf ("<b>%s:</b>", _("Ends"));
+-		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
+-		gtk_html_write (html, html_stream, buffer, strlen (buffer));
++		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
++		gtk_html_write (html, html_stream, buffer->str, buffer->len);
+ 		wrote = TRUE;
+ 		g_free (str);
+ 	}
+ 	e_cal_component_free_datetime (&datetime);
+ 
+-	buffer[0] = '\0';
++	/* Reset the buffer. */
++	g_string_truncate (buffer, 0);
++
+ 	if (e_cal_component_has_recurrences (comp)) {
+-		write_recurrence_piece (itip, comp, buffer, 1024);
+-		gtk_html_write (html, html_stream, buffer, strlen (buffer));
++		write_recurrence_piece (itip, comp, buffer);
++		gtk_html_write (html, html_stream, buffer->str, buffer->len);
+ 		wrote = TRUE;
+ 	}
+ 
+-	buffer[0] = '\0';
++	/* Reset the buffer. */
++	g_string_truncate (buffer, 0);
++
+ 	datetime.tzid = NULL;
+ 	e_cal_component_get_completed (comp, &datetime.value);
+ 	if (type == E_CAL_COMPONENT_TODO && datetime.value) {
+@@ -922,20 +937,22 @@ set_date_label (EItipControl *itip, GtkH
+ 		   timezone. */
+ 		str = g_strdup_printf ("<b>%s:</b>", _("Completed"));
+ 		datetime.value->is_utc = TRUE;
+-		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
+-		gtk_html_write (html, html_stream, buffer, strlen (buffer));
++		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
++		gtk_html_write (html, html_stream, buffer->str, buffer->len);
+ 		wrote = TRUE;
+ 		task_completed = TRUE;
+ 		g_free (str);
+ 	}
+ 	e_cal_component_free_datetime (&datetime);
+ 
+-	buffer[0] = '\0';
++	/* Reset the buffer. */
++	g_string_truncate (buffer, 0);
++
+ 	e_cal_component_get_due (comp, &datetime);
+ 	if (type == E_CAL_COMPONENT_TODO && !task_completed && datetime.value) {
+ 		str = g_strdup_printf ("<b>%s:</b>", _("Due"));
+-		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
+-		gtk_html_write (html, html_stream, buffer, strlen (buffer));
++		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
++		gtk_html_write (html, html_stream, buffer->str, buffer->len);
+ 		wrote = TRUE;
+ 		g_free (str);
+ 	}
+@@ -944,6 +961,8 @@ set_date_label (EItipControl *itip, GtkH
+ 
+ 	if (wrote)
+ 		gtk_html_stream_printf (html_stream, "<br>");
++
++	g_string_free (buffer, TRUE);
+ }
+ 
+ static void

evolution-2.10.3-CVE-2008-1109.patch

@@ -0,0 +1,61 @@
+diff -up evolution-2.10.3/calendar/gui/itip-utils.c.CVE-2008-1109 evolution-2.10.3/calendar/gui/itip-utils.c
+--- evolution-2.10.3/calendar/gui/itip-utils.c.CVE-2008-1109	2008-06-04 05:55:50.000000000 -0400
++++ evolution-2.10.3/calendar/gui/itip-utils.c	2008-06-04 05:58:49.000000000 -0400
+@@ -158,50 +158,16 @@ get_attendee (GSList *attendees, char *a
+ 
+ 
+ static char *
+-html_new_lines_for (char *string)
++html_new_lines_for (const char *string)
+ {
+-	char *html_string = (char *) malloc (sizeof (char)* (3500));
+-	int length = strlen (string);
+-	int index = 0;
+-	char *index_ptr = string;
+-	char *temp = string;
++	gchar **lines;
++	gchar *joined;
+ 
+-	/*Find the first occurence*/
+-	index_ptr = strstr ((const char *)temp, "\n");
++	lines = g_strsplit_set (string, "\n", -1);
++	joined = g_strjoinv ("<br>", lines);
++	g_strfreev (lines);
+ 
+-	/*Doesn't occur*/
+-	if (index_ptr == NULL) {
+-		strcpy (html_string, (const char *)string);
+-		html_string[length] = '\0';
+-		return html_string;
+-	}
+-
+-	/*Split into chunks inserting <br> for \n */
+-	do{
+-		while (temp != index_ptr){
+-			html_string[index++] = *temp;
+-			temp++;
+-		}
+-		temp++; 
+-		
+-		html_string[index++] = '<';
+-		html_string[index++] = 'b';
+-		html_string[index++] = 'r';
+-		html_string[index++] = '>';
+-
+-		index_ptr = strstr ((const char *)temp, "\n");
+-
+-	} while (index_ptr);
+-
+-	/*Don't leave out the last chunk*/
+-	while (*temp != '\0'){
+-		html_string[index++] = *temp;
+-		temp++;
+-	}
+-		
+-	html_string[index] = '\0';
+-		
+-	return html_string;
++	return joined;
+ }
+ 
+ char *

evolution-2.10.3-fix-ETreeTableAdapter-crash.patch

@@ -0,0 +1,50 @@
+--- trunk/widgets/table/e-tree-table-adapter.c	2007/08/07 09:35:42	33964
++++ trunk/widgets/table/e-tree-table-adapter.c	2007/08/24 09:10:55	34090
+@@ -80,6 +80,8 @@
+ 	int          node_removed_id;
+ 	int          node_request_collapse_id;
+ 	int          sort_info_changed_id;
++
++	guint        resort_idle_id;
+ };
+ 
+ static void etta_sort_info_changed (ETableSortInfo *sort_info, ETreeTableAdapter *etta);
+@@ -498,6 +500,11 @@
+ {
+ 	ETreeTableAdapter *etta = E_TREE_TABLE_ADAPTER (object);
+ 
++	if (etta->priv->resort_idle_id) {
++		g_source_remove (etta->priv->resort_idle_id);
++		etta->priv->resort_idle_id = 0;
++	}
++
+ 	if (etta->priv->root) {
+ 		kill_gnode(etta->priv->root, etta);
+ 		etta->priv->root = NULL;
+@@ -728,6 +735,8 @@
+ 	etta->priv->node_inserted_id         = 0;
+ 	etta->priv->node_removed_id          = 0;
+ 	etta->priv->node_request_collapse_id = 0;
++
++	etta->priv->resort_idle_id           = 0;
+ }
+ 
+ static void
+@@ -746,6 +755,7 @@
+ resort_model (ETreeTableAdapter *etta)
+ {
+ 	etta_sort_info_changed (NULL, etta);
++	etta->priv->resort_idle_id = 0;
+ 	return FALSE;
+ }
+ 
+@@ -758,7 +768,8 @@
+ 	/* FIXME: Really it shouldnt be required. But a lot of thread
+ 	 * which were supposed to be present in the list is way below
+ 	 */
+-	g_idle_add (resort_model, etta);
++	if (!etta->priv->resort_idle_id)
++		etta->priv->resort_idle_id = g_idle_add ((GSourceFunc) resort_model, etta);
+ }
+ 
+ static void

evolution-2.10.3-server-message-double-free.patch

@@ -0,0 +1,15 @@
+diff -up evolution-2.10.3/mail/mail-session.c.server-message-double-free evolution-2.10.3/mail/mail-session.c
+--- evolution-2.10.3/mail/mail-session.c.server-message-double-free	2008-03-25 10:01:13.000000000 -0400
++++ evolution-2.10.3/mail/mail-session.c	2008-03-25 10:01:25.000000000 -0400
+@@ -389,10 +389,8 @@ alert_user(CamelSession *session, CamelS
+ 		mail_msg_unref (m);
+ 	}
+ 
+-	if (m->ismain) {
+-		user_message_free (m);
++	if (m->ismain)
+ 		mail_msg_unref (m);
+-	}
+ 
+ 	return result;
+ }

evolution-2.10.3-todo-conduit.patch

@@ -0,0 +1,12 @@
+diff -up evolution-2.10.3/calendar/conduits/todo/todo-conduit.c.todo-conduit evolution-2.10.3/calendar/conduits/todo/todo-conduit.c
+--- evolution-2.10.3/calendar/conduits/todo/todo-conduit.c.todo-conduit	2007-11-03 15:21:56.000000000 -0400
++++ evolution-2.10.3/calendar/conduits/todo/todo-conduit.c	2007-11-03 15:22:10.000000000 -0400
+@@ -992,7 +992,7 @@ comp_from_remote_record (GnomePilotCondu
+ 			e_cal_component_set_status (comp, ICAL_STATUS_NEEDSACTION);
+ 	}
+ 
+-	if (!is_empty_time (todo.due)) {
++	if (!todo.indefinite && !is_empty_time (todo.due)) {
+ 		due = tm_to_icaltimetype (&todo.due, TRUE);
+ 		dt.value = &due;
+ 		e_cal_component_set_due (comp, &dt);

evolution-2.10.3-version-checks.patch

@@ -0,0 +1,347 @@
+--- evolution-2.10.3/a11y/Makefile.am.version-checks	2007-04-09 09:10:38.000000000 -0400
++++ evolution-2.10.3/a11y/Makefile.am	2007-07-27 10:45:41.000000000 -0400
+@@ -31,4 +31,4 @@ libevolution_a11y_la_LIBADD =			\
+ 	e-text/libgal-a11y-etext.la		\
+ 	e-table/libgal-a11y-etable.la		\
+ 	$(top_builddir)/e-util/libeutil.la	\
+-	$(EXTRA_GNOME_LIBS)
++	$(GNOME_PLATFORM_LIBS)
+--- evolution-2.10.3/a11y/e-text/Makefile.am.version-checks	2007-04-09 09:10:36.000000000 -0400
++++ evolution-2.10.3/a11y/e-text/Makefile.am	2007-07-27 10:45:41.000000000 -0400
+@@ -1,7 +1,7 @@
+ INCLUDES =					\
+ 	-I$(top_srcdir)                         \
+ 	-I$(top_srcdir)/widgets                 \
+-	$(EXTRA_GNOME_CFLAGS)			\
++	$(GNOME_PLATFORM_CFLAGS)		\
+         -DG_LOG_DOMAIN=\"e-text\"
+ 
+ noinst_LTLIBRARIES = libgal-a11y-etext.la
+--- evolution-2.10.3/a11y/e-table/Makefile.am.version-checks	2007-04-09 09:10:38.000000000 -0400
++++ evolution-2.10.3/a11y/e-table/Makefile.am	2007-07-27 10:45:41.000000000 -0400
+@@ -1,7 +1,7 @@
+ INCLUDES =					\
+ 	-I$(top_srcdir)                         \
+ 	-I$(top_srcdir)/widgets                 \
+-	$(EXTRA_GNOME_CFLAGS)			\
++	$(GNOME_PLATFORM_CFLAGS)		\
+         -DG_LOG_DOMAIN=\"e-table\"
+ 
+ noinst_LTLIBRARIES = libgal-a11y-etable.la
+--- evolution-2.10.3/configure.in.version-checks	2007-07-27 10:45:06.000000000 -0400
++++ evolution-2.10.3/configure.in	2007-07-27 10:55:54.000000000 -0400
+@@ -4,6 +4,34 @@ AC_PREREQ(2.52)
+ AC_INIT(evolution, 2.10.3, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+ AC_CONFIG_SRCDIR(README)
+ 
++# Some requirements have versioned package names
++# XXX In the spirit of getting rid of versioned
++#     files, can we drop these suffixes?
++EDS_PACKAGE=1.2
++GTKHTML_PACKAGE=3.14
++
++# Required Packages
++m4_define([gtk_minimum_version], [2.10.0])
++m4_define([eds_minimum_version], [1.9.4])
++m4_define([gnome_icon_theme_minimum_version], [1.2.0])
++m4_define([gnome_vfs_minimum_version], [2.4.0])
++m4_define([libbonoboui_minimum_version], [2.4.2])
++m4_define([libgtkhtml_minimum_version], [3.14.0])
++m4_define([gconf_minimum_version], [2.0.0])             # XXX Just a Guess
++m4_define([libglade_minimum_version], [2.0.0])          # XXX Just a Guess
++m4_define([libgnomecanvas_minimum_version], [2.0.0])    # XXX Just a Guess
++m4_define([libgnomeui_minimum_version], [2.0.0])        # XXX Just a Guess
++m4_define([libxml_minimum_version], [2.0.0])            # XXX Just a Guess
++
++# Optional Packages
++#
++# FIXME  Minimum versions for dbus-glib-1 and libnm_glib ?
++# FIXME  Move audio-inline plugin from gstreamer-0.8 to 0.10 ?
++#
++m4_define([dbus_minimum_version], [1.0.0])
++m4_define([hal_minimum_version], [0.5.4])
++m4_define([libnotify_minimum_version], [0.3.0])
++m4_define([gnome_pilot_minimum_version], [2.0.0])       # XXX Just a Guess
+ 
+ # GNOME Documentation
+ GNOME_DOC_INIT
+@@ -127,6 +155,27 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32
+ AC_SUBST(NO_UNDEFINED)
+ AC_SUBST(SOEXT)
+ 
++# Check for base dependencies early.
++PKG_CHECK_MODULES(GNOME_PLATFORM,
++        [gtk+-2.0 >= gtk_minimum_version
++         gconf-2.0 >= gconf_minimum_version
++         gnome-vfs-2.0 >= gnome_vfs_minimum_version
++         libbonoboui-2.0 >= libbonoboui_minimum_version
++         libglade-2.0 >= libglade_minimum_version
++         libgnomecanvas-2.0 >= libgnomecanvas_minimum_version
++         libgnomeui-2.0 >= libgnomeui_minimum_version
++         libxml-2.0 >= libxml_minimum_version])
++AC_SUBST(GNOME_PLATFORM_CFLAGS)
++AC_SUBST(GNOME_PLATFORM_LIBS)
++
++PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER,
++        [libebook-$EDS_PACKAGE >= eds_minimum_version
++         libecal-$EDS_PACKAGE >= eds_minimum_version
++         libedataserver-$EDS_PACKAGE >= eds_minimum_version
++         libedataserverui-$EDS_PACKAGE >= eds_minimum_version
++         libegroupwise-$EDS_PACKAGE >= eds_minimum_version
++         libexchange-storage-$EDS_PACKAGE >= eds_minimum_version])
++
+ dnl ******************************
+ dnl iconv checking
+ dnl ******************************
+@@ -403,7 +452,7 @@ AC_CHECK_FUNCS(statfs)
+ dnl **************************************************
+ dnl * Gnome Icon Theme
+ dnl **************************************************
+-PKG_CHECK_MODULES(GIT, gnome-icon-theme >= 1.2.0)
++PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version)
+ 
+ dnl **************************************************
+ dnl * Accessibility support
+@@ -563,7 +612,8 @@ AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(re
+ 				      [AC_MSG_ERROR([No regex library found])])])
+ AC_SUBST(REGEX_LIBS)
+ 
+-PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14)
++# XXX Drop the version from the package name?
++PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14 >= libgtkhtml_minimum_version)
+ AC_SUBST(GTKHTML_CFLAGS)
+ AC_SUBST(GTKHTML_LIBS)
+ GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir libgtkhtml-3.14`
+@@ -580,7 +630,7 @@ dnl ******************************
+ AC_ARG_ENABLE(pilot-conduits, 
+ [  --enable-pilot-conduits=[no/yes] Enable support for building pilot conduits.],,enable_pilot_conduits=no)
+ if test "x$enable_pilot_conduits" = "xyes"; then
+-	PKG_CHECK_MODULES(GNOME_PILOT, gnome-pilot-2.0)
++	PKG_CHECK_MODULES(GNOME_PILOT, gnome-pilot-2.0 >= gnome_pilot_minimum_version)
+ 
+ 	CFLAGS_save="$CFLAGS"
+ 	CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS"
+@@ -1178,27 +1228,12 @@ fi
+ 
+ dnl --- Required version numbers
+ 
+-GTKHTML_REQUIRED=3.14.0
+-GTKHTML_PACKAGE=3.14
+-EDS_REQUIRED=1.9.4
+-EDS_PACKAGE=1.2
+-BONOBOUI_REQUIRED=2.4.2
+-GNOME_VFS_REQUIRED=2.4
+-
+-AC_SUBST(GTKHTML_REQUIRED)
+-AC_SUBST(GTKHTML_PACKAGE)
+-AC_SUBST(EDS_REQUIRED)
+-AC_SUBST(EDS_PACKAGE)
++BONOBOUI_REQUIRED=libbonoboui_minimum_version
+ AC_SUBST(BONOBOUI_REQUIRED)
+-AC_SUBST(GNOME_VFS_REQUIRED)
+ 
+ dnl --- Flags to get all the GNOME stuff
+ 
+-FULL_GNOME_DEPS="glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0"
+-
+-EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS)
+-AC_SUBST(GNOME_FULL_CFLAGS)
+-AC_SUBST(GNOME_FULL_LIBS)
++FULL_GNOME_DEPS="libbonoboui-2.0 gnome-vfs-2.0 libgnomeui-2.0 libglade-2.0"
+ 
+ CPPFLAGS_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags-only-I libgnomeui-2.0`"
+@@ -1206,11 +1241,7 @@ AC_CHECK_HEADERS(libgnomeui/gnome-icon-l
+ AC_CHECK_HEADERS(libgnomeui/gnome-thumbnail.h)
+ CPPFLAGS="$CPPFLAGS_save"
+ 
+-PKG_CHECK_MODULES(EXTRA_GNOME, libgnomeprint-2.2 >= 2.7.0 libgnomeprintui-2.2 >= 2.2.1 $FULL_GNOME_DEPS)
+-AC_SUBST(EXTRA_GNOME_LIBS)
+-AC_SUBST(EXTRA_GNOME_CFLAGS)
+-
+-PKG_CHECK_MODULES(HAL, hal >= 0.5.4, HAVE_HAL="yes", HAVE_HAL="no")
++PKG_CHECK_MODULES(HAL, hal >= hal_minimum_version, HAVE_HAL="yes", HAVE_HAL="no")
+ if test "x$HAVE_HAL" = "xyes"; then
+    AC_DEFINE(HAVE_HAL, 1, [hal available])
+    HAL_REQUIREMENT="hal"
+@@ -1226,7 +1257,7 @@ EVO_SET_COMPILE_FLAGS(CAMEL, camel-provi
+ AC_SUBST(CAMEL_CFLAGS)
+ AC_SUBST(CAMEL_LIBS)
+ 
+-EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED libegroupwise-$EDS_PACKAGE >= $EDS_REQUIRED)
++EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE)
+ AC_SUBST(CAMEL_GROUPWISE_CFLAGS)
+ AC_SUBST(CAMEL_GROUPWISE_LIBS)
+ 
+@@ -1239,33 +1270,33 @@ else
+ 	fi
+ fi
+ 
+-EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED libglade-2.0 gtk+-2.0 glib-2.0 gobject-2.0 gthread-2.0,
++EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0,
+                       $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS,
+ 	              $MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS)
+ AC_SUBST(CERT_UI_CFLAGS)
+ AC_SUBST(CERT_UI_LIBS)
+ 
+-EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED)
++EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0)
+ AC_SUBST(E_NAME_CFLAGS)
+ AC_SUBST(E_NAME_LIBS)
+ 
+-EVO_SET_COMPILE_FLAGS(E_UTIL, gthread-2.0 gconf-2.0 libxml-2.0 gtk+-unix-print-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 libgnomeprintui-2.2 libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
++EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
+ AC_SUBST(E_UTIL_CFLAGS)
+ AC_SUBST(E_UTIL_LIBS)
+ 
+-EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE >= $EDS_REQUIRED, $GNOME_FULL_CFLAGS, $GNOME_FULL_LIBS)
++EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE, $GNOME_PLATFORM_CFLAGS, $GNOME_PLATFORM_LIBS)
+ AC_SUBST(TZDIALOG_CFLAGS)
+ AC_SUBST(TZDIALOG_LIBS)
+ 
+-EVO_SET_COMPILE_FLAGS(E_WIDGETS, glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 gnome-vfs-module-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED)
++EVO_SET_COMPILE_FLAGS(E_WIDGETS, libbonoboui-2.0 gnome-vfs-module-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE)
+ AC_SUBST(E_WIDGETS_CFLAGS)
+ AC_SUBST(E_WIDGETS_LIBS)
+  
+-EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE gconf-2.0 libglade-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libgnomeui-2.0 libebook-$EDS_PACKAGE >= $EDS_REQUIRED)
++EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE)
+ AC_SUBST(IMPORTERS_CFLAGS)
+ AC_SUBST(IMPORTERS_LIBS)
+ 
+-EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 libxml-2.0 gconf-2.0 libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED)
++EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED)
+ AC_SUBST(LIBFILTER_CFLAGS)
+ AC_SUBST(LIBFILTER_LIBS)
+ 
+@@ -1292,14 +1323,14 @@ AM_CONDITIONAL(NM_SUPPORT_GLIB, test x$N
+ AM_CONDITIONAL(NM_SUPPORT, test x$NM_SUPPORT = xyes)
+ 
+ 
+-EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED $NM_SUPPORT_PACKAGES)   
++EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE $NM_SUPPORT_PACKAGES)   
+ 
+ AC_SUBST(SHELL_CFLAGS)
+ AC_SUBST(SHELL_LIBS)
+ 
+ dnl --- evolution-addressbook flags
+ 
+-EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gtk+-unix-print-2.0 gnome-vfs-2.0 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED camel-$EDS_PACKAGE"
++EVOLUTION_ADDRESSBOOK_DEPS="libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE"
+ 
+ EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
+ AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
+@@ -1313,7 +1344,7 @@ fi
+ 
+ LIBNOTIFY_CFLAGS=
+ LIBNOTIFY_LIBS=
+-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.3.0, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no")
++PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= libnotify_minimum_version, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no")
+ if test "x$HAVE_LIBNOTIFY" = "xyes"; then
+ 	AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available])
+ 	libnotify="libnotify"
+@@ -1337,7 +1368,7 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, $LIBSOUP 
+ AC_SUBST(LIBSOUP_CFLAGS)
+ AC_SUBST(LIBSOUP_LIBS)
+ 
+-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 gtk+-unix-print-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $HAL_REQUIREMENT $libnotify)
++EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify)
+ AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
+ AC_SUBST(EVOLUTION_CALENDAR_LIBS)
+ 
+@@ -1349,7 +1380,7 @@ fi
+ 
+ dnl --- evolution-mail flags
+ 
+-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gnome-vfs-module-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 gtk+-unix-print-2.0 $mozilla_nss libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED)
++EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE)
+ AC_SUBST(EVOLUTION_MAIL_CFLAGS)
+ AC_SUBST(EVOLUTION_MAIL_LIBS)
+ 
+@@ -1372,7 +1403,7 @@ fi
+ 
+ dnl --- evolution-test flags
+ 
+-EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, libgnome-2.0 libgnomeui-2.0 libbonobo-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED)
++EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, libgnomeui-2.0 libbonoboui-2.0)
+ AC_SUBST(EVOLUTION_TEST_CFLAGS)
+ AC_SUBST(EVOLUTION_TEST_LIBS)
+ 
+@@ -1591,7 +1622,7 @@ if echo ${plugins_enabled} | grep "excha
+ 		dnl **************************************************
+ 		dnl * Exchange Operations plugin
+ 		dnl **************************************************
+-		EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gthread-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE)
++		EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE)
+ 		AC_SUBST(CAMEL_EXCHANGE_CFLAGS)
+ 		AC_SUBST(CAMEL_EXCHANGE_LIBS)
+ 	else
+--- evolution-2.10.3/widgets/misc/Makefile.am.version-checks	2007-04-09 09:10:24.000000000 -0400
++++ evolution-2.10.3/widgets/misc/Makefile.am	2007-07-27 10:45:41.000000000 -0400
+@@ -10,7 +10,7 @@ INCLUDES =								\
+ 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
+ 	-DG_LOG_DOMAIN=__FILE__						\
+ 	$(EVOLUTION_MAIL_CFLAGS)					\
+-	$(EXTRA_GNOME_CFLAGS)						\
++	$(GNOME_PLATFORM_CFLAGS)					\
+ 	$(ICONV_CFLAGS)
+ 
+ 
+@@ -137,7 +137,7 @@ libemiscwidgets_la_LIBADD = $(top_buildd
+ 	$(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la	\
+ 	$(top_builddir)/a11y/libevolution-a11y.la			\
+ 	$(CAMEL_LIBS)							\
+-	$(EXTRA_GNOME_LIBS)						\
++	$(GNOME_PLATFORM_LIBS)						\
+ 	$(ICONV_LIBS)
+ 
+ libefilterbar_la_SOURCES =	\
+--- evolution-2.10.3/widgets/table/Makefile.am.version-checks	2007-04-09 09:10:21.000000000 -0400
++++ evolution-2.10.3/widgets/table/Makefile.am	2007-07-27 10:45:41.000000000 -0400
+@@ -13,7 +13,7 @@ INCLUDES =					\
+ 	-I$(top_srcdir)                         \
+ 	-I$(top_srcdir)/widgets                 \
+ 	$(E_WIDGETS_CFLAGS)			\
+-	$(EXTRA_GNOME_CFLAGS)			\
++	$(GNOME_PLATFORM_CFLAGS)		\
+ 	-DEVOLUTION_GLADEDIR=\"$(gladedir)\"	\
+         -DG_LOG_DOMAIN=\"e-table\"
+ 
+@@ -155,7 +155,7 @@ libetable_la_LIBADD =					\
+ 	$(top_builddir)/e-util/libeutil.la		\
+ 	$(top_builddir)/a11y/libevolution-a11y.la	\
+ 	$(E_WIDGETS_LIBS)				\
+-	$(EXTRA_GNOME_LIBS)
++	$(GNOME_PLATFORM_LIBS)
+ 
+ icons = 			\
+ 	add-col.xpm		\
+--- evolution-2.10.3/widgets/text/Makefile.am.version-checks	2007-04-09 09:10:17.000000000 -0400
++++ evolution-2.10.3/widgets/text/Makefile.am	2007-07-27 10:45:41.000000000 -0400
+@@ -5,7 +5,7 @@ endif
+ INCLUDES =					\
+ 	-I$(top_srcdir)				\
+ 	-I$(top_srcdir)/widgets			\
+-	$(EXTRA_GNOME_CFLAGS)			\
++	$(GNOME_PLATFORM_CFLAGS)		\
+ 	-DG_LOG_DOMAIN=\"e-text\"
+ 
+ 
+@@ -44,5 +44,5 @@ libetext_la_LIBADD = 					\
+ 	$(top_builddir)/e-util/libeutil.la		\
+ 	$(top_builddir)/a11y/libevolution-a11y.la	\
+ 	$(top_builddir)/widgets/table/libetable.la	\
+-	$(EXTRA_GNOME_LIBS)				\
++	$(GNOME_PLATFORM_LIBS)				\
+ 	$(REGEX_LIBS)
+--- evolution-2.10.3/tools/Makefile.am.version-checks	2007-04-09 09:07:44.000000000 -0400
++++ evolution-2.10.3/tools/Makefile.am	2007-07-27 10:45:41.000000000 -0400
+@@ -16,7 +16,7 @@ INCLUDES =						\
+ 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
+ 	-DDATADIR=\""$(datadir)"\"			\
+ 	-DLIBDIR=\""$(libdir)"\"			\
+-	$(GNOME_FULL_CFLAGS)
++	$(GNOME_PLATFORM_CFLAGS)
+ 
+ EXTRA_DIST = verify-evolution-install.sh
+ 

evolution-2.7.92-fix-prgname.patch

@@ -1,11 +0,0 @@
---- evolution-2.7.92/shell/main.c.fix-prgname	2006-08-28 11:04:44.000000000 -0400
-+++ evolution-2.7.92/shell/main.c	2006-08-28 11:04:56.000000000 -0400
-@@ -516,7 +516,7 @@
- 
- 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
- 
--	program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
-+	program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
- 				      GNOME_PROGRAM_STANDARD_PROPERTIES,
- 				      GNOME_PARAM_GOPTION_CONTEXT, context,
- 				      GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),

evolution.spec

@@ -46,8 +46,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.10.1
-Release: 17%{?dist}
+Version: 2.10.3
+Release: 10%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -101,9 +101,6 @@ Patch23: evolution-2.7.3-replicated-cjk-input.patch
 # RH bug #178295 / GNOME bug #348638
 Patch24: evolution-2.7.4-deleting-preedit-buffer.patch
 
-# RH bug #202289
-Patch25: evolution-2.7.92-fix-prgname.patch
-
 # RH bug #161885 / GNOME bug #309166
 Patch26: evolution-2.8.0-indic-cursor-movement.patch
 
@@ -158,9 +155,6 @@ Patch46: evolution-2.10.0-use-glib-i18n.patch
 # GNOME bug #418971
 Patch47: evolution-2.10.0-drop-old-glib-support.patch
 
-# RH bug #235878 / GNOME bug #386503
-Patch48: evolution-2.10.1-fix-help.patch
-
 # RH bug #234315 / GNOME bug #423766
 Patch49: evolution-2.10.1-saving-attachments.patch
 
@@ -170,15 +164,33 @@ Patch50: evolution-2.10.1-fix-uri-handling.patch
 # RH bug #236399 / GNOME bug #434019
 Patch51: evolution-2.10.1-en_CA-attribution-format.patch
 
-# RH bug #238551 / GNOME bug #434981
-Patch52: evolution-2.10.1-e-attachment-bar.patch
-
 # RH bug #238155 / GNOME bug #427232
 Patch53: evolution-2.10.1-check-uri-before-strcmp.patch
 
 # RH bug #240147 / GNOME bug #335241
 Patch54: evolution-2.10.1-send-recv-dialog.patch
 
+# GNOME bug #380534
+Patch55: evolution-2.10.3-version-checks.patch
+
+# GNOME bug #239441
+Patch56: evolution-2.10.3-fix-ETreeTableAdapter-crash.patch
+
+# RH bug #249640 / GNOME bug #442329
+Patch57: evolution-2.10.3-todo-conduit.patch
+
+# RH bug #436080 / CVE-2008-0072
+Patch58: evolution-2.10.3-CVE-2008-0072.patch
+
+# GNOME bug #524310
+Patch59: evolution-2.10.3-server-message-double-free.patch
+
+# RH bug #449922 / CVE-2008-1108
+Patch60: evolution-2.10.3-CVE-2008-1108.patch
+
+# RH bug #449922 / CVE-2008-1109
+Patch61: evolution-2.10.3-CVE-2008-1109.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -312,7 +324,6 @@ Development files needed for building things which link against evolution.
 %patch22 -p1 -b .filter-datespec
 %patch23 -p1 -b .replicated-cjk-input
 %patch24 -p1 -b .deleting-preedit-buffer
-%patch25 -p1 -b .fix-prgname
 %patch26 -p1 -b .indic-cursor-movement
 %patch29 -p1 -b .fix-indic-printing
 %patch31 -p1 -b .kill-ethread
@@ -331,13 +342,18 @@ Development files needed for building things which link against evolution.
 %patch45 -p1 -b .shell-main-cleanups
 %patch46 -p1 -b .use-glib-i18n
 %patch47 -p1 -b .drop-old-glib-support
-%patch48 -p1 -b .fix-help
 %patch49 -p1 -b .saving-attachments
 %patch50 -p1 -b .fix-uri-handling
 %patch51 -p1 -b .en_CA-attribution-format
-%patch52 -p1 -b .e-attachment-bar
 %patch53 -p1 -b .check-uri-before-strcmp
 %patch54 -p1 -b .send-recv-dialog
+%patch55 -p1 -b .version-checks
+%patch56 -p1 -b .ETreeTableAdapter-idle-crash
+%patch57 -p1 -b .todo-conduit
+%patch58 -p1 -b .CVE-2008-0072
+%patch59 -p1 -b .server-message-double-free
+%patch60 -p1 -b .CVE-2008-1108
+%patch61 -p1 -b .CVE-2008-1109
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -759,6 +775,50 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Jun 04 2008 Matthew Barnes <mbarnes@redhat.com> - 2.10.3-10.fc7
+- Add patches for RH bug #449922 (buffer overflow vulnerabilities).
+
+* Tue Mar 25 2008 Dan Williams <dcbw@redhat.com> - 2.10.3-9.fc7
+- Add patch for GNOME bug #524310
+
+* Tue Mar 04 2008 Matthew Barnes <mbarnes@redhat.com> - 2.10.3-8.fc7
+- Add patch for CVE-2008-0072 (format string vulnerability).
+
+* Sat Nov 03 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.3-7.fc7
+- Add patch for RH bug #249640 (todo conduit crash).
+
+* Wed Oct 31 2007 Dan Williams <dcbw@redhat.com> - 2.10.3-6.fc7
+- Backport fix for GNOME bug #239441
+
+* Thu Aug 30 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.3-5.fc7
+- Revise patch for GNOME bug #417999 to fix GNOME bug #447591
+  (Automatic Contacts combo boxes don't work).
+
+* Wed Aug 29 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.3-4.fc7
+- Revise patch for GNOME bug #362638 to fix GNOME bug #357175
+  (Evolution fails to close after IMAP alert has been displayed).
+
+* Fri Jul 27 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.3-3.fc7
+- Add patch for GNOME bug #380534 (clarify version requirements).
+
+* Sat Jul 14 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.3-2.fc7
+- Revise patch for GNOME bug #362638 to fix RH bug #245695 (crash on alert).
+
+* Mon Jul 02 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.3-1.fc7
+- Update to 2.10.3
+
+* Wed Jun 27 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.2-3.fc7
+- Revise patch for GNOME bug #362638 to fix RH bug #245289 (frequent hangs).
+
+* Wed Jun 06 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.2-2.fc7
+- Revise patch for GNOME bug #362638 to fix RH bug #240507 (hang on exit).
+
+* Mon May 28 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.2-1.fc7
+- Update to 2.10.2
+- Remove patch for RH bug #202289 (fixed upstream).
+- Remove patch for RH bug #235878 (fixed upstream).
+- Remove patch for RH bug #238551 (fixed upstream).
+
 * Wed May 16 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-17.fc7
 - Revise patch for GNOME bug #362638 to fix RH bug #237206
   (certificate prompt causes crash, again).

sources

@@ -1 +1 @@
-16051c6cbb617cb04665e402566e0976  evolution-2.10.1.tar.bz2
+09cc60b037849b3c9b34961eb7da217f  evolution-2.10.3.tar.bz2