diff --git a/.cvsignore b/.cvsignore
index 972d3f7..eb84a4b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.11.5.tar.bz2
+evolution-2.11.6.1.tar.bz2
diff --git a/evolution-2.10.0-e-source-combo-box.patch b/evolution-2.10.0-e-source-combo-box.patch
index e1d0078..58f1300 100644
--- a/evolution-2.10.0-e-source-combo-box.patch
+++ b/evolution-2.10.0-e-source-combo-box.patch
@@ -1,5 +1,5 @@
---- evolution-2.11.2/widgets/misc/e-pilot-settings.c.e-source-combo-box	2007-04-18 06:18:34.000000000 -0400
-+++ evolution-2.11.2/widgets/misc/e-pilot-settings.c	2007-05-18 15:49:15.000000000 -0400
+--- evolution-2.11.6/widgets/misc/e-pilot-settings.c.e-source-combo-box	2007-04-17 12:44:06.000000000 -0400
++++ evolution-2.11.6/widgets/misc/e-pilot-settings.c	2007-07-31 10:01:40.000000000 -0400
 @@ -27,7 +27,7 @@
  
  #include <gtk/gtk.h>
@@ -9,7 +9,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 +18,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 +30,7 @@
  }
  
  void
-@@ -166,7 +167,8 @@
+@@ -166,7 +167,8 @@ e_pilot_settings_set_source (EPilotSetti
  
  	priv = ps->priv;
  
@@ -40,9 +40,9 @@
  }
  
  gboolean
---- evolution-2.11.2/plugins/itip-formatter/itip-formatter.c.e-source-combo-box	2007-04-18 06:17:20.000000000 -0400
-+++ evolution-2.11.2/plugins/itip-formatter/itip-formatter.c	2007-05-18 15:48:37.000000000 -0400
-@@ -39,7 +39,7 @@
+--- evolution-2.11.6/plugins/itip-formatter/itip-formatter.c.e-source-combo-box	2007-07-30 10:18:01.000000000 -0400
++++ evolution-2.11.6/plugins/itip-formatter/itip-formatter.c	2007-07-31 10:01:40.000000000 -0400
+@@ -40,7 +40,7 @@
  #include <camel/camel-store.h>
  #include <libecal/e-cal.h>
  #include <libecal/e-cal-time-util.h>
@@ -51,8 +51,8 @@
  #include <libedataserverui/e-source-selector.h>
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <mail/em-format-hook.h>
---- evolution-2.11.2/plugins/itip-formatter/itip-view.c.e-source-combo-box	2007-05-13 13:41:08.000000000 -0400
-+++ evolution-2.11.2/plugins/itip-formatter/itip-view.c	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/plugins/itip-formatter/itip-view.c.e-source-combo-box	2007-07-30 10:18:01.000000000 -0400
++++ evolution-2.11.6/plugins/itip-formatter/itip-view.c	2007-07-31 10:01:40.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <camel/camel-mime-message.h>
  #include <libedataserver/e-time-utils.h>
@@ -62,7 +62,7 @@
  #include <libecal/e-cal.h>
  #include <libecal/e-cal-time-util.h>
  #include <gtkhtml/gtkhtml-embedded.h>
-@@ -103,8 +103,8 @@
+@@ -105,8 +105,8 @@ struct _ItipViewPrivate {
  	char *description;
  
  	GtkWidget *selector_box;
@@ -73,7 +73,7 @@
  	ESourceList *source_list;
  	
  	GtkWidget *rsvp_box;
-@@ -1671,10 +1671,12 @@
+@@ -1788,10 +1788,12 @@ itip_view_clear_lower_info_items (ItipVi
  }
  
  static void
@@ -89,7 +89,7 @@
  	g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
  }
  
-@@ -1691,40 +1693,42 @@
+@@ -1808,40 +1810,42 @@ itip_view_set_source_list (ItipView *vie
  	if (priv->source_list)
  		g_object_unref (priv->source_list);
  
@@ -149,7 +149,7 @@
  }
  
  ESourceList *
-@@ -1750,10 +1754,11 @@
+@@ -1867,10 +1871,11 @@ itip_view_set_source (ItipView *view, ES
  	
  	priv = view->priv;
  
@@ -163,7 +163,7 @@
  }
  
  ESource *
-@@ -1766,10 +1771,11 @@
+@@ -1883,10 +1888,11 @@ itip_view_get_source (ItipView *view)
  	
  	priv = view->priv;
  	
@@ -177,8 +177,8 @@
  }
  
  void
---- evolution-2.11.2/plugins/bbdb/gaimbuddies.c.e-source-combo-box	2007-05-13 13:41:06.000000000 -0400
-+++ evolution-2.11.2/plugins/bbdb/gaimbuddies.c	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/plugins/bbdb/gaimbuddies.c.e-source-combo-box	2007-07-30 10:18:00.000000000 -0400
++++ evolution-2.11.6/plugins/bbdb/gaimbuddies.c	2007-07-31 10:01:40.000000000 -0400
 @@ -44,7 +44,7 @@
  #include <string.h>
  
@@ -188,8 +188,8 @@
  
  #include <sys/time.h>
  #include <sys/stat.h>
---- evolution-2.11.2/plugins/bbdb/bbdb.c.e-source-combo-box	2007-04-18 06:17:14.000000000 -0400
-+++ evolution-2.11.2/plugins/bbdb/bbdb.c	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/plugins/bbdb/bbdb.c.e-source-combo-box	2007-07-30 10:18:00.000000000 -0400
++++ evolution-2.11.6/plugins/bbdb/bbdb.c	2007-07-31 10:01:40.000000000 -0400
 @@ -40,7 +40,7 @@
  #include <string.h>
  
@@ -199,7 +199,7 @@
  
  #include <e-util/e-config.h>
  #include <mail/em-config.h>
-@@ -341,7 +341,8 @@
+@@ -353,7 +353,8 @@ 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)) {
@@ -209,7 +209,7 @@
  		gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL);
  	}
  }
-@@ -360,7 +361,8 @@
+@@ -372,7 +373,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,7 +219,7 @@
  		gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL);
  	}
  }
-@@ -389,31 +391,32 @@
+@@ -401,31 +403,32 @@ gaim_source_changed_cb (GtkWidget *widge
  static GtkWidget *
  create_addressbook_option_menu (struct bbdb_stuff *stuff, int type)
  {
@@ -259,8 +259,8 @@
  }
  
  GtkWidget *
---- evolution-2.11.2/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box	2007-05-14 00:24:02.000000000 -0400
-+++ evolution-2.11.2/addressbook/gui/contact-list-editor/contact-list-editor.glade	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box	2007-07-30 10:18:02.000000000 -0400
++++ evolution-2.11.6/addressbook/gui/contact-list-editor/contact-list-editor.glade	2007-07-31 10:01:40.000000000 -0400
 @@ -158,9 +158,9 @@
  		  </child>
  
@@ -273,8 +273,8 @@
  		      <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.11.2/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box	2007-04-18 06:15:40.000000000 -0400
-+++ evolution-2.11.2/addressbook/gui/contact-list-editor/e-contact-list-editor.c	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box	2007-07-30 10:18:02.000000000 -0400
++++ evolution-2.11.6/addressbook/gui/contact-list-editor/e-contact-list-editor.c	2007-07-31 10:01:40.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gtk/gtktogglebutton.h>
  #include <gtk/gtkdialog.h>
@@ -284,7 +284,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 +293,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 +302,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 +311,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 +323,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 +337,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 +376,7 @@
  }
  
  GtkWidget *
-@@ -1262,10 +1267,9 @@
+@@ -1262,10 +1267,9 @@ fill_in_info(EContactListEditor *editor)
  	}
  	
  	if (editor->book) {
@@ -390,8 +390,8 @@
  		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.11.2/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box	2007-04-18 06:15:34.000000000 -0400
-+++ evolution-2.11.2/addressbook/gui/contact-editor/contact-editor.glade	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box	2007-07-30 10:18:02.000000000 -0400
++++ evolution-2.11.6/addressbook/gui/contact-editor/contact-editor.glade	2007-07-31 10:01:40.000000000 -0400
 @@ -356,9 +356,9 @@
  		      </child>
  
@@ -404,8 +404,8 @@
  			  <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.11.2/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box	2007-05-09 00:14:39.000000000 -0400
-+++ evolution-2.11.2/addressbook/gui/contact-editor/e-contact-editor.c	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box	2007-07-30 10:18:02.000000000 -0400
++++ evolution-2.11.6/addressbook/gui/contact-editor/e-contact-editor.c	2007-07-31 10:10:58.000000000 -0400
 @@ -46,7 +46,7 @@
  #include <text/e-entry.h>
  
@@ -415,7 +415,7 @@
  
  #include <camel/camel.h>
  
-@@ -589,15 +589,16 @@
+@@ -589,15 +589,16 @@ static void
  fill_in_source_field (EContactEditor *editor)
  {
  	GtkWidget *source_menu;
@@ -436,7 +436,7 @@
  }
  
  static void
-@@ -2521,13 +2522,15 @@
+@@ -2521,13 +2522,15 @@ new_target_cb (EBook *new_book, EBookSta
  	editor->load_book      = NULL;
  
  	if (status != E_BOOK_ERROR_OK || new_book == NULL) {
@@ -456,7 +456,7 @@
  
  		if (new_book)
  			g_object_unref (new_book);
-@@ -2551,8 +2554,12 @@
+@@ -2551,8 +2554,12 @@ cancel_load (EContactEditor *editor)
  }
  
  static void
@@ -470,7 +470,7 @@
  	cancel_load (editor);
  
  	if (e_source_equal (e_book_get_source (editor->target_book), source))
-@@ -3323,8 +3330,8 @@
+@@ -3373,8 +3380,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 +481,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");
-@@ -3775,25 +3782,25 @@
+@@ -3825,26 +3832,26 @@ e_contact_editor_create_web(gchar *name,
  }
  
  GtkWidget *
@@ -489,16 +489,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;
@@ -511,14 +511,15 @@
 -	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.11.2/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box	2007-04-18 06:15:34.000000000 -0400
-+++ evolution-2.11.2/addressbook/gui/contact-editor/e-contact-quick-add.c	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box	2007-07-30 10:18:02.000000000 -0400
++++ evolution-2.11.6/addressbook/gui/contact-editor/e-contact-quick-add.c	2007-07-31 10:12:50.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <libgnomeui/gnome-app.h>
  #include <libebook/e-book.h>
@@ -528,7 +529,7 @@
  #include <addressbook/gui/component/addressbook.h>
  #include <addressbook/util/eab-book-util.h>
  #include "e-contact-editor.h"
-@@ -267,8 +267,12 @@
+@@ -269,8 +269,12 @@ clicked_cb (GtkWidget *w, gint button, g
  }
  
  static void
@@ -542,10 +543,10 @@
  	if (qa->book) {
  		g_object_unref (qa->book);
  		qa->book = NULL;
-@@ -316,16 +320,20 @@
- 
+@@ -319,16 +323,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");
+ 	g_object_unref (gconf_client);
 -	qa->option_menu = e_source_option_menu_new (source_list);
 +	qa->option_menu = e_source_combo_box_new (source_list);
  	book = e_book_new_default_addressbook (NULL);
@@ -567,8 +568,8 @@
  	
  	g_object_unref (source_list);	
  
---- evolution-2.11.2/calendar/gui/dialogs/memo-page.glade.e-source-combo-box	2007-04-18 06:18:36.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/memo-page.glade	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/calendar/gui/dialogs/memo-page.glade.e-source-combo-box	2007-01-03 10:27:56.000000000 -0500
++++ evolution-2.11.6/calendar/gui/dialogs/memo-page.glade	2007-07-31 10:01:40.000000000 -0400
 @@ -141,7 +141,7 @@
  		  <child>
  		    <widget class="Custom" id="source">
@@ -578,9 +579,9 @@
  		      <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.11.2/calendar/gui/dialogs/event-page.glade.e-source-combo-box	2007-04-18 06:18:36.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/event-page.glade	2007-05-18 15:48:37.000000000 -0400
-@@ -774,7 +774,7 @@
+--- evolution-2.11.6/calendar/gui/dialogs/event-page.glade.e-source-combo-box	2007-07-30 10:19:21.000000000 -0400
++++ evolution-2.11.6/calendar/gui/dialogs/event-page.glade	2007-07-31 10:01:40.000000000 -0400
+@@ -775,7 +775,7 @@
  		      <child>
  			<widget class="Custom" id="source">
  			  <property name="visible">True</property>
@@ -589,8 +590,8 @@
  			  <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.11.2/calendar/gui/dialogs/task-page.glade.e-source-combo-box	2007-05-09 00:14:46.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/task-page.glade	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/calendar/gui/dialogs/task-page.glade.e-source-combo-box	2007-07-30 10:19:21.000000000 -0400
++++ evolution-2.11.6/calendar/gui/dialogs/task-page.glade	2007-07-31 10:01:40.000000000 -0400
 @@ -618,7 +618,7 @@
  			<widget class="Custom" id="source">
  			  <property name="height_request">24</property>
@@ -600,8 +601,8 @@
  			  <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.11.2/calendar/gui/dialogs/memo-page.c.e-source-combo-box	2007-04-20 00:28:26.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/memo-page.c	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/calendar/gui/dialogs/memo-page.c.e-source-combo-box	2007-07-30 10:19:21.000000000 -0400
++++ evolution-2.11.6/calendar/gui/dialogs/memo-page.c	2007-07-31 10:14:31.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <gtk/gtkmessagedialog.h>
  #include <glib/gi18n.h>
@@ -611,7 +612,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 +620,7 @@
  
  	mpage = MEMO_PAGE (page);
  	priv = mpage->priv;
-@@ -432,8 +431,9 @@
+@@ -432,8 +431,9 @@ memo_page_fill_widgets (CompEditorPage *
  	}
  
  	/* Source */
@@ -631,7 +632,7 @@
  
  	priv->updating = FALSE;
  
-@@ -842,13 +842,12 @@
+@@ -840,13 +840,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -649,7 +650,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -860,8 +859,9 @@
+@@ -858,8 +857,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -661,7 +662,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -971,7 +971,7 @@
+@@ -969,7 +969,7 @@ init_widgets (MemoPage *mpage)
  			    G_CALLBACK (categories_clicked_cb), mpage);
  
  	/* Source selector */
@@ -670,7 +671,7 @@
  			 G_CALLBACK (source_changed_cb), mpage);
  	
  	/* Connect the default signal handler to use to make sure the "changed"
-@@ -1165,21 +1165,22 @@
+@@ -1163,22 +1163,23 @@ memo_page_create_date_edit (void)
  	return dedit;
  }
  
@@ -694,14 +695,15 @@
 -	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.11.2/calendar/gui/dialogs/event-page.c.e-source-combo-box	2007-05-09 00:14:46.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/event-page.c	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/calendar/gui/dialogs/event-page.c.e-source-combo-box	2007-07-30 10:19:21.000000000 -0400
++++ evolution-2.11.6/calendar/gui/dialogs/event-page.c	2007-07-31 10:38:26.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gdk/gdkkeysyms.h>
  #include <glib/gi18n.h>
@@ -711,7 +713,7 @@
  #include "common/authentication.h"
  #include "e-util/e-categories-config.h"
  #include "e-util/e-dialog-widgets.h"
-@@ -969,7 +969,6 @@
+@@ -978,7 +978,6 @@ event_page_fill_widgets (CompEditorPage 
  	ECalComponentDateTime start_date, end_date;
  	const char *location, *uid = NULL;
  	const char *categories;
@@ -719,7 +721,7 @@
  	GSList *l;
  	gboolean validated = TRUE;
  	
-@@ -1165,8 +1164,9 @@
+@@ -1174,8 +1173,9 @@ event_page_fill_widgets (CompEditorPage 
  	e_dialog_editable_set (priv->categories, categories);
  	
  	/* Source */
@@ -731,7 +733,7 @@
  
  	e_cal_component_get_uid (comp, &uid);
  	if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) 
-@@ -2566,7 +2566,8 @@
+@@ -2577,7 +2577,8 @@ event_page_sendoptions_clicked_cb (Event
  
  	if (!priv->sod) {
  		priv->sod = e_sendoptions_dialog_new ();
@@ -741,7 +743,7 @@
  		e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
  		priv->sod->data->initialized = TRUE;
  	}	
-@@ -2595,13 +2596,12 @@
+@@ -2606,13 +2607,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -759,7 +761,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -2620,8 +2620,9 @@
+@@ -2631,8 +2631,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -771,7 +773,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -2847,7 +2848,7 @@
+@@ -2860,7 +2861,7 @@ init_widgets (EventPage *epage)
  			    G_CALLBACK (categories_clicked_cb), epage);
  	
  	/* Source selector */
@@ -780,7 +782,7 @@
  			    G_CALLBACK (source_changed_cb), epage);
  	/* Alarms */
  	priv->alarm_list_store = e_alarm_list_new ();
-@@ -3148,23 +3149,24 @@
+@@ -3161,24 +3162,25 @@ make_timezone_entry (void)
  	return w;
  }
  
@@ -804,6 +806,7 @@
 -	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;
@@ -812,8 +815,8 @@
  }
  
  GtkWidget *make_status_icons (void);
---- evolution-2.11.2/calendar/gui/dialogs/task-page.c.e-source-combo-box	2007-04-20 00:28:26.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/task-page.c	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/calendar/gui/dialogs/task-page.c.e-source-combo-box	2007-07-30 10:19:21.000000000 -0400
++++ evolution-2.11.6/calendar/gui/dialogs/task-page.c	2007-07-31 10:39:29.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <gtk/gtkmessagedialog.h>
  #include <glib/gi18n.h>
@@ -823,7 +826,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 +834,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 +846,7 @@
  
  	if (priv->is_assignment) {
  		ECalComponentOrganizer organizer;	
-@@ -1615,13 +1615,12 @@
+@@ -1613,13 +1613,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -861,7 +864,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -1640,8 +1639,9 @@
+@@ -1638,8 +1637,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -873,7 +876,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -1653,7 +1653,7 @@
+@@ -1651,7 +1651,7 @@ source_changed_cb (GtkWidget *widget, ES
  			comp_editor_notify_client_changed (
  				COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
  				client);
@@ -882,7 +885,7 @@
  			if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment)
  				task_page_show_options (tpage);
  			else
-@@ -1677,7 +1677,8 @@
+@@ -1675,7 +1675,8 @@ task_page_sendoptions_clicked_cb (TaskPa
  	if (!priv->sod) {
  		priv->sod = e_sendoptions_dialog_new ();
  		priv->sod->data->initialized = TRUE;
@@ -892,7 +895,7 @@
  		e_sendoptions_utils_set_default_data (priv->sod, source, "task");
  	}
  	
-@@ -1732,7 +1733,7 @@
+@@ -1730,7 +1731,7 @@ init_widgets (TaskPage *tpage)
  			    G_CALLBACK (categories_clicked_cb), tpage);
  	
  	/* Source selector */
@@ -901,7 +904,7 @@
  			 G_CALLBACK (source_changed_cb), tpage);
  
  	/* Connect the default signal handler to use to make sure the "changed"
-@@ -1953,21 +1954,22 @@
+@@ -1951,22 +1952,23 @@ task_page_create_date_edit (void)
  	return dedit;
  }
  
@@ -925,14 +928,15 @@
 -	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.11.2/calendar/gui/e-itip-control.c.e-source-combo-box	2007-04-20 00:28:27.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/e-itip-control.c	2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/calendar/gui/e-itip-control.c.e-source-combo-box	2007-07-30 10:19:22.000000000 -0400
++++ evolution-2.11.6/calendar/gui/e-itip-control.c	2007-07-31 10:01:40.000000000 -0400
 @@ -44,7 +44,7 @@
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <gtkhtml/gtkhtml-stream.h>
@@ -942,7 +946,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 +965,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 +974,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]);
  
diff --git a/evolution-2.11.3-e-clipped-label.patch b/evolution-2.11.3-e-clipped-label.patch
deleted file mode 100644
index 04ddc7d..0000000
--- a/evolution-2.11.3-e-clipped-label.patch
+++ /dev/null
@@ -1,377 +0,0 @@
---- evolution-2.11.3/mail/mail-send-recv.c.e-clipped-label	2007-06-06 13:02:07.000000000 -0400
-+++ evolution-2.11.3/mail/mail-send-recv.c	2007-06-14 21:05:16.000000000 -0400
-@@ -43,7 +43,6 @@
- 
- #include "libedataserver/e-account-list.h"
- 
--#include "misc/e-clipped-label.h"
- #include "em-filter-rule.h"
- #include "camel/camel-filter-driver.h"
- #include "camel/camel-folder.h"
-@@ -156,8 +155,8 @@ receive_cancel(GtkButton *button, struct
- 	if (info->state == SEND_ACTIVE) {
- 		camel_operation_cancel(info->cancel);
- 		if (info->status_label)
--			e_clipped_label_set_text (
--				E_CLIPPED_LABEL (info->status_label),
-+			gtk_label_set_text (
-+				GTK_LABEL (info->status_label),
- 				_("Canceling..."));
- 		info->state = SEND_CANCELLED;
- 	}
-@@ -267,8 +266,8 @@ operation_status_timeout(void *data)
- 			GTK_PROGRESS_BAR (info->progress_bar),
- 			info->pc / 100.0);
- 		if (info->what)
--			e_clipped_label_set_text (
--				E_CLIPPED_LABEL (info->status_label),
-+			gtk_label_set_text (
-+				GTK_LABEL (info->status_label),
- 				info->what);
- 		return TRUE;
- 	}
-@@ -496,10 +495,11 @@ build_dialog (EAccountList *accounts, Ca
- 		
- 		cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- 
--		status_label = e_clipped_label_new (
-+		status_label = gtk_label_new (
- 			(info->type == SEND_UPDATE) ?
--			_("Updating...") : _("Waiting..."),
--			PANGO_WEIGHT_NORMAL, 1.0);
-+			_("Updating...") : _("Waiting..."));
-+		gtk_label_set_ellipsize (
-+			GTK_LABEL (status_label), PANGO_ELLIPSIZE_END);
- 
- 		/* g_object_set(data->label, "bold", TRUE, NULL); */
- 		gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
-@@ -566,8 +566,9 @@ build_dialog (EAccountList *accounts, Ca
- 		progress_bar = gtk_progress_bar_new ();
- 		cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- 
--		status_label = e_clipped_label_new (
--			_("Waiting..."), PANGO_WEIGHT_NORMAL, 1.0);
-+		status_label = gtk_label_new (_("Waiting..."));
-+		gtk_label_set_ellipsize (
-+			GTK_LABEL (status_label), PANGO_ELLIPSIZE_END);
- 
- 		gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
- 		gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5);
-@@ -692,8 +693,7 @@ receive_done (char *uri, void *data)
- 			info->state = SEND_COMPLETE;
- 		}
- 
--		e_clipped_label_set_text (
--			E_CLIPPED_LABEL (info->status_label), text);
-+		gtk_label_set_text (GTK_LABEL (info->status_label), text);
- 	}
- 
- 	if (info->cancel_button)
---- evolution-2.11.3/widgets/misc/e-task-bar.c.e-clipped-label	2007-04-18 06:18:34.000000000 -0400
-+++ evolution-2.11.3/widgets/misc/e-task-bar.c	2007-06-14 21:05:16.000000000 -0400
-@@ -26,11 +26,12 @@
- 
- #include "e-task-bar.h"
- 
--#include "misc/e-clipped-label.h"
-+#include <gtk/gtklabel.h>
-+#include <gtk/gtkmisc.h>
- 
- struct _ETaskBarPrivate
- {
--	EClippedLabel *message_label;
-+	GtkWidget *message_label;
- 	GtkHBox  *hbox;
- };
- 
-@@ -96,11 +97,12 @@ e_task_bar_init (ETaskBar *task_bar)
- 	task_bar->priv = g_new (ETaskBarPrivate, 1);
- 
- 	gtk_box_set_spacing (GTK_BOX (task_bar), 10);
--	
--	label = e_clipped_label_new ("", PANGO_WEIGHT_NORMAL, 1.0);
-+
-+	label = gtk_label_new (NULL);
-+	gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
- 	gtk_box_pack_start (GTK_BOX (task_bar), label, TRUE, TRUE, 0);
- 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); 
--	task_bar->priv->message_label = E_CLIPPED_LABEL (label);
-+	task_bar->priv->message_label = label;
- 
- 	hbox = gtk_hbox_new (FALSE, 0);
- 	gtk_container_add (GTK_CONTAINER (task_bar), hbox);
-@@ -133,9 +135,11 @@ e_task_bar_set_message (ETaskBar   *task
- 			const char *message)
- {
- 	if (message) {
--		gtk_widget_show (GTK_WIDGET (task_bar->priv->message_label));
--		e_clipped_label_set_text (task_bar->priv->message_label,
--					  message);
-+		GtkWidget *label;
-+
-+		label = task_bar->priv->message_label;
-+		gtk_label_set_text (GTK_LABEL (label), message);
-+		gtk_widget_show (label);
- 	} else {
- 		e_task_bar_unset_message (task_bar);
- 	}
-@@ -144,7 +148,7 @@ e_task_bar_set_message (ETaskBar   *task
- void
- e_task_bar_unset_message (ETaskBar   *task_bar)
- {
--	gtk_widget_hide (GTK_WIDGET (task_bar->priv->message_label));
-+	gtk_widget_hide (task_bar->priv->message_label);
- }
- 
- void
---- evolution-2.11.3/widgets/misc/Makefile.am.e-clipped-label	2007-06-01 03:09:21.000000000 -0400
-+++ evolution-2.11.3/widgets/misc/Makefile.am	2007-06-14 21:05:16.000000000 -0400
-@@ -45,7 +45,6 @@ widgetsinclude_HEADERS =			\
- 	e-cell-percent.h			\
- 	e-cell-renderer-combo.h			\
- 	e-charset-picker.h			\
--	e-clipped-label.h			\
- 	e-combo-cell-editable.h			\
- 	e-config-page.h				\
- 	e-combo-button.h			\
-@@ -91,7 +90,6 @@ libemiscwidgets_la_SOURCES =			\
- 	e-cell-percent.c			\
- 	e-cell-renderer-combo.c			\
- 	e-charset-picker.c			\
--	e-clipped-label.c			\
- 	e-combo-cell-editable.c			\
- 	e-config-page.c				\
- 	e-combo-button.c			\
---- evolution-2.11.3/widgets/misc/e-info-label.c.e-clipped-label	2007-04-18 06:18:34.000000000 -0400
-+++ evolution-2.11.3/widgets/misc/e-info-label.c	2007-06-14 21:05:16.000000000 -0400
-@@ -28,7 +28,6 @@
- 
- #include "e-info-label.h"
- #include <gtk/gtklabel.h>
--#include "e-clipped-label.h"
- 
- #include <e-util/e-icon-factory.h>
- 
-@@ -142,29 +141,37 @@ e_info_label_new(const char *icon)
- void
- e_info_label_set_info(EInfoLabel *el, const char *location, const char *info)
- {
--	char *tmp;
-+	gchar *markup;
- 
- 	if (el->location == NULL) {
--		el->location = e_clipped_label_new(location, PANGO_WEIGHT_BOLD, 1.0);
--		el->info = gtk_label_new(NULL);
-+		el->location = gtk_label_new (NULL);
-+		el->info = gtk_label_new (NULL);
- 
--		gtk_misc_set_alignment((GtkMisc *)el->location, 0.0, 0.0);
--		gtk_misc_set_padding((GtkMisc *)el->location, 0, 6);
--		gtk_misc_set_alignment((GtkMisc *)el->info, 0.0, 1.0);
--		gtk_misc_set_padding((GtkMisc *)el->info, 0, 6);
--
--		gtk_widget_show(el->location);
--		gtk_widget_show(el->info);
--
--		gtk_box_pack_start((GtkBox *)el, (GtkWidget *)el->location, TRUE, TRUE, 0);
--		gtk_box_pack_end((GtkBox *)el, (GtkWidget *)el->info, FALSE, TRUE, 6);
--		gtk_widget_set_state((GtkWidget *)el, GTK_STATE_ACTIVE);
--	} else {
--		e_clipped_label_set_text((EClippedLabel *)el->location, location);
-+		gtk_label_set_ellipsize (
-+			GTK_LABEL (el->location), PANGO_ELLIPSIZE_END);
-+		gtk_misc_set_alignment (GTK_MISC (el->location), 0.0, 0.0);
-+		gtk_misc_set_padding (GTK_MISC (el->location), 0, 6);
-+		gtk_misc_set_alignment (GTK_MISC (el->info), 0.0, 1.0);
-+		gtk_misc_set_padding (GTK_MISC (el->info), 0, 6);
-+
-+		gtk_widget_show (el->location);
-+		gtk_widget_show (el->info);
-+
-+		gtk_box_pack_start (
-+			GTK_BOX (el), GTK_WIDGET (el->location),
-+			TRUE, TRUE, 0);
-+		gtk_box_pack_end (
-+			GTK_BOX (el), GTK_WIDGET (el->info),
-+			FALSE, TRUE, 6);
-+		gtk_widget_set_state (GTK_WIDGET (el), GTK_STATE_ACTIVE);
- 	}
- 
--	tmp = g_strdup_printf("<span size=\"smaller\">%s</span>", info);
--	gtk_label_set_markup((GtkLabel *)el->info, tmp);
--	g_free(tmp);
-+	markup = g_markup_printf_escaped ("<b>%s</b>", location);
-+	gtk_label_set_markup (GTK_LABEL (el->location), markup);
-+	g_free (markup);
-+
-+	markup = g_markup_printf_escaped ("<small>%s</small>", info);
-+	gtk_label_set_markup (GTK_LABEL (el->info), markup);
-+	g_free (markup);
- }
- 
---- evolution-2.11.3/widgets/misc/e-multi-config-dialog.c.e-clipped-label	2007-06-03 11:08:14.000000000 -0400
-+++ evolution-2.11.3/widgets/misc/e-multi-config-dialog.c	2007-06-14 21:05:16.000000000 -0400
-@@ -26,8 +26,6 @@
- 
- #include "e-multi-config-dialog.h"
- 
--#include "e-clipped-label.h"
--
- #include <table/e-table-scrolled.h>
- #include <table/e-table-memory-store.h>
- #include <table/e-cell-pixbuf.h>
-@@ -87,18 +85,6 @@ create_page_container (const char *descr
- 
- 	vbox = gtk_vbox_new (FALSE, 0);
- 
--#if 0
--	label = e_clipped_label_new (description);
--	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
--	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
--
--	separator = gtk_hseparator_new ();
--	gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, TRUE, 0);
--
--	gtk_widget_show (label);
--	gtk_widget_show (separator);
--#endif
--
- 	gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0); 
- 
- 	gtk_widget_show (widget);
---- evolution-2.11.3/shell/e-shell-folder-title-bar.c.e-clipped-label	2007-04-18 06:15:47.000000000 -0400
-+++ evolution-2.11.3/shell/e-shell-folder-title-bar.c	2007-06-14 21:05:16.000000000 -0400
-@@ -34,7 +34,6 @@
- #include <glib/gi18n.h>
- #include <gdk-pixbuf/gdk-pixbuf.h>
- 
--#include "misc/e-clipped-label.h"
- #include "e-shell-constants.h"
- #include "e-shell-marshal.h"
- #include "e-shell-folder-title-bar.h"
-@@ -117,13 +116,15 @@ new_empty_image_widget (void)
- 
- /* Utility functions.  */
- 
--static int
--get_max_clipped_label_width (EClippedLabel *clipped_label)
-+static gint
-+get_max_label_width (GtkWidget *label)
- {
--	int width;
-+	PangoLayout *layout;
-+	gint width;
- 
--	pango_layout_get_pixel_size (clipped_label->layout, &width, NULL);
--	width += 2 * GTK_MISC (clipped_label)->xpad;
-+	layout = gtk_label_get_layout (GTK_LABEL (label));
-+	pango_layout_get_pixel_size (layout, &width, NULL);
-+	width += 2 * GTK_MISC (label)->xpad;
- 
- 	return width;
- }
-@@ -152,7 +153,7 @@ size_allocate_title_button (EShellFolder
- 	child_allocation.height = allocation->height - 2 * border_width;
- 
- 	child_allocation.width = child_requisition.width;
--	child_allocation.width += get_max_clipped_label_width (E_CLIPPED_LABEL (priv->title_button_label));
-+	child_allocation.width += get_max_label_width (priv->title_button_label);
- 
- 	child_allocation.width = MIN (child_allocation.width, *available_width_inout);
- 
-@@ -218,7 +219,7 @@ size_allocate_label (EShellFolderTitleBa
- 	child_allocation.y = allocation->y + border_width;
- 	child_allocation.height = allocation->height - 2 * border_width;
- 
--	child_allocation.width = MIN (get_max_clipped_label_width (E_CLIPPED_LABEL (priv->title_label)),
-+	child_allocation.width = MIN (get_max_label_width (priv->title_label),
- 				      *available_width_inout);
- 
- 	gtk_widget_size_allocate (priv->title_label, & child_allocation);
-@@ -478,6 +479,7 @@ e_shell_folder_title_bar_construct (EShe
- {
- 	EShellFolderTitleBarPrivate *priv;
- 	GtkWidget *title_button_hbox;
-+	GtkWidget *label;
- 
- 	g_return_if_fail (folder_title_bar != NULL);
- 	g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar));
-@@ -489,18 +491,24 @@ e_shell_folder_title_bar_construct (EShe
- 	gtk_misc_set_padding (GTK_MISC (priv->title_icon), 2, 0);
- 	gtk_widget_show (priv->title_icon);
- 
--	priv->title_label = e_clipped_label_new ("", PANGO_WEIGHT_BOLD, 1.2);
--	gtk_misc_set_padding (GTK_MISC (priv->title_label), 0, 0);
--	gtk_misc_set_alignment (GTK_MISC (priv->title_label), 0.0, 0.5);
--
--	priv->title_button_label = e_clipped_label_new ("", PANGO_WEIGHT_BOLD, 1.2);
--	gtk_misc_set_padding (GTK_MISC (priv->title_button_label), 2, 0);
--	gtk_misc_set_alignment (GTK_MISC (priv->title_button_label), 0.0, 0.5);
--	gtk_widget_show (priv->title_button_label);
--
--	priv->folder_bar_label = e_clipped_label_new ("", PANGO_WEIGHT_NORMAL, 1.0);
--	gtk_misc_set_alignment (GTK_MISC (priv->folder_bar_label), 1.0, 0.5);
--	gtk_widget_show (priv->folder_bar_label);
-+	label = gtk_label_new ("");
-+	gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
-+	gtk_misc_set_padding (GTK_MISC (label), 0, 0);
-+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-+	priv->title_label = label;
-+
-+	label = gtk_label_new ("");
-+	gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
-+	gtk_misc_set_padding (GTK_MISC (label), 2, 0);
-+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-+	gtk_widget_show (label);
-+	priv->title_button_label = label;
-+
-+	label = gtk_label_new ("");
-+	gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
-+	gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
-+	gtk_widget_show (label);
-+	priv->folder_bar_label = label;
- 
- 	priv->title_button_icon = new_empty_image_widget ();
- 	gtk_widget_show (priv->title_button_icon);
-@@ -574,21 +582,21 @@ e_shell_folder_title_bar_set_title (EShe
- 				    const char *title)
- {
- 	EShellFolderTitleBarPrivate *priv;
-+	gchar *markup;
- 
- 	g_return_if_fail (folder_title_bar != NULL);
- 	g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar));
- 
- 	priv = folder_title_bar->priv;
- 
--	if (title == NULL) {
--		e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_button_label), _("(Untitled)"));
--		e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_label), _("(Untitled)"));
--	} else {
--		e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_button_label), title);
--		e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_label), title);
--	}
-+	if (title == NULL)
-+		title = _("Untitled");
-+
-+	markup = g_markup_printf_escaped ("<big><b>%s</b></big>", title);
-+	gtk_label_set_markup (GTK_LABEL (priv->title_button_label), markup);
-+	gtk_label_set_markup (GTK_LABEL (priv->title_label), markup);
-+	g_free (markup);
- 
--	/* FIXME: There seems to be a bug in EClippedLabel, this is just a workaround.  */
- 	gtk_widget_queue_resize (GTK_WIDGET (folder_title_bar));
- }
- 
-@@ -611,10 +619,7 @@ e_shell_folder_title_bar_set_folder_bar_
- 
- 	priv = folder_title_bar->priv;
- 
--	if (text == NULL)
--		e_clipped_label_set_text (E_CLIPPED_LABEL (priv->folder_bar_label), "");
--	else
--		e_clipped_label_set_text (E_CLIPPED_LABEL (priv->folder_bar_label), text);
-+	gtk_label_set_text (GTK_LABEL (priv->folder_bar_label), text);
- 
- 	/* FIXME: Might want to set the styles somewhere in here too,
-            black text on grey background isn't the best combination */
diff --git a/evolution-2.11.5-implicit-function-declarations.patch b/evolution-2.11.5-implicit-function-declarations.patch
deleted file mode 100644
index e9c74a6..0000000
--- a/evolution-2.11.5-implicit-function-declarations.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- evolution-2.11.5/plugins/exchange-operations/exchange-delegates-user.c.implicit-function-declarations	2007-07-09 07:25:51.000000000 -0400
-+++ evolution-2.11.5/plugins/exchange-operations/exchange-delegates-user.c	2007-07-12 15:39:37.000000000 -0400
-@@ -23,10 +23,15 @@
- #include <config.h>
- #endif
- 
-+#include "exchange-delegates.h"
-+#include "exchange-delegates-user.h"
-+
- #include <mail/mail-ops.h>
- #include <mail/mail-component.h>
-+#include <mail/mail-send-recv.h>
- #include <camel/camel-multipart.h>
--#include "exchange-delegates-user.h"
-+#include <camel/camel-stream-mem.h>
-+#include <exchange-account.h>
- #include <e2k-global-catalog.h>
- #include <e2k-marshal.h>
- #include <e2k-sid.h>
-@@ -167,7 +172,7 @@ parent_window_destroyed (gpointer dialog
- 
- /* Maps the role_nam parameter to their corresponding Full role name
- */
--const char *
-+static const char *
- map_to_full_role_name (E2kPermissionsRole role_nam)
- {	
- 	const char *role_name;
---- evolution-2.11.5/shell/es-event.h.implicit-function-declarations	2007-07-12 16:10:10.000000000 -0400
-+++ evolution-2.11.5/shell/es-event.h	2007-07-12 16:11:01.000000000 -0400
-@@ -91,6 +91,7 @@ GType es_event_get_type(void);
- ESEvent *es_event_peek(void);
- 
- ESEventTargetState *es_event_target_new_state(ESEvent *emp, int state);
-+ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, EShell *shell);
- ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision);
- 
- /* ********************************************************************** */
diff --git a/evolution-2.11.5-version-checks.patch b/evolution-2.11.5-version-checks.patch
deleted file mode 100644
index 3411c81..0000000
--- a/evolution-2.11.5-version-checks.patch
+++ /dev/null
@@ -1,347 +0,0 @@
---- evolution-2.11.5/a11y/Makefile.am.version-checks	2007-07-05 02:11:31.000000000 -0400
-+++ evolution-2.11.5/a11y/Makefile.am	2007-07-27 09:45:51.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.11.5/a11y/e-text/Makefile.am.version-checks	2007-07-05 02:11:30.000000000 -0400
-+++ evolution-2.11.5/a11y/e-text/Makefile.am	2007-07-27 09:45:51.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.11.5/a11y/e-table/Makefile.am.version-checks	2007-07-05 02:11:31.000000000 -0400
-+++ evolution-2.11.5/a11y/e-table/Makefile.am	2007-07-27 09:45:51.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.11.5/configure.in.version-checks	2007-07-27 09:45:32.000000000 -0400
-+++ evolution-2.11.5/configure.in	2007-07-27 09:45:51.000000000 -0400
-@@ -4,6 +4,34 @@ AC_PREREQ(2.52)
- AC_INIT(evolution, 2.11.5, 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
-@@ -133,6 +161,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 ******************************
-@@ -409,7 +458,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
-@@ -587,7 +636,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`
-@@ -604,7 +654,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"
-@@ -1217,27 +1267,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`"
-@@ -1245,11 +1280,7 @@ AC_CHECK_HEADERS(libgnomeui/gnome-icon-l
- AC_CHECK_HEADERS(libgnomeui/gnome-thumbnail.h)
- CPPFLAGS="$CPPFLAGS_save"
- 
--PKG_CHECK_MODULES(EXTRA_GNOME, $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"
-@@ -1279,7 +1310,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)
- 
-@@ -1292,33 +1323,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 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 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)
- AC_SUBST(LIBFILTER_CFLAGS)
- AC_SUBST(LIBFILTER_LIBS)
- 
-@@ -1345,14 +1376,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 gnome-vfs-2.0 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)
-@@ -1366,7 +1397,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"
-@@ -1390,7 +1421,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 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)
- 
-@@ -1402,7 +1433,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 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-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)
- 
-@@ -1425,7 +1456,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)
- 
-@@ -1644,7 +1675,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 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.11.5/widgets/misc/Makefile.am.version-checks	2007-07-05 02:11:06.000000000 -0400
-+++ evolution-2.11.5/widgets/misc/Makefile.am	2007-07-27 09:45:51.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)
- 
- 
-@@ -133,7 +133,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.11.5/widgets/table/Makefile.am.version-checks	2007-07-05 02:11:01.000000000 -0400
-+++ evolution-2.11.5/widgets/table/Makefile.am	2007-07-27 09:45:51.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.11.5/widgets/text/Makefile.am.version-checks	2007-07-05 02:10:57.000000000 -0400
-+++ evolution-2.11.5/widgets/text/Makefile.am	2007-07-27 09:45:51.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.11.5/tools/Makefile.am.version-checks	2007-07-05 02:06:57.000000000 -0400
-+++ evolution-2.11.5/tools/Makefile.am	2007-07-27 09:45:50.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
- 
diff --git a/evolution.spec b/evolution.spec
index 8854d8a..d2eb615 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.11.5
-Release: 3%{?dist}
+Version: 2.11.6.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -131,12 +131,6 @@ Patch33: evolution-2.10.0-e-passwords.patch
 # GNOME bug #417999
 Patch34: evolution-2.10.0-e-source-combo-box.patch
 
-# More implicit function declarations...
-Patch35: evolution-2.11.5-implicit-function-declarations.patch
-
-# GNOME bug #380534
-Patch36: evolution-2.11.5-version-checks.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -275,8 +269,6 @@ Development files needed for building things which link against evolution.
 %patch32 -p1 -b .view-message-source
 %patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
-%patch35 -p1 -b .implicit-function-declarations
-%patch36 -p1 -b .version-checks
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -617,6 +609,10 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-folder-permissions.xml
 %{evo_plugin_dir}/org-gnome-folder-subscription.xml
 
+%{evo_plugin_dir}/org-gnome-face.eplug
+%{evo_plugin_dir}/liborg-gnome-face.so
+%{evo_plugin_dir}/org-gnome-face-ui.xml
+
 %{evo_plugin_dir}/org-gnome-groupwise-features.eplug
 %{evo_plugin_dir}/liborg-gnome-groupwise-features.so
 %{evo_plugin_dir}/org-gnome-compose-send-options.xml
@@ -716,6 +712,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Aug 01 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.6.1-1.fc8
+- Update to 2.11.6.1
+
+* Tue Jul 31 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.6-1.fc8
+- Update to 2.11.6
+- Remove patch for GNOME bug #380534 (fixed upstream).
+
 * Fri Jul 27 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.5-3.fc8
 - Add patch for GNOME bug #380534 (clarify version requirements).
 
diff --git a/sources b/sources
index 4e51510..5ecdd52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-132ac3a9847a6588c46bd4db2743d96b  evolution-2.11.5.tar.bz2
+b27f011166d16b2484f9f68992c48108  evolution-2.11.6.1.tar.bz2