From b4dc82c07ab1446e53e5fba1b155382a27e7c589 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 15 Aug 2007 18:09:49 +0000 Subject: [PATCH] - Update to 2.11.90 --- .cvsignore | 2 +- evolution-2.10.0-e-source-combo-box.patch | 132 ++++---- evolution-2.8.1-kill-ethread.patch | 362 +++++++++++----------- evolution.spec | 5 +- sources | 2 +- 5 files changed, 256 insertions(+), 247 deletions(-) diff --git a/.cvsignore b/.cvsignore index eb84a4b..bbe5278 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.11.6.1.tar.bz2 +evolution-2.11.90.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 58f1300..ae00034 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.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 +--- evolution-2.11.90/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-07-05 02:11:06.000000000 -0400 ++++ evolution-2.11.90/widgets/misc/e-pilot-settings.c 2007-08-15 13:42:01.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -40,8 +40,8 @@ } gboolean ---- 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 +--- evolution-2.11.90/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-08-09 02:46:59.000000000 -0400 ++++ evolution-2.11.90/plugins/itip-formatter/itip-formatter.c 2007-08-15 13:42:01.000000000 -0400 @@ -40,7 +40,7 @@ #include #include @@ -51,8 +51,8 @@ #include #include #include ---- 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 +--- evolution-2.11.90/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-07-28 15:37:56.000000000 -0400 ++++ evolution-2.11.90/plugins/itip-formatter/itip-view.c 2007-08-15 13:42:01.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -177,8 +177,8 @@ } void ---- 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 +--- evolution-2.11.90/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-08-09 02:46:58.000000000 -0400 ++++ evolution-2.11.90/plugins/bbdb/gaimbuddies.c 2007-08-15 13:42:01.000000000 -0400 @@ -44,7 +44,7 @@ #include @@ -188,8 +188,8 @@ #include #include ---- 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 +--- evolution-2.11.90/plugins/bbdb/bbdb.c.e-source-combo-box 2007-08-09 02:46:58.000000000 -0400 ++++ evolution-2.11.90/plugins/bbdb/bbdb.c 2007-08-15 13:42:01.000000000 -0400 @@ -40,7 +40,7 @@ #include @@ -199,7 +199,7 @@ #include #include -@@ -353,7 +353,8 @@ enable_toggled_cb (GtkWidget *widget, gp +@@ -345,7 +345,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); } } -@@ -372,7 +373,8 @@ enable_gaim_toggled_cb (GtkWidget *widge +@@ -364,7 +365,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); } } -@@ -401,31 +403,32 @@ gaim_source_changed_cb (GtkWidget *widge +@@ -393,31 +395,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.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 +--- evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-07-05 02:06:54.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-08-15 13:42:01.000000000 -0400 @@ -158,9 +158,9 @@ @@ -273,8 +273,8 @@ 0 0 Tue, 01 Jun 2004 18:22:38 GMT ---- 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 +--- evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-07-05 02:06:54.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-08-15 13:42:01.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -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.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 +--- evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-07-08 22:46:43.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade 2007-08-15 13:42:01.000000000 -0400 @@ -356,9 +356,9 @@ @@ -404,8 +404,8 @@ 0 0 Tue, 13 Apr 2004 20:47:50 GMT ---- 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 +--- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-08-09 02:46:47.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c 2007-08-15 13:42:01.000000000 -0400 @@ -46,7 +46,7 @@ #include @@ -436,7 +436,7 @@ } static void -@@ -2521,13 +2522,15 @@ new_target_cb (EBook *new_book, EBookSta +@@ -2527,13 +2528,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 @@ cancel_load (EContactEditor *editor) +@@ -2557,8 +2560,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)) -@@ -3373,8 +3380,8 @@ e_contact_editor_init (EContactEditor *e +@@ -3383,8 +3390,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"); -@@ -3825,26 +3832,26 @@ e_contact_editor_create_web(gchar *name, +@@ -3835,26 +3842,26 @@ e_contact_editor_create_web(gchar *name, } GtkWidget * @@ -518,8 +518,8 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- 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 +--- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-07-28 15:38:05.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-08-15 13:42:01.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -568,9 +568,9 @@ g_object_unref (source_list); ---- 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 @@ +--- evolution-2.11.90/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/memo-page.glade 2007-08-15 13:42:01.000000000 -0400 +@@ -194,7 +194,7 @@ True @@ -579,9 +579,9 @@ 0 0 Tue, 13 Jan 2004 22:00:00 GMT ---- 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 @@ +--- evolution-2.11.90/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/event-page.glade 2007-08-15 13:42:01.000000000 -0400 +@@ -827,7 +827,7 @@ True @@ -590,9 +590,9 @@ 0 0 Wed, 17 Dec 2003 18:20:26 GMT ---- 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 @@ +--- evolution-2.11.90/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/task-page.glade 2007-08-15 13:42:01.000000000 -0400 +@@ -671,7 +671,7 @@ 24 True @@ -601,8 +601,8 @@ 0 0 Thu, 18 Dec 2003 01:58:48 GMT ---- 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 +--- evolution-2.11.90/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/memo-page.c 2007-08-15 13:42:01.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -612,7 +612,7 @@ #include #include #include -@@ -339,7 +339,6 @@ memo_page_fill_widgets (CompEditorPage * +@@ -349,7 +349,6 @@ memo_page_fill_widgets (CompEditorPage * ECalComponentDateTime d; GSList *l; const char *categories; @@ -620,7 +620,7 @@ mpage = MEMO_PAGE (page); priv = mpage->priv; -@@ -432,8 +431,9 @@ memo_page_fill_widgets (CompEditorPage * +@@ -442,8 +441,9 @@ memo_page_fill_widgets (CompEditorPage * } /* Source */ @@ -632,7 +632,7 @@ priv->updating = FALSE; -@@ -840,13 +840,12 @@ field_changed_cb (GtkWidget *widget, gpo +@@ -885,13 +885,12 @@ field_changed_cb (GtkWidget *widget, gpo } static void @@ -650,7 +650,7 @@ if (!priv->updating) { ECal *client; -@@ -858,8 +857,9 @@ source_changed_cb (GtkWidget *widget, ES +@@ -903,8 +902,9 @@ source_changed_cb (GtkWidget *widget, ES if (client) g_object_unref (client); @@ -662,7 +662,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -969,7 +969,7 @@ init_widgets (MemoPage *mpage) +@@ -1028,7 +1028,7 @@ init_widgets (MemoPage *mpage) G_CALLBACK (categories_clicked_cb), mpage); /* Source selector */ @@ -671,7 +671,7 @@ G_CALLBACK (source_changed_cb), mpage); /* Connect the default signal handler to use to make sure the "changed" -@@ -1163,22 +1163,23 @@ memo_page_create_date_edit (void) +@@ -1280,22 +1280,23 @@ memo_page_create_date_edit (void) return dedit; } @@ -702,8 +702,8 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- 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 +--- evolution-2.11.90/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/event-page.c 2007-08-15 13:42:59.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -713,15 +713,15 @@ #include "common/authentication.h" #include "e-util/e-categories-config.h" #include "e-util/e-dialog-widgets.h" -@@ -978,7 +978,6 @@ event_page_fill_widgets (CompEditorPage - ECalComponentDateTime start_date, end_date; +@@ -995,7 +995,6 @@ event_page_fill_widgets (CompEditorPage const char *location, *uid = NULL; const char *categories; + gchar *backend_addr = NULL; - ESource *source; GSList *l; gboolean validated = TRUE; -@@ -1174,8 +1173,9 @@ event_page_fill_widgets (CompEditorPage +@@ -1208,8 +1207,9 @@ event_page_fill_widgets (CompEditorPage e_dialog_editable_set (priv->categories, categories); /* Source */ @@ -733,7 +733,7 @@ e_cal_component_get_uid (comp, &uid); if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) -@@ -2577,7 +2577,8 @@ event_page_sendoptions_clicked_cb (Event +@@ -2655,7 +2655,8 @@ event_page_sendoptions_clicked_cb (Event if (!priv->sod) { priv->sod = e_sendoptions_dialog_new (); @@ -743,7 +743,7 @@ e_sendoptions_utils_set_default_data (priv->sod, source, "calendar"); priv->sod->data->initialized = TRUE; } -@@ -2606,13 +2607,12 @@ field_changed_cb (GtkWidget *widget, gpo +@@ -2684,13 +2685,12 @@ field_changed_cb (GtkWidget *widget, gpo } static void @@ -761,7 +761,7 @@ if (!priv->updating) { ECal *client; -@@ -2631,8 +2631,9 @@ source_changed_cb (GtkWidget *widget, ES +@@ -2709,8 +2709,9 @@ source_changed_cb (GtkWidget *widget, ES if (client) g_object_unref (client); @@ -773,7 +773,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -2860,7 +2861,7 @@ init_widgets (EventPage *epage) +@@ -2975,7 +2976,7 @@ init_widgets (EventPage *epage) G_CALLBACK (categories_clicked_cb), epage); /* Source selector */ @@ -782,7 +782,7 @@ G_CALLBACK (source_changed_cb), epage); /* Alarms */ priv->alarm_list_store = e_alarm_list_new (); -@@ -3161,24 +3162,25 @@ make_timezone_entry (void) +@@ -3315,24 +3316,25 @@ make_timezone_entry (void) return w; } @@ -815,8 +815,8 @@ } GtkWidget *make_status_icons (void); ---- 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 +--- evolution-2.11.90/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/task-page.c 2007-08-15 13:42:01.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -826,7 +826,7 @@ #include #include #include "common/authentication.h" -@@ -513,7 +513,6 @@ task_page_fill_widgets (CompEditorPage * +@@ -528,7 +528,6 @@ task_page_fill_widgets (CompEditorPage * icalcomponent *icalcomp; const char *categories, *uid; icaltimezone *zone, *default_zone; @@ -834,7 +834,7 @@ tpage = TASK_PAGE (page); priv = tpage->priv; -@@ -657,8 +656,9 @@ task_page_fill_widgets (CompEditorPage * +@@ -672,8 +671,9 @@ task_page_fill_widgets (CompEditorPage * e_dialog_editable_set (priv->categories, categories); /* Source */ @@ -846,7 +846,7 @@ if (priv->is_assignment) { ECalComponentOrganizer organizer; -@@ -1613,13 +1613,12 @@ field_changed_cb (GtkWidget *widget, gpo +@@ -1686,13 +1686,12 @@ field_changed_cb (GtkWidget *widget, gpo } static void @@ -864,7 +864,7 @@ if (!priv->updating) { ECal *client; -@@ -1638,8 +1637,9 @@ source_changed_cb (GtkWidget *widget, ES +@@ -1711,8 +1710,9 @@ source_changed_cb (GtkWidget *widget, ES if (client) g_object_unref (client); @@ -876,7 +876,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -1651,7 +1651,7 @@ source_changed_cb (GtkWidget *widget, ES +@@ -1724,7 +1724,7 @@ source_changed_cb (GtkWidget *widget, ES comp_editor_notify_client_changed ( COMP_EDITOR (gtk_widget_get_toplevel (priv->main)), client); @@ -885,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 -@@ -1675,7 +1675,8 @@ task_page_sendoptions_clicked_cb (TaskPa +@@ -1758,7 +1758,8 @@ task_page_sendoptions_clicked_cb (TaskPa if (!priv->sod) { priv->sod = e_sendoptions_dialog_new (); priv->sod->data->initialized = TRUE; @@ -895,7 +895,7 @@ e_sendoptions_utils_set_default_data (priv->sod, source, "task"); } -@@ -1730,7 +1731,7 @@ init_widgets (TaskPage *tpage) +@@ -1816,7 +1817,7 @@ init_widgets (TaskPage *tpage) G_CALLBACK (categories_clicked_cb), tpage); /* Source selector */ @@ -904,7 +904,7 @@ G_CALLBACK (source_changed_cb), tpage); /* Connect the default signal handler to use to make sure the "changed" -@@ -1951,22 +1952,23 @@ task_page_create_date_edit (void) +@@ -2093,22 +2094,23 @@ task_page_create_date_edit (void) return dedit; } @@ -935,8 +935,8 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- 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 +--- evolution-2.11.90/calendar/gui/e-itip-control.c.e-source-combo-box 2007-07-05 02:11:20.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/e-itip-control.c 2007-08-15 13:42:01.000000000 -0400 @@ -44,7 +44,7 @@ #include #include diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index bab59c2..8bbd0be 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,6 +1,6 @@ ---- evolution-2.11.4/mail/mail-send-recv.c.kill-ethread 2007-06-17 23:26:00.000000000 -0400 -+++ evolution-2.11.4/mail/mail-send-recv.c 2007-06-27 11:23:50.000000000 -0400 -@@ -764,23 +764,22 @@ receive_get_folder(CamelFilterDriver *d, +--- evolution-2.11.90/mail/mail-send-recv.c.kill-ethread 2007-07-28 17:08:12.000000000 -0400 ++++ evolution-2.11.90/mail/mail-send-recv.c 2007-08-15 13:37:37.000000000 -0400 +@@ -770,23 +770,22 @@ receive_get_folder(CamelFilterDriver *d, /* ********************************************************************** */ struct _refresh_folders_msg { @@ -28,7 +28,7 @@ int i; CamelFolder *folder; CamelException ex = CAMEL_EXCEPTION_INITIALISER; -@@ -802,17 +801,14 @@ refresh_folders_get (struct _mail_msg *m +@@ -808,17 +807,14 @@ refresh_folders_get (struct _mail_msg *m } static void @@ -48,7 +48,7 @@ int i; for (i=0;ifolders->len;i++) -@@ -821,11 +817,12 @@ refresh_folders_free (struct _mail_msg * +@@ -827,11 +823,12 @@ refresh_folders_free (struct _mail_msg * camel_object_unref(m->store); } @@ -66,7 +66,7 @@ }; static void -@@ -858,13 +855,13 @@ receive_update_got_folderinfo(CamelStore +@@ -864,13 +861,13 @@ receive_update_got_folderinfo(CamelStore get_folders(store, folders, info); @@ -82,9 +82,9 @@ } else { receive_done ("", data); } ---- evolution-2.11.4/mail/mail-component.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/mail-component.c 2007-06-27 11:23:50.000000000 -0400 -@@ -1014,7 +1014,7 @@ impl_handleURI (PortableServer_Servant s +--- evolution-2.11.90/mail/mail-component.c.kill-ethread 2007-08-09 02:46:47.000000000 -0400 ++++ evolution-2.11.90/mail/mail-component.c 2007-08-15 13:37:37.000000000 -0400 +@@ -1001,7 +1001,7 @@ impl_handleURI (PortableServer_Servant s 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.11.4/mail/mail-ops.c.kill-ethread 2007-06-01 03:08:56.000000000 -0400 -+++ evolution-2.11.4/mail/mail-ops.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-ops.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.90/mail/mail-ops.c 2007-08-15 13:37:37.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 */ @@ -2224,9 +2224,9 @@ return id; } ---- evolution-2.11.4/mail/em-folder-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/em-folder-utils.c 2007-06-27 11:23:50.000000000 -0400 -@@ -84,7 +84,7 @@ emfu_is_special_local_folder (const char +--- evolution-2.11.90/mail/em-folder-utils.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.90/mail/em-folder-utils.c 2007-08-15 13:37:37.000000000 -0400 +@@ -85,7 +85,7 @@ emfu_is_special_local_folder (const char } struct _EMCopyFolders { @@ -2235,7 +2235,7 @@ /* input data */ CamelStore *fromstore; -@@ -96,18 +96,15 @@ struct _EMCopyFolders { +@@ -97,18 +97,15 @@ struct _EMCopyFolders { int delete; }; @@ -2257,7 +2257,7 @@ guint32 flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; GList *pending = NULL, *deleting = NULL, *l; GString *fromname, *toname; -@@ -115,7 +112,7 @@ emft_copy_folders__copy (struct _mail_ms +@@ -116,7 +113,7 @@ emft_copy_folders__copy (struct _mail_ms const char *tmp; int fromlen; @@ -2266,7 +2266,7 @@ return; pending = g_list_append (pending, fi); -@@ -155,8 +152,8 @@ emft_copy_folders__copy (struct _mail_ms +@@ -156,8 +153,8 @@ emft_copy_folders__copy (struct _mail_ms if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { d(printf ("this folder is selectable\n")); if (m->tostore == m->fromstore && m->delete) { @@ -2277,7 +2277,7 @@ goto exception; /* this folder no longer exists, unsubscribe it */ -@@ -165,16 +162,16 @@ emft_copy_folders__copy (struct _mail_ms +@@ -166,16 +163,16 @@ emft_copy_folders__copy (struct _mail_ms deleted = 1; } else { @@ -2297,7 +2297,7 @@ camel_folder_free_uids (fromfolder, uids); if (m->delete) -@@ -185,7 +182,7 @@ emft_copy_folders__copy (struct _mail_ms +@@ -186,7 +183,7 @@ emft_copy_folders__copy (struct _mail_ms } } @@ -2306,7 +2306,7 @@ goto exception; else if (m->delete && !deleted) deleting = g_list_prepend (deleting, info); -@@ -226,10 +223,8 @@ emft_copy_folders__copy (struct _mail_ms +@@ -227,10 +224,8 @@ emft_copy_folders__copy (struct _mail_ms } static void @@ -2318,7 +2318,7 @@ camel_object_unref (m->fromstore); camel_object_unref (m->tostore); -@@ -237,11 +232,12 @@ emft_copy_folders__free (struct _mail_ms +@@ -238,11 +233,12 @@ emft_copy_folders__free (struct _mail_ms g_free (m->tobase); } @@ -2336,7 +2336,7 @@ }; int -@@ -250,7 +246,7 @@ em_folder_utils_copy_folders(CamelStore +@@ -251,7 +247,7 @@ em_folder_utils_copy_folders(CamelStore struct _EMCopyFolders *m; int seq; @@ -2345,7 +2345,7 @@ camel_object_ref (fromstore); m->fromstore = fromstore; camel_object_ref (tostore); -@@ -258,9 +254,9 @@ em_folder_utils_copy_folders(CamelStore +@@ -259,9 +255,9 @@ em_folder_utils_copy_folders(CamelStore m->frombase = g_strdup (frombase); m->tobase = g_strdup (tobase); m->delete = delete; @@ -2357,7 +2357,7 @@ return seq; } -@@ -557,7 +553,7 @@ em_folder_utils_rename_folder (CamelFold +@@ -558,7 +554,7 @@ em_folder_utils_rename_folder (CamelFold } struct _EMCreateFolder { @@ -2366,8 +2366,8 @@ /* input data */ CamelStore *store; -@@ -573,41 +569,33 @@ struct _EMCreateFolder { - void *user_data; +@@ -582,41 +578,33 @@ struct _EMCreateFolderTempData + char *uri; }; -static char * @@ -2415,7 +2415,7 @@ camel_store_free_folder_info (m->store, m->fi); camel_object_unref (m->store); g_free (m->full_name); -@@ -615,11 +603,12 @@ emfu_create_folder__free (struct _mail_m +@@ -624,11 +612,12 @@ emfu_create_folder__free (struct _mail_m g_free (m->name); } @@ -2433,7 +2433,7 @@ }; -@@ -640,7 +629,7 @@ emfu_create_folder_real (CamelStore *sto +@@ -649,7 +638,7 @@ emfu_create_folder_real (CamelStore *sto parent = namebuf; } @@ -2442,7 +2442,7 @@ camel_object_ref (store); m->store = store; m->full_name = g_strdup (full_name); -@@ -651,8 +640,8 @@ emfu_create_folder_real (CamelStore *sto +@@ -660,8 +649,8 @@ emfu_create_folder_real (CamelStore *sto g_free (namebuf); @@ -2453,8 +2453,8 @@ return id; } ---- evolution-2.11.4/mail/importers/elm-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.4/mail/importers/elm-importer.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/importers/elm-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 ++++ evolution-2.11.90/mail/importers/elm-importer.c 2007-08-15 13:37:37.000000000 -0400 @@ -51,7 +51,7 @@ #define d(x) x @@ -2553,8 +2553,8 @@ return id; } ---- evolution-2.11.4/mail/importers/mail-importer.c.kill-ethread 2007-06-03 11:08:07.000000000 -0400 -+++ evolution-2.11.4/mail/importers/mail-importer.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/importers/mail-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 ++++ evolution-2.11.90/mail/importers/mail-importer.c 2007-08-15 13:37:37.000000000 -0400 @@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact } @@ -2691,8 +2691,8 @@ } struct _import_folders_data { ---- evolution-2.11.4/mail/importers/pine-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.4/mail/importers/pine-importer.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/importers/pine-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 ++++ evolution-2.11.90/mail/importers/pine-importer.c 2007-08-15 13:37:37.000000000 -0400 @@ -56,7 +56,7 @@ #define d(x) x @@ -2792,9 +2792,9 @@ return id; } ---- evolution-2.11.4/mail/em-utils.c.kill-ethread 2007-06-27 11:23:38.000000000 -0400 -+++ evolution-2.11.4/mail/em-utils.c 2007-06-27 11:23:50.000000000 -0400 -@@ -1906,7 +1906,7 @@ em_utils_in_addressbook(CamelInternetAdd +--- evolution-2.11.90/mail/em-utils.c.kill-ethread 2007-08-15 13:37:37.000000000 -0400 ++++ evolution-2.11.90/mail/em-utils.c 2007-08-15 13:37:37.000000000 -0400 +@@ -1908,7 +1908,7 @@ em_utils_in_addressbook(CamelInternetAdd ESource *source = s->data; GList *contacts; EBook *book; @@ -2803,8 +2803,8 @@ d(printf(" checking '%s'\n", e_source_get_uri(source))); ---- evolution-2.11.4/mail/mail-vfolder.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/mail-vfolder.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-vfolder.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 ++++ evolution-2.11.90/mail/mail-vfolder.c 2007-08-15 13:37:37.000000000 -0400 @@ -21,7 +21,7 @@ */ @@ -3039,8 +3039,8 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); ---- evolution-2.11.4/mail/em-format-html.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/em-format-html.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-format-html.c.kill-ethread 2007-08-09 02:46:47.000000000 -0400 ++++ evolution-2.11.90/mail/em-format-html.c 2007-08-15 13:37:37.000000000 -0400 @@ -165,7 +165,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFor if (efh->priv->format_timeout_id != 0) { g_source_remove(efh->priv->format_timeout_id); @@ -3050,7 +3050,7 @@ efh->priv->format_timeout_msg = NULL; } -@@ -1179,7 +1179,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc +@@ -1193,7 +1193,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc /* Sigh, this is so we have a cancellable, async rendering thread */ struct _format_msg { @@ -3059,7 +3059,7 @@ EMFormatHTML *format; EMFormat *format_source; -@@ -1189,14 +1189,15 @@ struct _format_msg { +@@ -1203,14 +1203,15 @@ struct _format_msg { CamelMimeMessage *message; }; @@ -3078,7 +3078,7 @@ struct _EMFormatHTMLJob *job; struct _EMFormatPURITree *puri_level; int cancelled = FALSE; -@@ -1281,10 +1282,9 @@ static void efh_format_do(struct _mail_m +@@ -1295,10 +1296,9 @@ static void efh_format_do(struct _mail_m ((EMFormat *)m->format)->pending_uri_level = puri_level; } @@ -3091,7 +3091,7 @@ d(printf("formatting finished\n")); m->format->load_http_now = FALSE; -@@ -1292,10 +1292,9 @@ static void efh_format_done(struct _mail +@@ -1306,10 +1306,9 @@ static void efh_format_done(struct _mail g_signal_emit_by_name(m->format, "complete"); } @@ -3104,7 +3104,7 @@ d(printf("formatter freed\n")); g_object_unref(m->format); if (m->estream) { -@@ -1311,11 +1310,12 @@ static void efh_format_free(struct _mail +@@ -1325,11 +1324,12 @@ static void efh_format_free(struct _mail g_object_unref(m->format_source); } @@ -3122,7 +3122,7 @@ }; static gboolean -@@ -1326,7 +1326,7 @@ efh_format_timeout(struct _format_msg *m +@@ -1340,7 +1340,7 @@ efh_format_timeout(struct _format_msg *m struct _EMFormatHTMLPrivate *p = efh->priv; if (m->format->html == NULL) { @@ -3131,7 +3131,7 @@ return FALSE; } -@@ -1354,7 +1354,7 @@ efh_format_timeout(struct _format_msg *m +@@ -1368,7 +1368,7 @@ efh_format_timeout(struct _format_msg *m if (m->message == NULL) { hstream = gtk_html_begin(efh->html); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); @@ -3139,8 +3139,8 @@ + mail_msg_unref(m); p->last_part = NULL; } else { - hstream = NULL; -@@ -1373,8 +1373,8 @@ efh_format_timeout(struct _format_msg *m + hstream = gtk_html_begin(efh->html); +@@ -1392,8 +1392,8 @@ efh_format_timeout(struct _format_msg *m p->last_part = m->message; } @@ -3151,7 +3151,7 @@ } efh->priv->format_timeout_id = 0; -@@ -1398,11 +1398,11 @@ static void efh_format_clone(EMFormat *e +@@ -1417,11 +1417,11 @@ static void efh_format_clone(EMFormat *e d(printf(" timeout for last still active, removing ...\n")); g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -3165,8 +3165,8 @@ m->format = (EMFormatHTML *)emf; g_object_ref(emf); m->format_source = emfsource; ---- evolution-2.11.4/mail/em-folder-properties.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/em-folder-properties.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-folder-properties.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 ++++ evolution-2.11.90/mail/em-folder-properties.c 2007-08-15 13:37:37.000000000 -0400 @@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par } @@ -3176,8 +3176,8 @@ else emfp_dialog_got_folder((char *)uri, folder, NULL); } ---- evolution-2.11.4/mail/em-folder-tree.c.kill-ethread 2007-06-17 23:26:00.000000000 -0400 -+++ evolution-2.11.4/mail/em-folder-tree.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-folder-tree.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.90/mail/em-folder-tree.c 2007-08-15 13:37:37.000000000 -0400 @@ -835,7 +835,7 @@ fail: /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ /* Drop handling */ @@ -3314,7 +3314,7 @@ m->context = context; g_object_ref(context); m->store = store; -@@ -1687,7 +1683,7 @@ dump_fi (CamelFolderInfo *fi, int depth) +@@ -1692,7 +1688,7 @@ dump_fi (CamelFolderInfo *fi, int depth) #endif struct _EMFolderTreeGetFolderInfo { @@ -3323,7 +3323,7 @@ /* input data */ GtkTreeRowReference *root; -@@ -1700,10 +1696,9 @@ struct _EMFolderTreeGetFolderInfo { +@@ -1705,10 +1701,9 @@ struct _EMFolderTreeGetFolderInfo { CamelFolderInfo *fi; }; @@ -3336,7 +3336,7 @@ char *ret, *name; name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1713,18 +1708,16 @@ emft_get_folder_info__desc(struct _mail_ +@@ -1718,18 +1713,16 @@ emft_get_folder_info__desc(struct _mail_ } static void @@ -3358,7 +3358,7 @@ struct _EMFolderTreePrivate *priv = m->emft->priv; struct _EMFolderTreeModelStoreInfo *si; GtkTreeIter root, iter; -@@ -1752,7 +1745,7 @@ emft_get_folder_info__got (struct _mail_ +@@ -1757,7 +1750,7 @@ emft_get_folder_info__got (struct _mail_ gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ @@ -3367,7 +3367,7 @@ gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1); gtk_tree_view_collapse_row (priv->treeview, path); gtk_tree_path_free (path); -@@ -1807,10 +1800,8 @@ emft_get_folder_info__got (struct _mail_ +@@ -1812,10 +1805,8 @@ emft_get_folder_info__got (struct _mail_ } static void @@ -3379,7 +3379,7 @@ camel_store_free_folder_info (m->store, m->fi); gtk_tree_row_reference_free (m->root); -@@ -1819,11 +1810,12 @@ emft_get_folder_info__free (struct _mail +@@ -1824,11 +1815,12 @@ emft_get_folder_info__free (struct _mail g_free (m->top); } @@ -3397,7 +3397,7 @@ }; static void -@@ -1910,7 +1902,7 @@ emft_tree_row_expanded (GtkTreeView *tre +@@ -1915,7 +1907,7 @@ emft_tree_row_expanded (GtkTreeView *tre gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); @@ -3406,7 +3406,7 @@ m->root = gtk_tree_row_reference_new (model, tree_path); camel_object_ref (store); m->store = store; -@@ -1919,7 +1911,7 @@ emft_tree_row_expanded (GtkTreeView *tre +@@ -1924,7 +1916,7 @@ emft_tree_row_expanded (GtkTreeView *tre m->top = full_name; m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; @@ -3415,9 +3415,9 @@ } static gboolean ---- evolution-2.11.4/mail/em-folder-browser.c.kill-ethread 2007-06-18 01:24:46.000000000 -0400 -+++ evolution-2.11.4/mail/em-folder-browser.c 2007-06-27 11:23:50.000000000 -0400 -@@ -835,7 +835,7 @@ get_view_query (ESearchBar *esb) +--- evolution-2.11.90/mail/em-folder-browser.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.90/mail/em-folder-browser.c 2007-08-15 13:37:37.000000000 -0400 +@@ -836,7 +836,7 @@ get_view_query (ESearchBar *esb) struct _setup_msg { @@ -3426,7 +3426,7 @@ CamelFolder *folder; char *query; -@@ -843,16 +843,15 @@ struct _setup_msg { +@@ -844,16 +844,15 @@ struct _setup_msg { GList *sources_folder; }; @@ -3446,7 +3446,7 @@ GList *l, *list = NULL; CamelFolder *folder; -@@ -863,12 +862,12 @@ vfolder_setup_do(struct _mail_msg *mm) +@@ -864,12 +863,12 @@ vfolder_setup_do(struct _mail_msg *mm) l = m->sources_uri; while (l) { d(printf(" Adding uri: %s\n", (char *)l->data)); @@ -3461,7 +3461,7 @@ } l = l->next; } -@@ -892,17 +891,13 @@ vfolder_setup_do(struct _mail_msg *mm) +@@ -893,17 +892,13 @@ vfolder_setup_do(struct _mail_msg *mm) } static void @@ -3481,7 +3481,7 @@ GList *l; camel_object_unref(m->folder); -@@ -923,11 +918,12 @@ vfolder_setup_free (struct _mail_msg *mm +@@ -924,11 +919,12 @@ vfolder_setup_free (struct _mail_msg *mm g_list_free(m->sources_folder); } @@ -3499,7 +3499,7 @@ }; /* sources_uri should be camel uri's */ -@@ -937,15 +933,15 @@ vfolder_setup(CamelFolder *folder, const +@@ -938,15 +934,15 @@ vfolder_setup(CamelFolder *folder, const struct _setup_msg *m; int id; @@ -3518,8 +3518,8 @@ return id; } ---- evolution-2.11.4/mail/message-list.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/message-list.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/message-list.c.kill-ethread 2007-08-09 02:46:47.000000000 -0400 ++++ evolution-2.11.90/mail/message-list.c 2007-08-15 13:37:37.000000000 -0400 @@ -1841,7 +1841,7 @@ ml_tree_drag_data_get (ETree *tree, int /* TODO: merge this with the folder tree stuff via empopup targets */ /* Drop handling */ @@ -3627,7 +3627,7 @@ static EPopupItem ml_drop_popup_menu[] = { @@ -1985,7 +1979,7 @@ ml_tree_drag_data_received (ETree *tree, - if (data->data == NULL || data->length == -1) + if (!ml->folder || data->data == NULL || data->length == -1) return; - m = mail_msg_new(&ml_drop_async_op, NULL, sizeof(*m)); @@ -3796,8 +3796,8 @@ m->ml = ml; m->search = g_strdup (search); m->hideexpr = g_strdup (hideexpr); ---- evolution-2.11.4/mail/em-sync-stream.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/em-sync-stream.h 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-sync-stream.h.kill-ethread 2007-07-05 02:09:39.000000000 -0400 ++++ evolution-2.11.90/mail/em-sync-stream.h 2007-08-15 13:37:37.000000000 -0400 @@ -29,41 +29,45 @@ requests are always handled in the main #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -3874,9 +3874,9 @@ +G_END_DECLS #endif /* EM_SYNC_STREAM_H */ ---- evolution-2.11.4/mail/em-format-html-print.c.kill-ethread 2007-04-22 13:20:08.000000000 -0400 -+++ evolution-2.11.4/mail/em-format-html-print.c 2007-06-27 11:23:50.000000000 -0400 -@@ -224,7 +224,7 @@ em_format_html_print_message (EMFormatHT +--- evolution-2.11.90/mail/em-format-html-print.c.kill-ethread 2007-07-08 22:46:50.000000000 -0400 ++++ evolution-2.11.90/mail/em-format-html-print.c 2007-08-15 13:37:37.000000000 -0400 +@@ -228,7 +228,7 @@ em_format_html_print_message (EMFormatHT g_object_ref (efhp); mail_get_message ( @@ -3885,8 +3885,8 @@ } void ---- evolution-2.11.4/mail/em-sync-stream.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/em-sync-stream.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-sync-stream.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.90/mail/em-sync-stream.c 2007-08-15 13:37:37.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -4312,8 +4312,8 @@ + g_string_free (emss->buffer, TRUE); + emss->buffer = g_string_sized_new (size); } ---- evolution-2.11.4/mail/em-subscribe-editor.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/em-subscribe-editor.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-subscribe-editor.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 ++++ evolution-2.11.90/mail/em-subscribe-editor.c 2007-08-15 13:37:37.000000000 -0400 @@ -175,7 +175,7 @@ sub_unref(EMSubscribe *sub) /* ** Subscribe folder operation **************************************** */ @@ -4529,8 +4529,8 @@ sub_unref(sub); } ---- evolution-2.11.4/mail/mail-mt.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/mail-mt.h 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-mt.h.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.90/mail/mail-mt.h 2007-08-15 13:37:37.000000000 -0400 @@ -23,47 +23,64 @@ #ifndef _MAIL_MT #define _MAIL_MT @@ -4642,8 +4642,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.11.4/mail/mail-ops.h.kill-ethread 2007-06-14 23:48:53.000000000 -0400 -+++ evolution-2.11.4/mail/mail-ops.h 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-ops.h.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.90/mail/mail-ops.h 2007-08-15 13:37:37.000000000 -0400 @@ -30,13 +30,14 @@ extern "C" { #pragma } #endif /* __cplusplus */ @@ -4684,9 +4684,9 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.11.4/mail/em-composer-utils.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/em-composer-utils.c 2007-06-27 11:23:50.000000000 -0400 -@@ -534,7 +534,7 @@ em_utils_composer_save_draft_cb (EMsgCom +--- evolution-2.11.90/mail/em-composer-utils.c.kill-ethread 2007-07-28 15:37:58.000000000 -0400 ++++ evolution-2.11.90/mail/em-composer-utils.c 2007-08-15 13:37:37.000000000 -0400 +@@ -553,7 +553,7 @@ em_utils_composer_save_draft_cb (EMsgCom strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -4695,7 +4695,7 @@ mail_msg_wait (id); if (!folder || !account->enabled) { -@@ -1085,7 +1085,7 @@ em_utils_redirect_message_by_uid (CamelF +@@ -1104,7 +1104,7 @@ em_utils_redirect_message_by_uid (CamelF g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uid != NULL); @@ -4704,7 +4704,7 @@ } static void -@@ -1116,7 +1116,7 @@ em_utils_handle_receipt (CamelFolder *fo +@@ -1135,7 +1135,7 @@ em_utils_handle_receipt (CamelFolder *fo } if (msg == NULL) { @@ -4713,7 +4713,7 @@ camel_message_info_free(info); return; } -@@ -1922,7 +1922,7 @@ em_utils_reply_to_message(CamelFolder *f +@@ -1949,7 +1949,7 @@ em_utils_reply_to_message(CamelFolder *f rd->source = source; if (rd->source) g_object_ref(rd->source); @@ -4722,16 +4722,16 @@ return; } -@@ -2094,5 +2094,5 @@ em_utils_post_reply_to_message_by_uid (C +@@ -2121,5 +2121,5 @@ em_utils_post_reply_to_message_by_uid (C g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uid != NULL); - 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.11.4/mail/mail-folder-cache.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/mail-folder-cache.c 2007-06-27 11:23:50.000000000 -0400 -@@ -860,15 +860,14 @@ update_folders(CamelStore *store, CamelF +--- evolution-2.11.90/mail/mail-folder-cache.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.90/mail/mail-folder-cache.c 2007-08-15 13:37:37.000000000 -0400 +@@ -862,15 +862,14 @@ update_folders(CamelStore *store, CamelF struct _ping_store_msg { @@ -4750,7 +4750,7 @@ char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; -@@ -879,10 +878,9 @@ ping_store_desc (struct _mail_msg *mm, i +@@ -881,10 +880,9 @@ ping_store_desc (struct _mail_msg *mm, i } static void @@ -4762,7 +4762,7 @@ if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { if (CAMEL_IS_DISCO_STORE (m->store) && -@@ -893,22 +891,21 @@ ping_store_ping (struct _mail_msg *mm) +@@ -895,22 +893,21 @@ ping_store_ping (struct _mail_msg *mm) online = TRUE; } if (online) @@ -4793,7 +4793,7 @@ }; static void -@@ -920,11 +917,11 @@ ping_store (gpointer key, gpointer val, +@@ -922,11 +919,11 @@ ping_store (gpointer key, gpointer val, if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) return; @@ -4807,7 +4807,7 @@ } static gboolean -@@ -969,7 +966,7 @@ mail_note_store(CamelStore *store, Camel +@@ -971,7 +968,7 @@ mail_note_store(CamelStore *store, Camel int hook = 0; g_assert(CAMEL_IS_STORE(store)); @@ -4816,8 +4816,8 @@ LOCK(info_lock); ---- evolution-2.11.4/mail/em-folder-view.c.kill-ethread 2007-06-18 01:20:56.000000000 -0400 -+++ evolution-2.11.4/mail/em-folder-view.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-folder-view.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.90/mail/em-folder-view.c 2007-08-15 13:37:37.000000000 -0400 @@ -71,6 +71,7 @@ #include @@ -4826,7 +4826,7 @@ #include "menus/gal-view-etable.h" #include "menus/gal-view-factory-etable.h" -@@ -699,7 +700,7 @@ emfv_got_folder(char *uri, CamelFolder * +@@ -701,7 +702,7 @@ emfv_got_folder(char *uri, CamelFolder * static void emfv_set_folder_uri(EMFolderView *emfv, const char *uri) { @@ -4835,7 +4835,7 @@ } static void -@@ -1674,7 +1675,7 @@ filter_type_uid (CamelFolder *folder, co +@@ -1676,7 +1677,7 @@ filter_type_uid (CamelFolder *folder, co data->type = type; data->source = source; @@ -4844,7 +4844,7 @@ } static void -@@ -1772,7 +1773,7 @@ vfolder_type_uid (CamelFolder *folder, c +@@ -1774,7 +1775,7 @@ vfolder_type_uid (CamelFolder *folder, c data->type = type; data->uri = g_strdup (uri); @@ -4853,7 +4853,7 @@ } static void -@@ -2415,7 +2416,7 @@ emfv_message_selected_timeout(void *data +@@ -2419,7 +2420,7 @@ emfv_message_selected_timeout(void *data emfv->displayed_uid); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); */ @@ -4862,8 +4862,8 @@ } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); ---- evolution-2.11.4/mail/mail-session.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/mail-session.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-session.c.kill-ethread 2007-07-09 01:14:13.000000000 -0400 ++++ evolution-2.11.90/mail/mail-session.c 2007-08-15 13:37:37.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -4873,7 +4873,7 @@ #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ #include -@@ -258,21 +258,22 @@ forget_password (CamelSession *session, +@@ -264,21 +264,22 @@ forget_password (CamelSession *session, /* ********************************************************************** */ @@ -4900,7 +4900,7 @@ /* clicked, send back the reply */ static void -@@ -280,122 +281,116 @@ user_message_response (GtkDialog *dialog +@@ -286,122 +287,116 @@ user_message_response (GtkDialog *dialog { gtk_widget_destroy ((GtkWidget *) dialog); @@ -5080,7 +5080,7 @@ } else ret = TRUE; -@@ -535,7 +530,7 @@ get_filter_driver (CamelSession *session +@@ -541,7 +536,7 @@ get_filter_driver (CamelSession *session /* 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 */ @@ -5089,7 +5089,7 @@ static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) { -@@ -544,7 +539,7 @@ static void *ms_thread_msg_new(CamelSess +@@ -550,7 +545,7 @@ static void *ms_thread_msg_new(CamelSess /* 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) { @@ -5098,7 +5098,7 @@ msg->data = m; camel_operation_unref(msg->op); -@@ -557,7 +552,7 @@ static void *ms_thread_msg_new(CamelSess +@@ -563,7 +558,7 @@ static void *ms_thread_msg_new(CamelSess static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) { @@ -5107,7 +5107,7 @@ ms_parent_class->thread_msg_free(session, m); } -@@ -680,22 +675,23 @@ mail_session_set_interactive (gboolean i +@@ -686,22 +681,23 @@ mail_session_set_interactive (gboolean i MAIL_SESSION (session)->interactive = interactive; if (!interactive) { @@ -5137,8 +5137,8 @@ } } } ---- evolution-2.11.4/mail/mail-mt.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/mail-mt.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-mt.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.90/mail/mail-mt.c 2007-08-15 13:37:37.000000000 -0400 @@ -29,8 +29,8 @@ #include #include @@ -5431,10 +5431,10 @@ - GDestroyNotify func; - void *data; -}; -- --static EDList cancel_hook_list = E_DLIST_INITIALISER(cancel_hook_list); +static GHookList cancel_hook_list; +-static EDList cancel_hook_list = E_DLIST_INITIALISER(cancel_hook_list); +- -void *mail_cancel_hook_add(GDestroyNotify func, void *data) +GHook * +mail_cancel_hook_add (GHookFunc func, gpointer data) @@ -6218,8 +6218,8 @@ } /* ******************** */ ---- evolution-2.11.4/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-18 06:17:14.000000000 -0400 -+++ evolution-2.11.4/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-07-05 02:09:19.000000000 -0400 ++++ evolution-2.11.90/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-08-15 13:37:37.000000000 -0400 @@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe ( @@ -6299,8 +6299,8 @@ - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push (unsub); } ---- evolution-2.11.4/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-05-14 00:24:02.000000000 -0400 -+++ evolution-2.11.4/plugins/mark-all-read/mark-all-read.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-07-05 02:09:23.000000000 -0400 ++++ evolution-2.11.90/plugins/mark-all-read/mark-all-read.c 2007-08-15 13:37:37.000000000 -0400 @@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM return; } @@ -6310,8 +6310,8 @@ } static void ---- evolution-2.11.4/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-05-13 13:41:07.000000000 -0400 -+++ evolution-2.11.4/plugins/exchange-operations/exchange-folder.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-07-05 02:09:22.000000000 -0400 ++++ evolution-2.11.90/plugins/exchange-operations/exchange-folder.c 2007-08-15 13:37:37.000000000 -0400 @@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr inbox_physical_uri = e_folder_get_physical_uri (inbox); @@ -6321,8 +6321,8 @@ } ---- evolution-2.11.4/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-18 06:17:20.000000000 -0400 -+++ evolution-2.11.4/plugins/save-attachments/save-attachments.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/save-attachments/save-attachments.c.kill-ethread 2007-07-05 02:09:25.000000000 -0400 ++++ evolution-2.11.90/plugins/save-attachments/save-attachments.c 2007-08-15 13:37:37.000000000 -0400 @@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); @@ -6330,8 +6330,8 @@ - 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.11.4/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-18 06:17:17.000000000 -0400 -+++ evolution-2.11.4/plugins/mailing-list-actions/mailing-list-actions.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-07-05 02:09:24.000000000 -0400 ++++ evolution-2.11.90/plugins/mailing-list-actions/mailing-list-actions.c 2007-08-15 13:37:37.000000000 -0400 @@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM data->uri = strdup (sel->uri); @@ -6341,8 +6341,8 @@ } void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.11.4/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-18 06:17:15.000000000 -0400 -+++ evolution-2.11.4/plugins/groupwise-features/share-folder-common.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-07-05 02:09:21.000000000 -0400 ++++ evolution-2.11.90/plugins/groupwise-features/share-folder-common.c 2007-08-15 13:37:37.000000000 -0400 @@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi } @@ -6440,8 +6440,8 @@ return id; } ---- evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.h 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-07-05 02:11:11.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.h 2007-08-15 13:37:37.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -6462,8 +6462,8 @@ struct _AlarmNotify { BonoboObject object; ---- evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-08-13 00:00:08.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.c 2007-08-15 13:37:37.000000000 -0400 @@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { GMutex *mutex; }; @@ -6576,8 +6576,8 @@ } static void ---- evolution-2.11.4/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-06-01 03:09:22.000000000 -0400 -+++ evolution-2.11.4/calendar/gui/alarm-notify/alarm-queue.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-08-13 00:00:08.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/alarm-notify/alarm-queue.c 2007-08-15 13:41:19.000000000 -0400 @@ -97,9 +97,6 @@ static int tray_blink_id = -1; static int tray_blink_state = FALSE; static AlarmNotify *an; @@ -6671,23 +6671,23 @@ - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = midnight_refresh_async; -- -- list = malloc (sizeof (struct _midnight_refresh_msg)); + struct _midnight_refresh_msg *msg; -- list->remove = TRUE; -- msg->data = list; +- list = malloc (sizeof (struct _midnight_refresh_msg)); + msg = g_slice_new (struct _midnight_refresh_msg); + msg->header.func = (MessageFunc) midnight_refresh_async; + msg->remove = TRUE; +- list->remove = TRUE; +- msg->data = list; +- - d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } /* Looks up a client in the client alarms hash table */ -@@ -618,6 +643,7 @@ remove_comp (ClientAlarms *ca, ECalCompo +@@ -658,6 +683,7 @@ remove_comp (ClientAlarms *ca, ECalCompo * alarms. */ struct _query_msg { @@ -6695,7 +6695,7 @@ ECal *client; GList *objects; gpointer data; -@@ -651,7 +677,7 @@ duplicate_ecal (GList *in_list) +@@ -691,7 +717,7 @@ duplicate_ecal (GList *in_list) } static void @@ -6704,7 +6704,7 @@ { ClientAlarms *ca; time_t from, day_end; -@@ -660,13 +686,12 @@ query_objects_changed_async (EThread *e, +@@ -700,13 +726,12 @@ query_objects_changed_async (EThread *e, icaltimezone *zone; CompQueuedAlarms *cqa; GList *l; @@ -6721,7 +6721,7 @@ from = config_data_get_last_notification_time (); if (from == -1) -@@ -755,43 +780,38 @@ query_objects_changed_async (EThread *e, +@@ -800,43 +825,38 @@ query_objects_changed_async (EThread *e, comp = NULL; } g_list_free (objects); @@ -6734,8 +6734,7 @@ { - AlarmMsg *msg; - struct _query_msg *list; -+ struct _query_msg *msg; - +- - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = query_objects_changed_async; @@ -6744,7 +6743,8 @@ - list->objects = duplicate_ical (objects); - list->data = data; - msg->data = list; -- ++ struct _query_msg *msg; + - d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + msg = g_slice_new (struct _query_msg); @@ -6778,7 +6778,7 @@ d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); -@@ -804,27 +824,22 @@ query_objects_removed_async (EThread *e, +@@ -849,27 +869,22 @@ query_objects_removed_async (EThread *e, } g_list_free (objects); @@ -6815,7 +6815,7 @@ } -@@ -966,20 +981,19 @@ free_tray_icon_data (TrayIconData *tray_ +@@ -1011,20 +1026,19 @@ free_tray_icon_data (TrayIconData *tray_ } static void @@ -6840,7 +6840,7 @@ e_cal_component_get_uid (tray_data->comp, &our_uid); g_return_if_fail (our_uid && *our_uid); -@@ -997,37 +1011,33 @@ on_dialog_objs_removed_async (EThread *e +@@ -1042,37 +1056,33 @@ on_dialog_objs_removed_async (EThread *e tray_data = NULL; } } @@ -6890,7 +6890,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)); -@@ -1066,28 +1076,25 @@ tray_list_remove_cqa_async(EThread *e, A +@@ -1111,28 +1121,25 @@ tray_list_remove_cqa_async(EThread *e, A gtk_tree_selection_select_iter (sel, &iter); } } @@ -6928,7 +6928,7 @@ { GList *list = tray_icons_list; -@@ -1117,55 +1124,50 @@ tray_list_remove_async(EThread *e, Alarm +@@ -1162,55 +1169,50 @@ tray_list_remove_async(EThread *e, Alarm } else list = list->next; } @@ -6941,16 +6941,16 @@ +tray_list_remove_icons (void) { - AlarmMsg *msg; -- ++ Message *msg; + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = tray_list_remove_async; -+ Message *msg; - -- msg->data = NULL; + msg = g_slice_new (Message); + msg->func = tray_list_remove_async; +- msg->data = NULL; +- - d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push (msg); @@ -6991,18 +6991,18 @@ - list->data = data; - msg->data = list; + struct _tray_msg *msg; -+ -+ msg = g_slice_new (struct _tray_msg); -+ msg->header.func = (MessageFunc) tray_list_remove_data_async; -+ msg->data = data; - d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _tray_msg); ++ msg->header.func = (MessageFunc) tray_list_remove_data_async; ++ msg->data = data; ++ + message_push ((Message *) msg); } static void -@@ -1372,29 +1374,24 @@ tray_icon_blink_cb (gpointer data) +@@ -1417,29 +1419,24 @@ tray_icon_blink_cb (gpointer data) /* Add a new data to tray list */ static void @@ -7043,7 +7043,7 @@ } /* Performs notification of a display alarm */ -@@ -1791,21 +1788,13 @@ check_midnight_refresh (gpointer user_da +@@ -1836,21 +1833,13 @@ check_midnight_refresh (gpointer user_da new_midnight = time_day_end_with_zone (time (NULL), zone); if (new_midnight > midnight) { @@ -7070,7 +7070,7 @@ } return TRUE; -@@ -1936,14 +1925,15 @@ hash_ids (gpointer a) +@@ -1981,14 +1970,15 @@ hash_ids (gpointer a) } struct _alarm_client_msg { @@ -7089,7 +7089,7 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -1974,6 +1964,8 @@ static void alarm_queue_add_async (EThre +@@ -2019,6 +2009,8 @@ static void alarm_queue_add_async (EThre G_CALLBACK (cal_opened_cb), ca); } @@ -7098,7 +7098,7 @@ } /** -@@ -1993,20 +1985,13 @@ static void alarm_queue_add_async (EThre +@@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre void alarm_queue_add_client (ECal *client) { @@ -7124,7 +7124,7 @@ } /* Removes a component an its alarms */ -@@ -2058,11 +2043,10 @@ remove_client_alarms (ClientAlarms *ca) +@@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca) * Removes a calendar client from the alarm queueing system. **/ static void @@ -7138,20 +7138,22 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2099,24 +2083,20 @@ alarm_queue_remove_async (EThread *e, Al +@@ -2144,6 +2128,8 @@ alarm_queue_remove_async (EThread *e, Al g_free (ca); g_hash_table_remove (client_alarms_hash, client); + -+ g_slice_free (struct _alarm_client_msg, msg); ++ g_slice_free (struct _alarm_client_msg, msg); } + /** alarm_queue_remove_client +@@ -2156,22 +2142,13 @@ alarm_queue_remove_async (EThread *e, Al void - alarm_queue_remove_client (ECal *client) + alarm_queue_remove_client (ECal *client, gboolean immediately) { - AlarmMsg *msg; - struct _alarm_client_msg *list; -+ struct _alarm_client_msg *msg; ++ struct _alarm_client_msg *msg; - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); @@ -7160,13 +7162,17 @@ - list = malloc (sizeof (struct _alarm_client_msg)); - list->client = client; - msg->data = list; -+ msg = g_slice_new (struct _alarm_client_msg); -+ msg->header.func = (MessageFunc) alarm_queue_remove_async; -+ msg->client = client; - +- - d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); +- if (immediately) +- alarm_queue_remove_async (NULL, msg, NULL); +- else +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _alarm_client_msg); ++ msg->header.func = (MessageFunc) alarm_queue_remove_async; ++ msg->client = client; ++ ++ message_push ((Message *) msg); } /* Update non-time related variables for various structures on modification of an existing component diff --git a/evolution.spec b/evolution.spec index 475dd12..adb0fe0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.11.6.1 +Version: 2.11.90 Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity @@ -711,6 +711,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Aug 15 2007 Matthew Barnes - 2.11.90-1.fc8 +- Update to 2.11.90 + * Wed Aug 8 2007 Matthias Clasen - 2.11.6.1-2 - Update the license field - Use %%find_lang for help files diff --git a/sources b/sources index 5ecdd52..db4ea2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b27f011166d16b2484f9f68992c48108 evolution-2.11.6.1.tar.bz2 +50b811f8799ef4e7143a53ffd1709c2b evolution-2.11.90.tar.bz2