[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/evolution/devel .cvsignore, 1.69, 1.70 evolution-2.10.0-e-source-combo-box.patch, 1.1, 1.2 evolution-2.10.1-send-recv-dialog.patch, 1.1, 1.2 evolution-2.8.0-fix-indic-printing.patch, 1.4, 1.5 evolution-2.8.1-kill-ethread.patch, 1.5, 1.6 evolution.spec, 1.261, 1.262 sources, 1.69, 1.70 evolution-2.10.0-drop-old-glib-support.patch, 1.1, NONE evolution-2.10.0-shell-main-cleanups.patch, 1.1, NONE evolution-2.10.0-use-glib-i18n.patch, 1.3, NONE evolution-2.10.1-e-attachment-bar.patch, 1.1, NONE evolution-2.10.1-en_CA-attribution-format.patch, 1.1, NONE evolution-2.10.1-fix-uri-handling.patch, 1.2, NONE evolution-2.10.1-saving-attachments.patch, 1.1, NONE evolution-2.7.3-filter-datespec.patch, 1.3, NONE evolution-2.9.2-gtk-font-button.patch, 1.2, NONE evolution-2.9.3-gtk-color-button.patch, 1.2, NONE evolution-2.9.3-unread-messages.patch, 1.1, NONE



Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19026

Modified Files:
	.cvsignore evolution-2.10.0-e-source-combo-box.patch 
	evolution-2.10.1-send-recv-dialog.patch 
	evolution-2.8.0-fix-indic-printing.patch 
	evolution-2.8.1-kill-ethread.patch evolution.spec sources 
Removed Files:
	evolution-2.10.0-drop-old-glib-support.patch 
	evolution-2.10.0-shell-main-cleanups.patch 
	evolution-2.10.0-use-glib-i18n.patch 
	evolution-2.10.1-e-attachment-bar.patch 
	evolution-2.10.1-en_CA-attribution-format.patch 
	evolution-2.10.1-fix-uri-handling.patch 
	evolution-2.10.1-saving-attachments.patch 
	evolution-2.7.3-filter-datespec.patch 
	evolution-2.9.2-gtk-font-button.patch 
	evolution-2.9.3-gtk-color-button.patch 
	evolution-2.9.3-unread-messages.patch 
Log Message:

* Fri May 18 2007 Matthew Barnes <mbarnes redhat com> - 2.11.2-1.fc8
- Update to 2.11.2
- Bump evo_major to 2.12.
- Bump eds_version to 1.11.0.
- Update files with new plugins and icons.
- Remove patch for RH bug #190359 (fixed upstream).
- Remove patch for RH bug #218801 (fixed upstream).
- Remove patch for RH bug #234315 (fixed upstream).
- Remove patch for RH bug #236399 (fixed upstream).
- Remove patch for RH bug #236860 (fixed upstream).
- Remove patch for RH bug #238551 (fixed upstream).
- Remove patch for GNOME bug #373837 (fixed upstream).
- Remove patch for GNOME bug #373116 (fixed upstream).
- Remove patch for GNOME bug #418971 (fixed upstream).
- Remove patch for GNOME bug #419469 (fixed upstream).
- Remove patch for GNOME bug #419524 (fixed upstream).
- Remove evolution-2.6.0-prototypes.patch (obsolete).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	9 Apr 2007 18:09:26 -0000	1.69
+++ .cvsignore	19 May 2007 00:56:12 -0000	1.70
@@ -1 +1 @@
-evolution-2.10.1.tar.bz2
+evolution-2.11.2.tar.bz2

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

Index: evolution-2.10.0-e-source-combo-box.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.10.0-e-source-combo-box.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.10.0-e-source-combo-box.patch	15 Mar 2007 01:47:03 -0000	1.1
+++ evolution-2.10.0-e-source-combo-box.patch	19 May 2007 00:56:12 -0000	1.2
@@ -1,9 +1,9 @@
---- 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
+--- 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
 @@ -27,7 +27,7 @@
  
  #include <gtk/gtk.h>
- #include <libgnome/gnome-i18n.h>
+ #include <glib/gi18n.h>
 -#include <libedataserverui/e-source-option-menu.h>
 +#include <libedataserverui/e-source-combo-box.h>
  #include "e-pilot-settings.h"
@@ -40,8 +40,8 @@
  }
  
  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
+--- 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 @@
  #include <camel/camel-store.h>
  #include <libecal/e-cal.h>
@@ -51,8 +51,8 @@
  #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
+--- 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
 @@ -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>
-@@ -104,8 +104,8 @@
+@@ -103,8 +103,8 @@
  	char *description;
  
  	GtkWidget *selector_box;
@@ -73,7 +73,7 @@
  	ESourceList *source_list;
  	
  	GtkWidget *rsvp_box;
-@@ -1664,10 +1664,12 @@
+@@ -1671,10 +1671,12 @@
  }
  
  static void
@@ -89,7 +89,7 @@
  	g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
  }
  
-@@ -1684,40 +1686,42 @@
+@@ -1691,40 +1693,42 @@
  	if (priv->source_list)
  		g_object_unref (priv->source_list);
  
@@ -149,7 +149,7 @@
  }
  
  ESourceList *
-@@ -1743,10 +1747,11 @@
+@@ -1750,10 +1754,11 @@
  	
  	priv = view->priv;
  
@@ -163,7 +163,7 @@
  }
  
  ESource *
-@@ -1759,10 +1764,11 @@
+@@ -1766,10 +1771,11 @@
  	
  	priv = view->priv;
  	
@@ -177,8 +177,8 @@
  }
  
  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
+--- 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
 @@ -44,7 +44,7 @@
  #include <string.h>
  
@@ -188,8 +188,8 @@
  
  #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
+--- 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
 @@ -40,7 +40,7 @@
  #include <string.h>
  
@@ -259,8 +259,8 @@
  }
  
  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
+--- 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
 @@ -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.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
+--- 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
 @@ -33,7 +33,7 @@
  #include <gtk/gtktogglebutton.h>
  #include <gtk/gtkdialog.h>
@@ -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.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
+--- 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
 @@ -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.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
+--- 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
 @@ -46,7 +46,7 @@
  #include <text/e-entry.h>
  
@@ -415,7 +415,7 @@
  
  #include <camel/camel.h>
  
-@@ -590,15 +590,16 @@
+@@ -589,15 +589,16 @@
  fill_in_source_field (EContactEditor *editor)
  {
  	GtkWidget *source_menu;
@@ -436,7 +436,7 @@
  }
  
  static void
-@@ -2525,13 +2526,15 @@
+@@ -2521,13 +2522,15 @@
  	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);
-@@ -2555,8 +2558,12 @@
+@@ -2551,8 +2554,12 @@
  }
  
  static void
@@ -470,7 +470,7 @@
  	cancel_load (editor);
  
  	if (e_source_equal (e_book_get_source (editor->target_book), source))
-@@ -3330,8 +3337,8 @@
+@@ -3323,8 +3330,8 @@
  	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");
-@@ -3782,25 +3789,25 @@
+@@ -3775,25 +3782,25 @@
  }
  
  GtkWidget *
@@ -517,8 +517,8 @@
 +	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
+--- 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
 @@ -37,7 +37,7 @@
  #include <libgnomeui/gnome-app.h>
  #include <libebook/e-book.h>
@@ -542,7 +542,7 @@
  	if (qa->book) {
  		g_object_unref (qa->book);
  		qa->book = NULL;
-@@ -317,16 +321,20 @@
+@@ -316,16 +320,20 @@
  
  	gconf_client = gconf_client_get_default ();
  	source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
@@ -567,8 +567,8 @@
  	
  	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
+--- 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
 @@ -141,7 +141,7 @@
  		  <child>
  		    <widget class="Custom" id="source">
@@ -578,8 +578,8 @@
  		      <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
+--- 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 @@
  		      <child>
  			<widget class="Custom" id="source">
@@ -589,8 +589,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.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
+--- 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
 @@ -618,7 +618,7 @@
  			<widget class="Custom" id="source">
  			  <property name="height_request">24</property>
@@ -600,11 +600,11 @@
  			  <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
+--- 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
 @@ -35,7 +35,7 @@
  #include <gtk/gtkmessagedialog.h>
- #include <libgnome/gnome-i18n.h>
+ #include <glib/gi18n.h>
  #include <glade/glade.h>
 -#include <libedataserverui/e-source-option-menu.h>
 +#include <libedataserverui/e-source-combo-box.h>
@@ -631,7 +631,7 @@
  
  	priv->updating = FALSE;
  
-@@ -844,13 +844,12 @@
+@@ -842,13 +842,12 @@
  }
  
  static void
@@ -649,7 +649,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -862,8 +861,9 @@
+@@ -860,8 +859,9 @@
  			if (client)
  				g_object_unref (client);
  
@@ -661,7 +661,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -973,7 +973,7 @@
+@@ -971,7 +971,7 @@
  			    G_CALLBACK (categories_clicked_cb), mpage);
  
  	/* Source selector */
@@ -670,7 +670,7 @@
  			 G_CALLBACK (source_changed_cb), mpage);
  	
  	/* Connect the default signal handler to use to make sure the "changed"
-@@ -1167,21 +1167,22 @@
+@@ -1165,21 +1165,22 @@
  	return dedit;
  }
  
@@ -700,18 +700,18 @@
 +	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
+--- 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
 @@ -33,7 +33,7 @@
  #include <gdk/gdkkeysyms.h>
- #include <libgnome/gnome-i18n.h>
+ #include <glib/gi18n.h>
  #include <glade/glade.h>
 -#include <libedataserverui/e-source-option-menu.h>
 +#include <libedataserverui/e-source-combo-box.h>
  #include "common/authentication.h"
  #include "e-util/e-categories-config.h"
  #include "e-util/e-dialog-widgets.h"
-@@ -967,7 +967,6 @@
+@@ -969,7 +969,6 @@
  	ECalComponentDateTime start_date, end_date;
  	const char *location, *uid = NULL;
  	const char *categories;
@@ -719,7 +719,7 @@
  	GSList *l;
  	gboolean validated = TRUE;
  	
-@@ -1163,8 +1162,9 @@
+@@ -1165,8 +1164,9 @@
  	e_dialog_editable_set (priv->categories, categories);
  	
  	/* Source */
@@ -812,11 +812,11 @@
  }
  
  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
+--- 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
 @@ -35,7 +35,7 @@
  #include <gtk/gtkmessagedialog.h>
- #include <libgnome/gnome-i18n.h>
+ #include <glib/gi18n.h>
  #include <glade/glade.h>
 -#include <libedataserverui/e-source-option-menu.h>
 +#include <libedataserverui/e-source-combo-box.h>
@@ -843,7 +843,7 @@
  
  	if (priv->is_assignment) {
  		ECalComponentOrganizer organizer;	
-@@ -1617,13 +1617,12 @@
+@@ -1615,13 +1615,12 @@
  }
  
  static void
@@ -861,7 +861,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -1642,8 +1641,9 @@
+@@ -1640,8 +1639,9 @@
  			if (client)
  				g_object_unref (client);
  
@@ -873,7 +873,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -1655,7 +1655,7 @@
+@@ -1653,7 +1653,7 @@
  			comp_editor_notify_client_changed (
  				COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
  				client);
@@ -882,7 +882,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 @@
+@@ -1677,7 +1677,8 @@
  	if (!priv->sod) {
  		priv->sod = e_sendoptions_dialog_new ();
  		priv->sod->data->initialized = TRUE;
@@ -892,7 +892,7 @@
  		e_sendoptions_utils_set_default_data (priv->sod, source, "task");
  	}
  	
-@@ -1734,7 +1735,7 @@
+@@ -1732,7 +1733,7 @@
  			    G_CALLBACK (categories_clicked_cb), tpage);
  	
  	/* Source selector */
@@ -901,7 +901,7 @@
  			 G_CALLBACK (source_changed_cb), tpage);
  
  	/* Connect the default signal handler to use to make sure the "changed"
-@@ -1955,21 +1956,22 @@
+@@ -1953,21 +1954,22 @@
  	return dedit;
  }
  
@@ -931,8 +931,8 @@
 +	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
+--- 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
 @@ -44,7 +44,7 @@
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <gtkhtml/gtkhtml-stream.h>

evolution-2.10.1-send-recv-dialog.patch:

Index: evolution-2.10.1-send-recv-dialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.10.1-send-recv-dialog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.10.1-send-recv-dialog.patch	15 May 2007 19:18:49 -0000	1.1
+++ evolution-2.10.1-send-recv-dialog.patch	19 May 2007 00:56:12 -0000	1.2
@@ -1,10 +1,10 @@
---- evolution-2.10.1/mail/mail-send-recv.c.send-recv-dialog	2007-05-15 14:26:24.000000000 -0400
-+++ evolution-2.10.1/mail/mail-send-recv.c	2007-05-15 14:30:51.000000000 -0400
-@@ -312,21 +312,6 @@
+--- evolution-2.11.2/mail/mail-send-recv.c.send-recv-dialog	2007-05-18 16:03:24.000000000 -0400
++++ evolution-2.11.2/mail/mail-send-recv.c	2007-05-18 16:08:58.000000000 -0400
+@@ -362,23 +362,6 @@
  	return SEND_INVALID;
  }
  
--gboolean
+-static gboolean
 -dialog_map (GtkWidget *window, GdkEvent  *event, GtkWidget *table)
 -{
 -	int h, w;
@@ -16,66 +16,82 @@
 -		w = 750;
 -	if (h > 400)
 -		h = 400;
--	gtk_widget_set_usize (window, w, h);
+-	gtk_widget_set_size_request (window, w, h);
+-
+-	return FALSE;
 -}
 -
  static struct _send_data *
  build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destination)
  {
-@@ -385,7 +370,7 @@
- 
+@@ -444,7 +427,7 @@
  	scrolled_window = gtk_scrolled_window_new (NULL, NULL);	
- 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
--					GTK_POLICY_AUTOMATIC,
-+					GTK_POLICY_NEVER,
- 					GTK_POLICY_AUTOMATIC);
+ 	gtk_scrolled_window_set_policy (
+ 		GTK_SCROLLED_WINDOW (scrolled_window),
+-		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
++		GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
  
- 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), table);
-@@ -443,6 +428,7 @@
- 		recv_icon = e_icon_factory_get_image ("stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR);
+ 	gtk_scrolled_window_add_with_viewport (
+ 		GTK_SCROLLED_WINDOW (scrolled_window), table);
+@@ -504,6 +487,8 @@
+ 			"stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR);
  	       	pretty_url = format_url (source->url, account->name);
- 		label = (GtkLabel *)gtk_label_new (NULL);
-+		gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
- 		gtk_label_set_markup (label, pretty_url);
+ 		label = gtk_label_new (NULL);
++		gtk_label_set_ellipsize (
++			GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+ 		gtk_label_set_markup (GTK_LABEL (label), pretty_url);
  		g_free (pretty_url);
  		
-@@ -457,10 +443,10 @@
- 		gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
- 		gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5);
+@@ -522,16 +507,16 @@
  		
--	        gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-+	        gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, 0, 0, 0, 0);
- 		gtk_table_attach (table, (GtkWidget *)label, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
--		gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
--		gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-+		gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, 0, 0, 0, 0);
-+		gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, 0, 0, 0, 0);
- 		gtk_table_attach (table, (GtkWidget *)status_label, 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
- 		
- 		info->bar = bar;
-@@ -496,6 +482,7 @@
- 		send_icon = e_icon_factory_get_image ("stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR);
+ 	        gtk_table_attach (
+ 			GTK_TABLE (table), recv_icon,
+-			0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
++			0, 1, row, row+2, 0, 0, 0, 0);
+ 		gtk_table_attach (
+ 			GTK_TABLE (table), label,
+ 			1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ 		gtk_table_attach (
+ 			GTK_TABLE (table), progress_bar,
+-			2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
++			2, 3, row, row+2, 0, 0, 0, 0);
+ 		gtk_table_attach (
+ 			GTK_TABLE (table), cancel_button,
+-			3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
++			3, 4, row, row+2, 0, 0, 0, 0);
+ 		gtk_table_attach (
+ 			GTK_TABLE (table), status_label,
+ 			1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+@@ -572,6 +557,8 @@
+ 			"stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR);
  		pretty_url = format_url (destination, NULL);
- 		label = (GtkLabel *)gtk_label_new (NULL);
-+		gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
- 		gtk_label_set_markup (label, pretty_url);
+ 		label = gtk_label_new (NULL);
++		gtk_label_set_ellipsize (
++			GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+ 		gtk_label_set_markup (GTK_LABEL (label), pretty_url);
  
  		g_free (pretty_url);
-@@ -508,10 +495,10 @@
- 		gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
- 		gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5);
- 		
--		gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-+		gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, 0, 0, 0, 0);
- 		gtk_table_attach (table, GTK_WIDGET (label), 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
--		gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
--		gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-+		gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, 0, 0, 0, 0);
-+		gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, 0, 0, 0, 0);
- 		gtk_table_attach (table, GTK_WIDGET (status_label), 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+@@ -587,16 +574,16 @@
  		
- 		info->bar = bar;
-@@ -526,7 +513,6 @@
+ 		gtk_table_attach (
+ 			GTK_TABLE (table), send_icon,
+-			0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
++			0, 1, row, row+2, 0, 0, 0, 0);
+ 		gtk_table_attach (
+ 			GTK_TABLE (table), label,
+ 			1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ 		gtk_table_attach (
+ 			GTK_TABLE (table), progress_bar,
+-			2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
++			2, 3, row, row+2, 0, 0, 0, 0);
+ 		gtk_table_attach (
+ 			GTK_TABLE (table), cancel_button,
+-			3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
++			3, 4, row, row+2, 0, 0, 0, 0);
+ 		gtk_table_attach (
+ 			GTK_TABLE (table), status_label,
+ 			1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+@@ -615,7 +602,6 @@
  	gtk_widget_show (GTK_WIDGET (gd));
  	
  	g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data);

evolution-2.8.0-fix-indic-printing.patch:

Index: evolution-2.8.0-fix-indic-printing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.8.0-fix-indic-printing.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evolution-2.8.0-fix-indic-printing.patch	12 Feb 2007 19:40:06 -0000	1.4
+++ evolution-2.8.0-fix-indic-printing.patch	19 May 2007 00:56:12 -0000	1.5
@@ -1,25 +1,16 @@
---- evolution-2.9.91/plugins/print-message/print-message.c.fix-indic-printing	2007-02-12 01:58:01.000000000 -0500
-+++ evolution-2.9.91/plugins/print-message/print-message.c	2007-02-12 13:30:17.000000000 -0500
-@@ -83,7 +83,7 @@
- 	data->config = e_print_load_settings ();
- 	data->preview = 0;
- 	
--	data->msg = e_msg_composer_get_message (composer, 1);
-+	data->msg = e_msg_composer_get_message_print (composer, 1);
- 	dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), 0, data->config);
- 	gtk_dialog_set_default_response(dialog, GTK_RESPONSE_OK);
- 	e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer);
-@@ -102,7 +102,7 @@
- 	data->config = e_print_load_settings ();
- 	data->preview = 0;
- 	
--	data->msg = e_msg_composer_get_message (composer, 1);
-+	data->msg = e_msg_composer_get_message_print (composer, 1);
+--- evolution-2.11.2/plugins/print-message/print-message.c.fix-indic-printing	2007-05-13 13:41:09.000000000 -0400
++++ evolution-2.11.2/plugins/print-message/print-message.c	2007-05-18 15:32:12.000000000 -0400
+@@ -65,7 +65,7 @@
+ 	EMFormatHTMLPrint *efhp;
  
- 	print_response(NULL, GTK_RESPONSE_APPLY, data);
- }
---- evolution-2.9.91/composer/e-msg-composer.h.fix-indic-printing	2007-01-22 10:23:06.000000000 -0500
-+++ evolution-2.9.91/composer/e-msg-composer.h	2007-02-12 13:29:24.000000000 -0500
+ 	action = GTK_PRINT_OPERATION_ACTION_PREVIEW;
+-	message = e_msg_composer_get_message (composer, 1);
++	message = e_msg_composer_get_message_print (composer, 1);
+ 
+ 	efhp = em_format_html_print_new (NULL, action);
+ 	em_format_html_print_raw_message (efhp, message);
+--- evolution-2.11.2/composer/e-msg-composer.h.fix-indic-printing	2007-04-18 06:17:34.000000000 -0400
++++ evolution-2.11.2/composer/e-msg-composer.h	2007-05-18 15:30:56.000000000 -0400
 @@ -101,6 +101,8 @@
  									  CamelMimePart     *part);
  CamelMimeMessage        *e_msg_composer_get_message                      (EMsgComposer      *composer,
@@ -29,9 +20,9 @@
  CamelMimeMessage        *e_msg_composer_get_message_draft                (EMsgComposer      *composer);
  void                     e_msg_composer_show_sig_file                    (EMsgComposer      *composer);
  gboolean                 e_msg_composer_get_send_html                    (EMsgComposer      *composer);
---- evolution-2.9.91/composer/e-msg-composer.c.fix-indic-printing	2007-02-12 13:29:24.000000000 -0500
-+++ evolution-2.9.91/composer/e-msg-composer.c	2007-02-12 13:29:24.000000000 -0500
-@@ -5267,6 +5267,49 @@
+--- evolution-2.11.2/composer/e-msg-composer.c.fix-indic-printing	2007-04-18 06:17:34.000000000 -0400
++++ evolution-2.11.2/composer/e-msg-composer.c	2007-05-18 15:30:56.000000000 -0400
+@@ -5273,6 +5273,49 @@
  }
  
  CamelMimeMessage *

evolution-2.8.1-kill-ethread.patch:

Index: evolution-2.8.1-kill-ethread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.8.1-kill-ethread.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- evolution-2.8.1-kill-ethread.patch	16 May 2007 21:08:37 -0000	1.5
+++ evolution-2.8.1-kill-ethread.patch	19 May 2007 00:56:12 -0000	1.6
@@ -1,6 +1,6 @@
---- evolution-2.10.1/mail/mail-send-recv.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-send-recv.c	2007-05-16 16:17:38.000000000 -0400
-@@ -725,23 +725,22 @@
+--- evolution-2.11.2/mail/mail-send-recv.c.kill-ethread	2007-04-20 00:28:22.000000000 -0400
++++ evolution-2.11.2/mail/mail-send-recv.c	2007-05-18 15:34:09.000000000 -0400
+@@ -778,23 +778,22 @@
  /* ********************************************************************** */
  
  struct _refresh_folders_msg {
@@ -27,8 +27,8 @@
 -	struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
  	int i;
  	CamelFolder *folder;
- 
-@@ -757,17 +756,14 @@
+ 	CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+@@ -812,17 +811,14 @@
  }
  
  static void
@@ -48,7 +48,7 @@
  	int i;
  
  	for (i=0;i<m->folders->len;i++)
-@@ -776,11 +772,12 @@
+@@ -831,11 +827,12 @@
  	camel_object_unref(m->store);
  }
  
@@ -66,7 +66,7 @@
  };
  
  static void
-@@ -813,13 +810,13 @@
+@@ -868,13 +865,13 @@
  
  		get_folders(store, folders, info);
  
@@ -82,9 +82,9 @@
  	} else {
  		receive_done ("", data);
  	}
---- evolution-2.10.1/mail/mail-component.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-component.c	2007-05-16 16:17:38.000000000 -0400
-@@ -965,7 +965,7 @@
+--- evolution-2.11.2/mail/mail-component.c.kill-ethread	2007-05-13 13:41:10.000000000 -0400
++++ evolution-2.11.2/mail/mail-component.c	2007-05-18 15:34:09.000000000 -0400
+@@ -1014,7 +1014,7 @@
  		if (camel_url_get_param(url, "uid") != NULL) {
  			char *curi = em_uri_to_camel(uri);
  
@@ -93,8 +93,8 @@
  			g_free(curi);
  		} else {
  			g_warning("email uri's must include a uid parameter");
---- evolution-2.10.1/mail/mail-ops.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-ops.c	2007-05-16 16:19:33.000000000 -0400
+--- evolution-2.11.2/mail/mail-ops.c.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/mail-ops.c	2007-05-18 15:34:09.000000000 -0400
 @@ -75,7 +75,7 @@
  /* used for both just filtering a folder + uid's, and for filtering a whole folder */
  /* used both for fetching mail, and for filtering mail */
@@ -1464,7 +1464,7 @@
  	camel_object_ref(folder);
  	m->uid = g_strdup(uid);
 @@ -1795,37 +1741,37 @@
- 	m->done = done;
+ 	m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done;
  	m->cancel = camel_operation_new(NULL, NULL);
  	
 -	e_thread_put(thread, (EMsg *)m);
@@ -1514,7 +1514,7 @@
  	camel_object_ref(folder);
  	m->uid = g_strdup(uid);
 @@ -1833,13 +1779,13 @@
- 	m->done = done;
+ 	m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done;
  	m->cancel = camel_operation_new(NULL, NULL);
  	
 -	e_thread_put(thread, (EMsg *)m);
@@ -2142,8 +2142,8 @@
  
  	return id;
  }
---- evolution-2.10.1/mail/em-folder-utils.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/em-folder-utils.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/em-folder-utils.c.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/em-folder-utils.c	2007-05-18 15:34:09.000000000 -0400
 @@ -84,7 +84,7 @@
  }
  
@@ -2371,8 +2371,8 @@
  	
  	return id;
  }
---- evolution-2.10.1/mail/importers/elm-importer.c.kill-ethread	2007-04-09 09:09:26.000000000 -0400
-+++ evolution-2.10.1/mail/importers/elm-importer.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/importers/elm-importer.c.kill-ethread	2007-04-18 06:17:29.000000000 -0400
++++ evolution-2.11.2/mail/importers/elm-importer.c	2007-05-18 15:34:09.000000000 -0400
 @@ -51,7 +51,7 @@
  #define d(x) x
  
@@ -2471,8 +2471,8 @@
  
  	return id;
  }
---- evolution-2.10.1/mail/importers/mail-importer.c.kill-ethread	2007-04-09 09:09:26.000000000 -0400
-+++ evolution-2.10.1/mail/importers/mail-importer.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/importers/mail-importer.c.kill-ethread	2007-04-18 06:17:29.000000000 -0400
++++ evolution-2.11.2/mail/importers/mail-importer.c	2007-05-18 15:34:09.000000000 -0400
 @@ -132,7 +132,7 @@
  }
  
@@ -2609,8 +2609,8 @@
  }
  
  struct _import_folders_data {
---- evolution-2.10.1/mail/importers/pine-importer.c.kill-ethread	2007-04-09 09:09:26.000000000 -0400
-+++ evolution-2.10.1/mail/importers/pine-importer.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/importers/pine-importer.c.kill-ethread	2007-04-18 06:17:29.000000000 -0400
++++ evolution-2.11.2/mail/importers/pine-importer.c	2007-05-18 15:34:09.000000000 -0400
 @@ -56,7 +56,7 @@
  #define d(x) x
  
@@ -2710,8 +2710,8 @@
  
  	return id;
  }
---- evolution-2.10.1/mail/mail-vfolder.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-vfolder.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/mail-vfolder.c.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/mail-vfolder.c	2007-05-18 15:34:09.000000000 -0400
 @@ -21,7 +21,7 @@
   */
  
@@ -2946,9 +2946,9 @@
  
  	from = em_uri_from_camel(cfrom);
  	to = em_uri_from_camel(cto);
---- evolution-2.10.1/mail/em-format-html.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/em-format-html.c	2007-05-16 16:17:38.000000000 -0400
-@@ -166,7 +166,7 @@
+--- evolution-2.11.2/mail/em-format-html.c.kill-ethread	2007-04-20 00:28:22.000000000 -0400
++++ evolution-2.11.2/mail/em-format-html.c	2007-05-18 15:34:09.000000000 -0400
+@@ -165,7 +165,7 @@
  	if (efh->priv->format_timeout_id != 0) {
  		g_source_remove(efh->priv->format_timeout_id);
  		efh->priv->format_timeout_id = 0;
@@ -2957,7 +2957,7 @@
  		efh->priv->format_timeout_msg = NULL;
  	}
  
-@@ -1180,7 +1180,7 @@
+@@ -1179,7 +1179,7 @@
  
  /* Sigh, this is so we have a cancellable, async rendering thread */
  struct _format_msg {
@@ -2966,7 +2966,7 @@
  
  	EMFormatHTML *format;
  	EMFormat *format_source;
-@@ -1190,14 +1190,15 @@
+@@ -1189,14 +1189,15 @@
  	CamelMimeMessage *message;
  };
  
@@ -2985,7 +2985,7 @@
  	struct _EMFormatHTMLJob *job;
  	struct _EMFormatPURITree *puri_level;
  	int cancelled = FALSE;
-@@ -1282,10 +1283,9 @@
+@@ -1281,10 +1282,9 @@
  	((EMFormat *)m->format)->pending_uri_level = puri_level;
  }
  
@@ -2998,7 +2998,7 @@
  	d(printf("formatting finished\n"));
  
  	m->format->load_http_now = FALSE;
-@@ -1293,10 +1293,9 @@
+@@ -1292,10 +1292,9 @@
  	g_signal_emit_by_name(m->format, "complete");
  }
  
@@ -3011,7 +3011,7 @@
  	d(printf("formatter freed\n"));
  	g_object_unref(m->format);
  	if (m->estream) {
-@@ -1312,11 +1311,12 @@
+@@ -1311,11 +1310,12 @@
  		g_object_unref(m->format_source);
  }
  
@@ -3029,7 +3029,7 @@
  };
  
  static gboolean
-@@ -1327,7 +1327,7 @@
+@@ -1326,7 +1326,7 @@
  	struct _EMFormatHTMLPrivate *p = efh->priv;
  
  	if (m->format->html == NULL) {
@@ -3038,7 +3038,7 @@
  		return FALSE;
  	}
  
-@@ -1355,7 +1355,7 @@
+@@ -1354,7 +1354,7 @@
  	if (m->message == NULL) {
  		hstream = gtk_html_begin(efh->html);
  		gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK);
@@ -3047,7 +3047,7 @@
  		p->last_part = NULL;
  	} else {
  		hstream = NULL;
-@@ -1374,8 +1374,8 @@
+@@ -1373,8 +1373,8 @@
  			p->last_part = m->message;
  		}
  		
@@ -3058,7 +3058,7 @@
  	}
  
  	efh->priv->format_timeout_id = 0;
-@@ -1399,11 +1399,11 @@
+@@ -1398,11 +1398,11 @@
  		d(printf(" timeout for last still active, removing ...\n"));
  		g_source_remove(efh->priv->format_timeout_id);
  		efh->priv->format_timeout_id = 0;
@@ -3072,8 +3072,8 @@
  	m->format = (EMFormatHTML *)emf;
  	g_object_ref(emf);
  	m->format_source = emfsource;
---- evolution-2.10.1/mail/em-folder-properties.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/em-folder-properties.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/em-folder-properties.c.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/em-folder-properties.c	2007-05-18 15:34:09.000000000 -0400
 @@ -386,7 +386,7 @@
  	}
  
@@ -3083,8 +3083,8 @@
  	else
  		emfp_dialog_got_folder((char *)uri, folder, NULL);
  }
---- evolution-2.10.1/mail/em-folder-tree.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/em-folder-tree.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/em-folder-tree.c.kill-ethread	2007-05-13 13:41:10.000000000 -0400
++++ evolution-2.11.2/mail/em-folder-tree.c	2007-05-18 15:34:09.000000000 -0400
 @@ -834,7 +834,7 @@
  /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */
  /* Drop handling */
@@ -3304,7 +3304,7 @@
  };
  
  static void
-@@ -1906,7 +1898,7 @@
+@@ -1909,7 +1901,7 @@
  
  	gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1);
  	
@@ -3313,7 +3313,7 @@
  	m->root = gtk_tree_row_reference_new (model, tree_path);
  	camel_object_ref (store);
  	m->store = store;
-@@ -1915,7 +1907,7 @@
+@@ -1918,7 +1910,7 @@
  	m->top = full_name;
  	m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST;
  	
@@ -3322,9 +3322,9 @@
  }
  
  static gboolean
---- evolution-2.10.1/mail/em-folder-browser.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/em-folder-browser.c	2007-05-16 16:17:38.000000000 -0400
-@@ -838,7 +838,7 @@
+--- evolution-2.11.2/mail/em-folder-browser.c.kill-ethread	2007-05-13 13:41:10.000000000 -0400
++++ evolution-2.11.2/mail/em-folder-browser.c	2007-05-18 15:34:09.000000000 -0400
+@@ -839,7 +839,7 @@
  
  
  struct _setup_msg {
@@ -3333,7 +3333,7 @@
  
  	CamelFolder *folder;
  	char *query;
-@@ -846,16 +846,15 @@
+@@ -847,16 +847,15 @@
  	GList *sources_folder;
  };
  
@@ -3353,7 +3353,7 @@
  	GList *l, *list = NULL;
  	CamelFolder *folder;
  
-@@ -866,12 +865,12 @@
+@@ -867,12 +866,12 @@
  	l = m->sources_uri;
  	while (l) {
  		d(printf(" Adding uri: %s\n", (char *)l->data));
@@ -3368,7 +3368,7 @@
  		}
  		l = l->next;
  	}
-@@ -895,17 +894,13 @@
+@@ -896,17 +895,13 @@
  }
  
  static void
@@ -3388,7 +3388,7 @@
  	GList *l;
  
  	camel_object_unref(m->folder);
-@@ -926,11 +921,12 @@
+@@ -927,11 +922,12 @@
  	g_list_free(m->sources_folder);
  }
  
@@ -3406,7 +3406,7 @@
  };
  
  /* sources_uri should be camel uri's */
-@@ -940,15 +936,15 @@
+@@ -941,15 +937,15 @@
  	struct _setup_msg *m;
  	int id;
  	
@@ -3425,9 +3425,9 @@
  
  	return id;
  }
---- evolution-2.10.1/mail/message-list.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/message-list.c	2007-05-16 16:17:38.000000000 -0400
-@@ -1802,7 +1802,7 @@
+--- evolution-2.11.2/mail/message-list.c.kill-ethread	2007-05-10 05:27:32.000000000 -0400
++++ evolution-2.11.2/mail/message-list.c	2007-05-18 15:34:09.000000000 -0400
+@@ -1801,7 +1801,7 @@
  /* TODO: merge this with the folder tree stuff via empopup targets */
  /* Drop handling */
  struct _drop_msg {
@@ -3436,7 +3436,7 @@
  	
  	GdkDragContext *context;
  
-@@ -1819,11 +1819,9 @@
+@@ -1818,11 +1818,9 @@
  	unsigned int aborted:1;
  };
  
@@ -3450,7 +3450,7 @@
  	if (m->move)
  		return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name);
  	else
-@@ -1831,13 +1829,11 @@
+@@ -1830,13 +1828,11 @@
  }
  
  static void
@@ -3466,7 +3466,7 @@
  		break;
  	case DND_MESSAGE_RFC822:
  		em_utils_selection_get_message(m->selection, m->folder);
-@@ -1849,9 +1845,8 @@
+@@ -1848,9 +1844,8 @@
  }
  
  static void
@@ -3477,7 +3477,7 @@
  	gboolean success, delete;
  	
  	/* ?? */
-@@ -1859,7 +1854,7 @@
+@@ -1858,7 +1853,7 @@
  		success = FALSE;
  		delete = FALSE;
  	} else {
@@ -3486,7 +3486,7 @@
  		delete = success && m->move && !m->moved;
  	}
  
-@@ -1867,10 +1862,8 @@
+@@ -1866,10 +1861,8 @@
  }
  
  static void
@@ -3498,7 +3498,7 @@
  	g_object_unref(m->context);
  	camel_object_unref(m->folder);
  
-@@ -1878,18 +1871,19 @@
+@@ -1877,18 +1870,19 @@
  	g_free(m->selection);
  }
  
@@ -3524,7 +3524,7 @@
  }
  
  static void
-@@ -1916,7 +1910,7 @@
+@@ -1915,7 +1909,7 @@
  	struct _drop_msg *m = data;
  
  	m->aborted = TRUE;
@@ -3533,7 +3533,7 @@
  }
  
  static EPopupItem ml_drop_popup_menu[] = {
-@@ -1946,7 +1940,7 @@
+@@ -1945,7 +1939,7 @@
  	if (data->data == NULL || data->length == -1)
  		return;
  
@@ -3542,7 +3542,7 @@
  	m->context = context;
  	g_object_ref(context);
  	m->folder = ml->folder;
-@@ -3676,7 +3670,7 @@
+@@ -3674,7 +3668,7 @@
  
  /* ** REGENERATE MESSAGELIST ********************************************** */
  struct _regen_list_msg {
@@ -3551,7 +3551,7 @@
  
  	int complete;
  
-@@ -3704,16 +3698,15 @@
+@@ -3702,16 +3696,15 @@
  
   */
  
@@ -3571,7 +3571,7 @@
  	GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL;
  	CamelMessageInfo *info;
  	int i;
-@@ -3743,7 +3736,7 @@
+@@ -3741,7 +3734,7 @@
  			} else
  				expr = "(match-all (not (system-flag \"deleted\")))";
  		}
@@ -3580,7 +3580,7 @@
  	} else {
  		char *expr;
  
-@@ -3753,23 +3746,23 @@
+@@ -3751,23 +3744,23 @@
  				sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search);
  			} else
  				expr = "(match-all (not (system-flag \"junk\")))";
@@ -3609,7 +3609,7 @@
  		
  		if (uidnew) {
  			MESSAGE_LIST_LOCK(m->ml, hide_lock);
-@@ -3844,7 +3837,7 @@
+@@ -3842,7 +3835,7 @@
  
  	e_profile_event_emit("list.threaduids", m->folder->full_name, 0);
  	
@@ -3618,7 +3618,7 @@
  		/* update/build a new tree */
  		if (m->dotree) {
  			if (m->tree)
-@@ -3873,17 +3866,15 @@
+@@ -3871,17 +3864,15 @@
  }
  
  static void
@@ -3638,7 +3638,7 @@
  		return;
  
  	if (m->ml->folder != m->folder)
-@@ -3934,9 +3925,8 @@
+@@ -3932,9 +3923,8 @@
  }
  
  static void
@@ -3649,7 +3649,7 @@
  	int i;
  
  	e_profile_event_emit("list.regenerated", m->folder->full_name, 0);
-@@ -3964,11 +3954,12 @@
+@@ -3962,11 +3952,12 @@
  	g_object_unref(m->ml);
  }
  
@@ -3667,7 +3667,7 @@
  };
  
  static gboolean
-@@ -3978,7 +3969,7 @@
+@@ -3976,7 +3967,7 @@
  
  	m->ml->regen = g_list_prepend(m->ml->regen, m);
  	/* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */
@@ -3676,7 +3676,7 @@
  
  	m->ml->regen_timeout_msg = NULL;
  	m->ml->regen_timeout_id = 0;
-@@ -3994,7 +3985,7 @@
+@@ -3992,7 +3983,7 @@
  		GList *l = ml->regen;
  		
  		while (l) {
@@ -3685,7 +3685,7 @@
  			
  			if (mm->cancel)
  				camel_operation_cancel(mm->cancel);
-@@ -4006,7 +3997,7 @@
+@@ -4004,7 +3995,7 @@
  	if (ml->regen_timeout_id) {
  		g_source_remove(ml->regen_timeout_id);
  		ml->regen_timeout_id = 0;
@@ -3694,7 +3694,7 @@
  		ml->regen_timeout_msg = NULL;
  	}
  }
-@@ -4041,7 +4032,7 @@
+@@ -4039,7 +4030,7 @@
  	}
  #endif
  
@@ -3703,8 +3703,8 @@
  	m->ml = ml;
  	m->search = g_strdup (search);
  	m->hideexpr = g_strdup (hideexpr);
---- evolution-2.10.1/mail/em-sync-stream.h.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/em-sync-stream.h	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/em-sync-stream.h.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/em-sync-stream.h	2007-05-18 15:34:09.000000000 -0400
 @@ -29,41 +29,45 @@
  #ifndef EM_SYNC_STREAM_H
  #define EM_SYNC_STREAM_H
@@ -3781,19 +3781,19 @@
 +G_END_DECLS
  
  #endif /* EM_SYNC_STREAM_H */
---- evolution-2.10.1/mail/em-format-html-print.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/em-format-html-print.c	2007-05-16 16:17:38.000000000 -0400
-@@ -262,7 +262,7 @@
- 		g_object_ref(source);
- 	g_object_ref(efhp);
- 
--	mail_get_message(folder, uid, emfhp_got_message, efhp, mail_thread_new);
-+	mail_get_message(folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push);
- 
- 	return 0;		/* damn async ... */
+--- evolution-2.11.2/mail/em-format-html-print.c.kill-ethread	2007-04-22 13:20:08.000000000 -0400
++++ evolution-2.11.2/mail/em-format-html-print.c	2007-05-18 15:38:28.000000000 -0400
+@@ -224,7 +224,7 @@
+ 	g_object_ref (efhp);
+ 
+ 	mail_get_message (
+-		folder, uid, emfhp_got_message, efhp, mail_thread_new);
++		folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push);
  }
---- evolution-2.10.1/mail/em-sync-stream.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/em-sync-stream.c	2007-05-16 16:17:38.000000000 -0400
+ 
+ void
+--- evolution-2.11.2/mail/em-sync-stream.c.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/em-sync-stream.c	2007-05-18 15:34:09.000000000 -0400
 @@ -25,42 +25,17 @@
  #include <config.h>
  #endif
@@ -4219,8 +4219,8 @@
 +		g_string_free (emss->buffer, TRUE);
 +	emss->buffer = g_string_sized_new (size);
  }
---- evolution-2.10.1/mail/em-subscribe-editor.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/em-subscribe-editor.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/em-subscribe-editor.c.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/em-subscribe-editor.c	2007-05-18 15:34:09.000000000 -0400
 @@ -175,7 +175,7 @@
  /* ** Subscribe folder operation **************************************** */
  
@@ -4436,8 +4436,8 @@
  
  	sub_unref(sub);
  }
---- evolution-2.10.1/mail/mail-mt.h.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-mt.h	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/mail-mt.h.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/mail-mt.h	2007-05-18 15:34:09.000000000 -0400
 @@ -23,43 +23,60 @@
  #ifndef _MAIL_MT
  #define _MAIL_MT
@@ -4542,8 +4542,8 @@
  /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */
  /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */
  extern MailAsyncEvent *mail_async_event;
---- evolution-2.10.1/mail/mail-ops.h.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-ops.h	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/mail-ops.h.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/mail-ops.h	2007-05-18 15:34:09.000000000 -0400
 @@ -30,13 +30,14 @@
  #pragma }
  #endif /* __cplusplus */
@@ -4584,8 +4584,8 @@
  
  /* and for a store */
  int mail_get_store (const char *uri, CamelOperation *op,
---- evolution-2.10.1/mail/em-composer-utils.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/em-composer-utils.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/em-composer-utils.c.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/em-composer-utils.c	2007-05-18 15:34:09.000000000 -0400
 @@ -534,7 +534,7 @@
  	    strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) {
  		int id;
@@ -4629,9 +4629,9 @@
 -	mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new);
 +	mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push);
  }
---- evolution-2.10.1/mail/mail-folder-cache.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-folder-cache.c	2007-05-16 16:17:38.000000000 -0400
-@@ -843,15 +843,14 @@
+--- evolution-2.11.2/mail/mail-folder-cache.c.kill-ethread	2007-05-09 00:14:42.000000000 -0400
++++ evolution-2.11.2/mail/mail-folder-cache.c	2007-05-18 15:34:09.000000000 -0400
+@@ -844,15 +844,14 @@
  
  
  struct _ping_store_msg {
@@ -4650,7 +4650,7 @@
  	char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE);
  	char *msg;
  	
-@@ -862,10 +861,9 @@
+@@ -863,10 +862,9 @@
  }
  
  static void
@@ -4662,7 +4662,7 @@
  	
  	if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) {
  		if (CAMEL_IS_DISCO_STORE (m->store) &&
-@@ -876,22 +874,21 @@
+@@ -877,22 +875,21 @@
  			online = TRUE;
  	}
  	if (online)
@@ -4693,7 +4693,7 @@
  };
  
  static void
-@@ -903,11 +900,11 @@
+@@ -904,11 +901,11 @@
  	if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED)
  		return;
  	
@@ -4707,7 +4707,7 @@
  }
  
  static gboolean
-@@ -952,7 +949,7 @@
+@@ -953,7 +950,7 @@
  	int hook = 0;
  	
  	g_assert(CAMEL_IS_STORE(store));
@@ -4716,9 +4716,9 @@
  
  	LOCK(info_lock);
  
---- evolution-2.10.1/mail/em-folder-view.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/em-folder-view.c	2007-05-16 16:17:38.000000000 -0400
-@@ -68,6 +68,7 @@
+--- evolution-2.11.2/mail/em-folder-view.c.kill-ethread	2007-05-10 05:27:32.000000000 -0400
++++ evolution-2.11.2/mail/em-folder-view.c	2007-05-18 15:39:28.000000000 -0400
+@@ -69,6 +69,7 @@
  #include <gtkhtml/gtkhtml-stream.h>
  
  #include <libedataserver/e-data-server-util.h>
@@ -4735,7 +4735,7 @@
  }
  
  static void
-@@ -1613,7 +1614,7 @@
+@@ -1614,7 +1615,7 @@
  	data->type = type;
  	data->source = source;
  	
@@ -4744,7 +4744,7 @@
  }
  
  static void
-@@ -1711,7 +1712,7 @@
+@@ -1712,7 +1713,7 @@
  	data->type = type;
  	data->uri = g_strdup (uri);
  	
@@ -4753,17 +4753,17 @@
  }
  
  static void
-@@ -2370,7 +2371,7 @@
- 			g_object_ref (emfv);
- 			/* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */
- 			e_profile_event_emit("goto.load", emfv->displayed_uid, 0);
+@@ -2355,7 +2356,7 @@
+ 						       emfv->priv->selected_uid);
+ 			gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK);
+ 
 -			mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_thread_queued);
 +			mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_msg_fast_ordered_push);
  		} else {
  			e_profile_event_emit("goto.empty", "", 0);
  			g_free(emfv->priv->selected_uid);
---- evolution-2.10.1/mail/mail-session.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-session.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/mail-session.c.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/mail-session.c	2007-05-18 15:34:09.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <libgnome/gnome-sound.h>
  
@@ -4773,7 +4773,7 @@
  
  #include <camel/camel.h>	/* FIXME: this is where camel_init is defined, it shouldn't include everything else */
  #include <camel/camel-filter-driver.h>
-@@ -256,21 +256,22 @@
+@@ -258,21 +258,22 @@
  
  /* ********************************************************************** */
  
@@ -4800,7 +4800,7 @@
  
  /* clicked, send back the reply */
  static void
-@@ -278,122 +279,116 @@
+@@ -280,122 +281,116 @@
  {
  	gtk_widget_destroy ((GtkWidget *) dialog);
  	
@@ -4980,7 +4980,7 @@
  	} else
  		ret = TRUE;
  
-@@ -533,7 +528,7 @@
+@@ -535,7 +530,7 @@
  /* TODO: This is very temporary, until we have a better way to do the progress reporting,
     we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */
  
@@ -4989,7 +4989,7 @@
  
  static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size)
  {
-@@ -542,7 +537,7 @@
+@@ -544,7 +539,7 @@
  	/* We create a dummy mail_msg, and then copy its cancellation port over to ours, so
  	   we get cancellation and progress in common with hte existing mail code, for free */
  	if (msg) {
@@ -4998,7 +4998,7 @@
  
  		msg->data = m;
  		camel_operation_unref(msg->op);
-@@ -555,7 +550,7 @@
+@@ -557,7 +552,7 @@
  
  static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m)
  {
@@ -5007,7 +5007,7 @@
  	ms_parent_class->thread_msg_free(session, m);
  }
  
-@@ -678,22 +673,23 @@
+@@ -680,22 +675,23 @@
  	MAIL_SESSION (session)->interactive = interactive;
  	
  	if (!interactive) {
@@ -5037,11 +5037,11 @@
  		}
  	}
  }
---- evolution-2.10.1/mail/mail-mt.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-mt.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/mail/mail-mt.c.kill-ethread	2007-04-18 06:17:32.000000000 -0400
++++ evolution-2.11.2/mail/mail-mt.c	2007-05-18 15:34:09.000000000 -0400
 @@ -29,8 +29,8 @@
  #include <gtk/gtk.h>
- #include <libgnome/gnome-i18n.h>
+ #include <glib/gi18n.h>
  
 -#include <libedataserver/e-msgport.h>
  #include <libedataserver/e-data-server-util.h>
@@ -6001,8 +6001,8 @@
  }
  
  /* ******************** */
---- evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread	2007-04-09 09:09:11.000000000 -0400
-+++ evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread	2007-04-18 06:17:14.000000000 -0400
++++ evolution-2.11.2/plugins/folder-unsubscribe/folder-unsubscribe.c	2007-05-18 15:34:09.000000000 -0400
 @@ -44,32 +44,30 @@
  
  
@@ -6082,8 +6082,8 @@
 -	e_thread_put (mail_thread_new, (EMsg *) unsub);
 +	mail_msg_unordered_push (unsub);
  }
---- evolution-2.10.1/plugins/mark-all-read/mark-all-read.c.kill-ethread	2007-04-09 09:09:14.000000000 -0400
-+++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/plugins/mark-all-read/mark-all-read.c.kill-ethread	2007-05-14 00:24:02.000000000 -0400
++++ evolution-2.11.2/plugins/mark-all-read/mark-all-read.c	2007-05-18 15:34:09.000000000 -0400
 @@ -44,7 +44,7 @@
  		return;
  	}
@@ -6093,9 +6093,9 @@
  }
  
  static void
---- evolution-2.10.1/plugins/exchange-operations/exchange-folder.c.kill-ethread	2007-04-09 09:09:13.000000000 -0400
-+++ evolution-2.10.1/plugins/exchange-operations/exchange-folder.c	2007-05-16 16:17:38.000000000 -0400
-@@ -134,7 +134,7 @@
+--- evolution-2.11.2/plugins/exchange-operations/exchange-folder.c.kill-ethread	2007-05-13 13:41:07.000000000 -0400
++++ evolution-2.11.2/plugins/exchange-operations/exchange-folder.c	2007-05-18 15:34:09.000000000 -0400
+@@ -140,7 +140,7 @@
  	inbox_physical_uri = e_folder_get_physical_uri (inbox);
  
  	/* To get the CamelStore/Folder */
@@ -6104,17 +6104,17 @@
  
  
  }
---- evolution-2.10.1/plugins/save-attachments/save-attachments.c.kill-ethread	2007-04-09 09:09:15.000000000 -0400
-+++ evolution-2.10.1/plugins/save-attachments/save-attachments.c	2007-05-16 16:17:38.000000000 -0400
-@@ -407,5 +407,5 @@
+--- evolution-2.11.2/plugins/save-attachments/save-attachments.c.kill-ethread	2007-04-18 06:17:20.000000000 -0400
++++ evolution-2.11.2/plugins/save-attachments/save-attachments.c	2007-05-18 15:34:09.000000000 -0400
+@@ -403,5 +403,5 @@
  	camel_object_ref(data->folder);
  	data->uid = g_strdup(target->uids->pdata[0]);
  
 -	mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new);
 +	mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push);
  }
---- evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread	2007-04-09 09:09:14.000000000 -0400
-+++ evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread	2007-04-18 06:17:17.000000000 -0400
++++ evolution-2.11.2/plugins/mailing-list-actions/mailing-list-actions.c	2007-05-18 15:34:09.000000000 -0400
 @@ -89,7 +89,7 @@
  	data->uri = strdup (sel->uri);
  
@@ -6124,8 +6124,8 @@
  }
  	
  void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
---- evolution-2.10.1/plugins/groupwise-features/share-folder-common.c.kill-ethread	2007-04-09 09:09:12.000000000 -0400
-+++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/plugins/groupwise-features/share-folder-common.c.kill-ethread	2007-04-18 06:17:15.000000000 -0400
++++ evolution-2.11.2/plugins/groupwise-features/share-folder-common.c	2007-05-18 15:34:09.000000000 -0400
 @@ -121,7 +121,7 @@
  }
  
@@ -6223,8 +6223,8 @@
  		
  	return id;
  }
---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread	2007-04-09 09:10:29.000000000 -0400
-+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread	2007-04-18 06:18:37.000000000 -0400
++++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.h	2007-05-18 15:34:09.000000000 -0400
 @@ -39,19 +39,6 @@
  
  typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate;
@@ -6245,8 +6245,8 @@
  struct _AlarmNotify {
  	BonoboObject object;
  
---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread	2007-04-09 09:10:29.000000000 -0400
-+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread	2007-04-18 06:18:37.000000000 -0400
++++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.c	2007-05-18 15:34:09.000000000 -0400
 @@ -45,10 +45,6 @@
          GMutex *mutex;
  };
@@ -6359,8 +6359,8 @@
  }
  
  static void
---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread	2007-04-09 09:10:29.000000000 -0400
-+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c	2007-05-16 16:17:38.000000000 -0400
+--- evolution-2.11.2/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread	2007-05-09 00:14:46.000000000 -0400
++++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-queue.c	2007-05-18 15:34:09.000000000 -0400
 @@ -115,9 +115,6 @@
  static int tray_blink_state = FALSE;
  static AlarmNotify *an;
@@ -6673,7 +6673,7 @@
  	GList *list = tray_icons_list;
  
  	d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa));
-@@ -1087,28 +1097,25 @@
+@@ -1089,28 +1099,25 @@
  			gtk_tree_selection_select_iter (sel, &iter);
  		}
  	}
@@ -6711,7 +6711,7 @@
  {
  	GList *list = tray_icons_list;
  
-@@ -1138,55 +1145,50 @@
+@@ -1140,55 +1147,50 @@
  		} else
  			list = list->next;
  	}	
@@ -6785,7 +6785,7 @@
  }
  
  static void
-@@ -1394,29 +1396,24 @@
+@@ -1412,29 +1414,24 @@
  /* Add a new data to tray list */
  
  static void
@@ -6826,7 +6826,7 @@
  }
  
  /* Performs notification of a display alarm */
-@@ -1840,21 +1837,13 @@
+@@ -1862,21 +1859,13 @@
  	new_midnight = time_day_end_with_zone (time (NULL), zone);
  
  	if (new_midnight > midnight) {
@@ -6853,7 +6853,7 @@
  	}
  
  	return TRUE;
-@@ -1985,14 +1974,15 @@
+@@ -2007,14 +1996,15 @@
  }
  
  struct _alarm_client_msg {
@@ -6872,7 +6872,7 @@
  
  	g_return_if_fail (alarm_queue_inited);
  	g_return_if_fail (client != NULL);
-@@ -2023,6 +2013,8 @@
+@@ -2045,6 +2035,8 @@
  				  G_CALLBACK (cal_opened_cb),
  				  ca);
  	}	
@@ -6881,7 +6881,7 @@
  }
  
  /**
-@@ -2042,20 +2034,13 @@
+@@ -2064,20 +2056,13 @@
  void
  alarm_queue_add_client (ECal *client)
  {
@@ -6907,7 +6907,7 @@
  }
  
  /* Removes a component an its alarms */
-@@ -2107,11 +2092,10 @@
+@@ -2129,11 +2114,10 @@
   * Removes a calendar client from the alarm queueing system.
   **/
  static void
@@ -6921,7 +6921,7 @@
  
  	g_return_if_fail (alarm_queue_inited);
  	g_return_if_fail (client != NULL);
-@@ -2148,24 +2132,20 @@
+@@ -2170,24 +2154,20 @@
  	g_free (ca);
  
  	g_hash_table_remove (client_alarms_hash, client);


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- evolution.spec	16 May 2007 21:08:37 -0000	1.261
+++ evolution.spec	19 May 2007 00:56:12 -0000	1.262
@@ -1,7 +1,7 @@
 %define bug_buddy_version 2.15.90
 %define dbus_glib_version 0.70
 %define dbus_version 0.90
-%define eds_version 1.9.4
+%define eds_version 1.11.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 1.3.6
 %define gnome_pilot_version 2.0.13
@@ -18,7 +18,7 @@
 %define scrollkeeper_version 0.1.4
 %define soup_version 2.2.2
 
-%define evo_major 2.10
+%define evo_major 2.12
 
 %define exchange_support 1
 %define inline_audio_support 0
@@ -46,8 +46,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.10.1
-Release: 17%{?dist}
+Version: 2.11.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -64,120 +64,86 @@
 Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch
 
 # Fix for RH bug 164957 (was for 145552):
-Patch13: evolution-2.0.2-fix-145552.patch
+Patch12: evolution-2.0.2-fix-145552.patch
 
 # Part of RH bug 170799:
-Patch14: evolution-2.4.1-hide-switcher-buttons-by-default.patch
+Patch13: evolution-2.4.1-hide-switcher-buttons-by-default.patch
 
 # Patches for conduits, based upon
 # rh-161817-attach-116019-conduit_pilot_link_updates.diff
 # (the latter patch was originally by Mark G. Adams):
-# Patch15: evolution-2.5.4-fix-conduits.patch
+# Patch14: evolution-2.5.4-fix-conduits.patch
 
 # Move .conduit files from share to lib (for the sake of multilib)
 # This patch effects other parts of evolution.spec and so is necessary
 # for a successful build.
-Patch16: evolution-2.5.4-fix-conduit-dir.patch
+Patch15: evolution-2.5.4-fix-conduit-dir.patch
 
 # Remove gnome-common macros from configure.in.
 # We do not ship gnome-common (or at least we're not supposed to).
-Patch17: evolution-2.7.1-no-gnome-common.patch
+Patch16: evolution-2.7.1-no-gnome-common.patch
 
-#Patch18: evolution-2.7.1-notification-cleanups.patch
-Patch19: evolution-2.6.0-prototypes.patch
+#Patch17: evolution-2.7.1-notification-cleanups.patch
 
 # RH bug #157400 / GNOME bug #303877
-Patch20: evolution-2.7.4-candidate-window-position-task.patch
+Patch18: evolution-2.7.4-candidate-window-position-task.patch
 
 # RH bug #157505 / GNOME bug #303878
-Patch21: evolution-2.7.4-candidate-window-position-calendar.patch
-
-# RH bug #190359 / GNOME bug #211058
-Patch22: evolution-2.7.3-filter-datespec.patch
+Patch19: evolution-2.7.4-candidate-window-position-calendar.patch
 
 # RH bug #166231 / GNOME bug #264485
-Patch23: evolution-2.7.3-replicated-cjk-input.patch
+Patch20: evolution-2.7.3-replicated-cjk-input.patch
 
 # RH bug #178295 / GNOME bug #348638
-Patch24: evolution-2.7.4-deleting-preedit-buffer.patch
+Patch21: evolution-2.7.4-deleting-preedit-buffer.patch
 
 # RH bug #202289
-Patch25: evolution-2.7.92-fix-prgname.patch
+Patch22: evolution-2.7.92-fix-prgname.patch
 
 # RH bug #161885 / GNOME bug #309166
-Patch26: evolution-2.8.0-indic-cursor-movement.patch
+Patch23: evolution-2.8.0-indic-cursor-movement.patch
 
 # RH bug #202751 / GNOME bug #355766
-Patch29: evolution-2.8.0-fix-indic-printing.patch
+Patch24: evolution-2.8.0-fix-indic-printing.patch
 
 # GNOME bug #362638
-Patch31: evolution-2.8.1-kill-ethread.patch
+Patch25: evolution-2.8.1-kill-ethread.patch
 
 # GNOME bug #363695
-Patch32: evolution-2.9.1-kill-ememory.patch
+Patch26: evolution-2.9.1-kill-ememory.patch
 
 # RH bug #176400
-Patch33: evolution-2.9.1-im-context-reset.patch
+Patch27: evolution-2.9.1-im-context-reset.patch
 
 # RH bug #182247
-Patch34: evolution-2.9.1-first-ascii.patch
-
-# GNOME bug #373837
-Patch35: evolution-2.9.2-gtk-font-button.patch
+Patch28: evolution-2.9.1-first-ascii.patch
 
 # RH bug #216537 / GNOME bug #383047
-#Patch36: evolution-2.9.3-view-attachment-uri.patch
+#Patch29: evolution-2.9.3-view-attachment-uri.patch
 
 # RH bug #215478 / GNOME bug #383842
-Patch38: evolution-2.9.3-source-path-entry.patch
-
-# RH bug #218801 / GNOME bug #383953
-Patch39: evolution-2.9.3-unread-messages.patch
+Patch30: evolution-2.9.3-source-path-entry.patch
 
 # RH bug #215467 / GNOME bug #380644
-Patch40: evolution-2.9.3-meeting-list-view.patch
-
-# GNOME bug #373116
-Patch41: evolution-2.9.3-gtk-color-button.patch
+Patch31: evolution-2.9.3-meeting-list-view.patch
 
 # GNOME bug #218898
-Patch42: evolution-2.9.4-view-message-source.patch
+Patch32: evolution-2.9.4-view-message-source.patch
 
 # GNOME bug #376991
-Patch43: evolution-2.10.0-e-passwords.patch
+Patch33: evolution-2.10.0-e-passwords.patch
 
 # GNOME bug #417999
-Patch44: evolution-2.10.0-e-source-combo-box.patch
-
-# GNOME bug #419469
-Patch45: evolution-2.10.0-shell-main-cleanups.patch
-
-# GNOME bug #419524
-Patch46: evolution-2.10.0-use-glib-i18n.patch
-
-# GNOME bug #418971
-Patch47: evolution-2.10.0-drop-old-glib-support.patch
+Patch34: evolution-2.10.0-e-source-combo-box.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
-
-# RH bug #236860 / GNOME bug #407104
-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
+Patch35: evolution-2.10.1-fix-help.patch
 
 # RH bug #238155 / GNOME bug #427232
-Patch53: evolution-2.10.1-check-uri-before-strcmp.patch
+Patch36: evolution-2.10.1-check-uri-before-strcmp.patch
 
 # RH bug #240147 / GNOME bug #335241
-Patch54: evolution-2.10.1-send-recv-dialog.patch
+Patch37: evolution-2.10.1-send-recv-dialog.patch
 
 ## Dependencies ###
 
@@ -300,44 +266,32 @@
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .commit-enter-on-calendar
-%patch13 -p1 -b .fix-164957
-%patch14 -p1 -b .hide-switcher-buttons-by-default
-#patch15 -p1 -b .fix-conduits  # leave commented
-%patch16 -p1 -b .fix-conduit-dir
-%patch17 -p1 -b .no-gnome-common
-#patch18 -p1 -b .notification-cleanups
-%patch19 -p1 -b .prototypes
-%patch20 -p1 -b .candidate-window-position-task
-%patch21 -p1 -b .candidate-window-position-calendar
-%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
-%patch32 -p1 -b .kill-ememory
-%patch33 -p1 -b .im-context-reset
-%patch34 -p1 -b .first-ascii
-%patch35 -p1 -b .gtk-font-button
-#%patch36 -p1 -b .view-attachment-uri
-%patch38 -p1 -b .source-path-entry
-%patch39 -p1 -b .unread-messages
-%patch40 -p1 -b .meeting-list-view
-%patch41 -p1 -b .gtk-color-button
-%patch42 -p1 -b .view-message-source
-%patch43 -p1 -b .e-passwords
-%patch44 -p1 -b .e-source-combo-box
-%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
+%patch12 -p1 -b .fix-164957
+%patch13 -p1 -b .hide-switcher-buttons-by-default
+#patch14 -p1 -b .fix-conduits  # leave commented
+%patch15 -p1 -b .fix-conduit-dir
+%patch16 -p1 -b .no-gnome-common
+#patch17 -p1 -b .notification-cleanups
+%patch18 -p1 -b .candidate-window-position-task
+%patch19 -p1 -b .candidate-window-position-calendar
+%patch20 -p1 -b .replicated-cjk-input
+%patch21 -p1 -b .deleting-preedit-buffer
+%patch22 -p1 -b .fix-prgname
+%patch23 -p1 -b .indic-cursor-movement
+%patch24 -p1 -b .fix-indic-printing
+%patch25 -p1 -b .kill-ethread
+%patch26 -p1 -b .kill-ememory
+%patch27 -p1 -b .im-context-reset
+%patch28 -p1 -b .first-ascii
+#%patch29 -p1 -b .view-attachment-uri
+%patch30 -p1 -b .source-path-entry
+%patch31 -p1 -b .meeting-list-view
+%patch32 -p1 -b .view-message-source
+%patch33 -p1 -b .e-passwords
+%patch34 -p1 -b .e-source-combo-box
+%patch35 -p1 -b .fix-help
+%patch36 -p1 -b .check-uri-before-strcmp
+%patch37 -p1 -b .send-recv-dialog
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -416,9 +370,9 @@
 	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
 	-DGDK_DISABLE_DEPRECATED=1 \
 	-DEDS_DISABLE_DEPRECATED=1 \
-	-DCAMEL_DISABLE_DEPRECATED=1 \
 	-Wdeclaration-after-statement \
 	-Werror-implicit-function-declaration"
+# TODO: Make -DCAMEL_DISABLE_DEPRECATED work.
 %endif
 
 # Temporary work-around for a bad gnome-doc-utils.make.
@@ -498,6 +452,7 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin-%{evo_major}.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas > /dev/null
 
 %postun
@@ -518,6 +473,7 @@
 %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas
+%{_sysconfdir}/gconf/schemas/bogo-junk-plugin-%{evo_major}.schemas
 %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas
 
 # The main executable and a symlink:
@@ -539,6 +495,12 @@
 %{_datadir}/icons/hicolor/22x22/apps/evolution.png
 %{_datadir}/icons/hicolor/24x24/apps/evolution.png
 %{_datadir}/icons/hicolor/32x32/apps/evolution.png
+%{_datadir}/icons/hicolor/48x48/apps/preferences-autocompletion.png
+%{_datadir}/icons/hicolor/48x48/apps/preferences-calendar-and-tasks.png
+%{_datadir}/icons/hicolor/48x48/apps/preferences-certificates.png
+%{_datadir}/icons/hicolor/48x48/apps/preferences-composer.png
+%{_datadir}/icons/hicolor/48x48/apps/preferences-mail-accounts.png
+%{_datadir}/icons/hicolor/48x48/apps/preferences-mail.png
 %{_datadir}/icons/hicolor/scalable/apps/evolution.svg
 
 # IDL files (should this be in devel subpackage?)
@@ -631,6 +593,9 @@
 %{evo_plugin_dir}/liborg-gnome-audio-inline.so
 %endif
 
+%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
+%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
+
 %{evo_plugin_dir}/org-gnome-calendar-file.eplug
 %{evo_plugin_dir}/liborg-gnome-calendar-file.so
 
@@ -680,6 +645,9 @@
 %{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so
 %{evo_plugin_dir}/org-gnome-mailing-list-actions.xml
 
+%{evo_plugin_dir}/org-gnome-mail-notification.eplug
+%{evo_plugin_dir}/liborg-gnome-mail-notification.so
+
 %{evo_plugin_dir}/org-gnome-mail-to-task.eplug
 %{evo_plugin_dir}/liborg-gnome-mail-to-task.so
 %{evo_plugin_dir}/org-gnome-mail-to-task.xml
@@ -759,6 +727,24 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Fri May 18 2007 Matthew Barnes <mbarnes redhat com> - 2.11.2-1.fc8
+- Update to 2.11.2
+- Bump evo_major to 2.12.
+- Bump eds_version to 1.11.0.
+- Update files with new plugins and icons.
+- Remove patch for RH bug #190359 (fixed upstream).
+- Remove patch for RH bug #218801 (fixed upstream).
+- Remove patch for RH bug #234315 (fixed upstream).
+- Remove patch for RH bug #236399 (fixed upstream).
+- Remove patch for RH bug #236860 (fixed upstream).
+- Remove patch for RH bug #238551 (fixed upstream).
+- Remove patch for GNOME bug #373837 (fixed upstream).
+- Remove patch for GNOME bug #373116 (fixed upstream).
+- Remove patch for GNOME bug #418971 (fixed upstream).
+- Remove patch for GNOME bug #419469 (fixed upstream).
+- Remove patch for GNOME bug #419524 (fixed upstream).
+- Remove evolution-2.6.0-prototypes.patch (obsolete).
+
 * 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).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	9 Apr 2007 18:09:26 -0000	1.69
+++ sources	19 May 2007 00:56:12 -0000	1.70
@@ -1 +1 @@
-16051c6cbb617cb04665e402566e0976  evolution-2.10.1.tar.bz2
+7f684d90627bacd6e4a7997592112484  evolution-2.11.2.tar.bz2


--- evolution-2.10.0-drop-old-glib-support.patch DELETED ---


--- evolution-2.10.0-shell-main-cleanups.patch DELETED ---


--- evolution-2.10.0-use-glib-i18n.patch DELETED ---


--- evolution-2.10.1-e-attachment-bar.patch DELETED ---


--- evolution-2.10.1-en_CA-attribution-format.patch DELETED ---


--- evolution-2.10.1-fix-uri-handling.patch DELETED ---


--- evolution-2.10.1-saving-attachments.patch DELETED ---


--- evolution-2.7.3-filter-datespec.patch DELETED ---


--- evolution-2.9.2-gtk-font-button.patch DELETED ---


--- evolution-2.9.3-gtk-color-button.patch DELETED ---


--- evolution-2.9.3-unread-messages.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]