From cefbbbcbf1eab194b78e54fd45e69440b7fa4f61 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 6 Jun 2007 17:36:18 +0000 Subject: [PATCH] - Revise patch for GNOME bug #362638 to fix RH bug #240507 (hang on exit). --- evolution-2.8.1-kill-ethread.patch | 134 ++++++++++++++--------------- evolution.spec | 5 +- 2 files changed, 70 insertions(+), 69 deletions(-) diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 53f01cc..0a7e15a 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,5 +1,5 @@ --- evolution-2.11.3/mail/mail-send-recv.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-send-recv.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-send-recv.c 2007-06-06 12:59:41.000000000 -0400 @@ -764,23 +764,22 @@ receive_get_folder(CamelFilterDriver *d, /* ********************************************************************** */ @@ -83,7 +83,7 @@ receive_done ("", data); } --- evolution-2.11.3/mail/mail-component.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-component.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-component.c 2007-06-06 12:59:41.000000000 -0400 @@ -1014,7 +1014,7 @@ impl_handleURI (PortableServer_Servant s if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -94,7 +94,7 @@ } else { g_warning("email uri's must include a uid parameter"); --- evolution-2.11.3/mail/mail-ops.c.kill-ethread 2007-06-01 03:08:56.000000000 -0400 -+++ evolution-2.11.3/mail/mail-ops.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-ops.c 2007-06-06 12:59:41.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 */ @@ -2225,7 +2225,7 @@ return id; } --- evolution-2.11.3/mail/em-folder-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-utils.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-utils.c 2007-06-06 12:59:41.000000000 -0400 @@ -84,7 +84,7 @@ emfu_is_special_local_folder (const char } @@ -2454,7 +2454,7 @@ return id; } --- evolution-2.11.3/mail/importers/elm-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.3/mail/importers/elm-importer.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/importers/elm-importer.c 2007-06-06 12:59:41.000000000 -0400 @@ -51,7 +51,7 @@ #define d(x) x @@ -2554,7 +2554,7 @@ return id; } --- evolution-2.11.3/mail/importers/mail-importer.c.kill-ethread 2007-06-03 11:08:07.000000000 -0400 -+++ evolution-2.11.3/mail/importers/mail-importer.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/importers/mail-importer.c 2007-06-06 12:59:41.000000000 -0400 @@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact } @@ -2692,7 +2692,7 @@ struct _import_folders_data { --- evolution-2.11.3/mail/importers/pine-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.3/mail/importers/pine-importer.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/importers/pine-importer.c 2007-06-06 12:59:41.000000000 -0400 @@ -56,7 +56,7 @@ #define d(x) x @@ -2792,8 +2792,8 @@ return id; } ---- evolution-2.11.3/mail/em-utils.c.kill-ethread 2007-06-04 14:25:09.000000000 -0400 -+++ evolution-2.11.3/mail/em-utils.c 2007-06-04 14:25:34.000000000 -0400 +--- evolution-2.11.3/mail/em-utils.c.kill-ethread 2007-06-06 12:59:27.000000000 -0400 ++++ evolution-2.11.3/mail/em-utils.c 2007-06-06 12:59:41.000000000 -0400 @@ -1906,7 +1906,7 @@ em_utils_in_addressbook(CamelInternetAdd ESource *source = s->data; GList *contacts; @@ -2804,7 +2804,7 @@ d(printf(" checking '%s'\n", e_source_get_uri(source))); --- evolution-2.11.3/mail/mail-vfolder.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-vfolder.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-vfolder.c 2007-06-06 12:59:41.000000000 -0400 @@ -21,7 +21,7 @@ */ @@ -3040,7 +3040,7 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); --- evolution-2.11.3/mail/em-format-html.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-format-html.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-format-html.c 2007-06-06 12:59:41.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); @@ -3166,7 +3166,7 @@ g_object_ref(emf); m->format_source = emfsource; --- evolution-2.11.3/mail/em-folder-properties.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-properties.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-properties.c 2007-06-06 12:59:41.000000000 -0400 @@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par } @@ -3177,7 +3177,7 @@ emfp_dialog_got_folder((char *)uri, folder, NULL); } --- evolution-2.11.3/mail/em-folder-tree.c.kill-ethread 2007-06-04 01:52:58.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-tree.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-tree.c 2007-06-06 12:59:41.000000000 -0400 @@ -834,7 +834,7 @@ fail: /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ /* Drop handling */ @@ -3416,7 +3416,7 @@ static gboolean --- evolution-2.11.3/mail/em-folder-browser.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-browser.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-browser.c 2007-06-06 12:59:41.000000000 -0400 @@ -839,7 +839,7 @@ get_view_query (ESearchBar *esb) @@ -3519,7 +3519,7 @@ return id; } --- evolution-2.11.3/mail/message-list.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/message-list.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/message-list.c 2007-06-06 12:59:41.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 */ @@ -3797,7 +3797,7 @@ m->search = g_strdup (search); m->hideexpr = g_strdup (hideexpr); --- evolution-2.11.3/mail/em-sync-stream.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-sync-stream.h 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-sync-stream.h 2007-06-06 12:59:41.000000000 -0400 @@ -29,41 +29,45 @@ requests are always handled in the main #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -3875,7 +3875,7 @@ #endif /* EM_SYNC_STREAM_H */ --- evolution-2.11.3/mail/em-format-html-print.c.kill-ethread 2007-04-22 13:20:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-format-html-print.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-format-html-print.c 2007-06-06 12:59:41.000000000 -0400 @@ -224,7 +224,7 @@ em_format_html_print_message (EMFormatHT g_object_ref (efhp); @@ -3886,7 +3886,7 @@ void --- evolution-2.11.3/mail/em-sync-stream.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-sync-stream.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-sync-stream.c 2007-06-06 12:59:41.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -4313,7 +4313,7 @@ + emss->buffer = g_string_sized_new (size); } --- evolution-2.11.3/mail/em-subscribe-editor.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-subscribe-editor.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-subscribe-editor.c 2007-06-06 12:59:41.000000000 -0400 @@ -175,7 +175,7 @@ sub_unref(EMSubscribe *sub) /* ** Subscribe folder operation **************************************** */ @@ -4530,7 +4530,7 @@ sub_unref(sub); } --- evolution-2.11.3/mail/mail-mt.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-mt.h 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-mt.h 2007-06-06 12:59:41.000000000 -0400 @@ -23,47 +23,64 @@ #ifndef _MAIL_MT #define _MAIL_MT @@ -4643,7 +4643,7 @@ /* 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.3/mail/mail-ops.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-ops.h 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-ops.h 2007-06-06 12:59:41.000000000 -0400 @@ -30,13 +30,14 @@ extern "C" { #pragma } #endif /* __cplusplus */ @@ -4685,7 +4685,7 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, --- evolution-2.11.3/mail/em-composer-utils.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-composer-utils.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-composer-utils.c 2007-06-06 12:59:41.000000000 -0400 @@ -534,7 +534,7 @@ em_utils_composer_save_draft_cb (EMsgCom strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -4730,7 +4730,7 @@ + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } --- evolution-2.11.3/mail/mail-folder-cache.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-folder-cache.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-folder-cache.c 2007-06-06 12:59:41.000000000 -0400 @@ -860,15 +860,14 @@ update_folders(CamelStore *store, CamelF @@ -4817,7 +4817,7 @@ LOCK(info_lock); --- evolution-2.11.3/mail/em-folder-view.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-view.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-view.c 2007-06-06 12:59:41.000000000 -0400 @@ -71,6 +71,7 @@ #include @@ -4863,7 +4863,7 @@ e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); --- evolution-2.11.3/mail/mail-session.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-session.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-session.c 2007-06-06 12:59:41.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -5138,7 +5138,7 @@ } } --- evolution-2.11.3/mail/mail-mt.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-mt.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-mt.c 2007-06-06 12:59:41.000000000 -0400 @@ -29,8 +29,8 @@ #include #include @@ -5185,7 +5185,7 @@ fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); } } else { -@@ -122,14 +118,14 @@ void *mail_msg_new(mail_msg_op_t *ops, E +@@ -122,13 +118,13 @@ void *mail_msg_new(mail_msg_op_t *ops, E } } #endif @@ -5203,8 +5203,7 @@ g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); - d(printf("New message %p\n", msg)); -@@ -143,12 +140,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E +@@ -143,12 +139,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E return msg; } @@ -5223,7 +5222,7 @@ e_activity_handler_operation_finished (activity_handler, activity_id); } -@@ -177,58 +177,84 @@ checkmem(void *p) +@@ -177,58 +176,84 @@ checkmem(void *p) } #endif @@ -5334,7 +5333,7 @@ } /* hash table of ops->dialogue of active errors */ -@@ -244,9 +271,10 @@ static void error_response(GtkObject *o, +@@ -244,9 +269,10 @@ static void error_response(GtkObject *o, gtk_widget_destroy((GtkWidget *)o); } @@ -5347,7 +5346,7 @@ char *what; GtkDialog *gd; -@@ -271,27 +299,27 @@ void mail_msg_check_error(void *msg) +@@ -271,27 +297,27 @@ void mail_msg_check_error(void *msg) /* check to see if we have dialogue already running for this operation */ /* we key on the operation pointer, which is at least accurate enough for the operation type, although it could be on a different object. */ @@ -5382,7 +5381,7 @@ MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); -@@ -304,13 +332,12 @@ void mail_msg_cancel(unsigned int msgid) +@@ -304,13 +330,12 @@ void mail_msg_cancel(unsigned int msgid) /* waits for a message to be finished processing (freed) @@ -5399,7 +5398,7 @@ MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); while (m) { -@@ -347,9 +374,7 @@ int mail_msg_active(unsigned int msgid) +@@ -347,9 +372,7 @@ int mail_msg_active(unsigned int msgid) void mail_msg_wait_all(void) { @@ -5410,7 +5409,7 @@ MAIL_MT_LOCK(mail_msg_lock); while (g_hash_table_size(mail_msg_active_table) > 0) { MAIL_MT_UNLOCK(mail_msg_lock); -@@ -367,294 +392,239 @@ void mail_msg_wait_all(void) +@@ -367,294 +390,239 @@ void mail_msg_wait_all(void) } /* **************************************** */ @@ -5799,11 +5798,11 @@ +mail_msg_unordered_push (gpointer msg) +{ + static GOnce once = G_ONCE_INIT; ++ ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); - e_msgport_destroy(mail_gui_port); - e_msgport_destroy(mail_gui_reply_port); -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); -+ + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); } @@ -5857,15 +5856,15 @@ - e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); - e_thread_set_queue_limit(mail_thread_new, 10); + static GOnce once = G_ONCE_INIT; -+ -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - mail_msg_active_table = g_hash_table_new(NULL, NULL); - mail_gui_thread = pthread_self(); -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); -+} ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - mail_async_event = mail_async_event_new(); ++ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); ++} ++ +gboolean +mail_in_main_thread (void) +{ @@ -5873,7 +5872,7 @@ } /* ********************************************************************** */ -@@ -665,7 +635,8 @@ static pthread_mutex_t status_lock = PTH +@@ -665,7 +633,8 @@ static pthread_mutex_t status_lock = PTH /* ********************************************************************** */ struct _proxy_msg { @@ -5883,7 +5882,7 @@ MailAsyncEvent *ea; mail_async_event_t type; -@@ -679,10 +650,8 @@ struct _proxy_msg { +@@ -679,10 +648,8 @@ struct _proxy_msg { }; static void @@ -5895,7 +5894,7 @@ m->thread = pthread_self(); m->have_thread = TRUE; m->func(m->o, m->event_data, m->data); -@@ -697,16 +666,17 @@ static int +@@ -697,16 +664,17 @@ static int idle_async_event(void *mm) { do_async_event(mm); @@ -5919,7 +5918,7 @@ }; MailAsyncEvent *mail_async_event_new(void) -@@ -723,10 +693,9 @@ int mail_async_event_emit(MailAsyncEvent +@@ -723,10 +691,9 @@ int mail_async_event_emit(MailAsyncEvent { struct _proxy_msg *m; int id; @@ -5931,7 +5930,7 @@ m->func = func; m->o = o; m->event_data = event_data; -@@ -735,7 +704,7 @@ int mail_async_event_emit(MailAsyncEvent +@@ -735,7 +702,7 @@ int mail_async_event_emit(MailAsyncEvent m->type = type; m->have_thread = FALSE; @@ -5940,7 +5939,7 @@ g_mutex_lock(ea->lock); ea->tasks = g_slist_prepend(ea->tasks, m); g_mutex_unlock(ea->lock); -@@ -743,12 +712,12 @@ int mail_async_event_emit(MailAsyncEvent +@@ -743,12 +710,12 @@ int mail_async_event_emit(MailAsyncEvent /* We use an idle function instead of our own message port only because the gui message ports's notification buffer might overflow and deadlock us */ if (type == MAIL_ASYNC_GUI) { @@ -5956,7 +5955,7 @@ return id; } -@@ -762,7 +731,7 @@ int mail_async_event_destroy(MailAsyncEv +@@ -762,7 +729,7 @@ int mail_async_event_destroy(MailAsyncEv g_mutex_lock(ea->lock); while (ea->tasks) { m = ea->tasks->data; @@ -5965,7 +5964,7 @@ if (m->have_thread && pthread_equal(m->thread, thread)) { g_warning("Destroying async event from inside an event, returning EDEADLK"); g_mutex_unlock(ea->lock); -@@ -784,17 +753,18 @@ int mail_async_event_destroy(MailAsyncEv +@@ -784,17 +751,18 @@ int mail_async_event_destroy(MailAsyncEv /* ********************************************************************** */ struct _call_msg { @@ -5987,7 +5986,7 @@ void *p1, *p2, *p3, *p4, *p5; int i1; va_list ap; -@@ -842,45 +812,48 @@ do_call(struct _mail_msg *mm) +@@ -842,45 +810,47 @@ do_call(struct _mail_msg *mm) m->ret = m->func(p1, p2, i1, p3, p4, p5); break; } @@ -6036,11 +6035,10 @@ - e_msgport_destroy(reply); - } else { - do_call(&m->msg); -+ mail_msg_ref (m); -+ + if (mail_in_main_thread ()) + do_call (m); + else { ++ mail_msg_ref (m); + m->done = e_flag_new (); + mail_msg_main_loop_push (m); + e_flag_wait (m->done); @@ -6055,7 +6053,7 @@ return ret; } -@@ -889,40 +862,42 @@ void *mail_call_main(mail_call_t type, M +@@ -889,40 +859,42 @@ void *mail_call_main(mail_call_t type, M /* locked via status_lock */ static int busy_state; @@ -6110,7 +6108,7 @@ } MAIL_MT_UNLOCK(status_lock); } -@@ -930,7 +905,7 @@ void mail_disable_stop(void) +@@ -930,7 +902,7 @@ void mail_disable_stop(void) /* ******************************************************************************** */ struct _op_status_msg { @@ -6119,7 +6117,7 @@ struct _CamelOperation *op; char *what; -@@ -938,16 +913,16 @@ struct _op_status_msg { +@@ -938,16 +910,16 @@ struct _op_status_msg { void *data; }; @@ -6141,7 +6139,7 @@ MAIL_MT_LOCK (mail_msg_lock); -@@ -986,8 +961,8 @@ static void do_op_status(struct _mail_ms +@@ -986,8 +958,8 @@ static void do_op_status(struct _mail_ms progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU); MAIL_MT_UNLOCK (mail_msg_lock); @@ -6152,7 +6150,7 @@ /* uncommenting because message is not very useful for a user, see bug 271734*/ else { what = g_strdup(""); -@@ -1021,18 +996,17 @@ static void do_op_status(struct _mail_ms +@@ -1021,18 +993,17 @@ static void do_op_status(struct _mail_ms } static void @@ -6178,7 +6176,7 @@ }; static void -@@ -1042,7 +1016,7 @@ mail_operation_status (struct _CamelOper +@@ -1042,7 +1013,7 @@ mail_operation_status (struct _CamelOper d(printf("got operation statys: %s %d%%\n", what, pc)); @@ -6187,7 +6185,7 @@ m->op = op; m->what = g_strdup(what); switch (pc) { -@@ -1055,7 +1029,7 @@ mail_operation_status (struct _CamelOper +@@ -1055,7 +1026,7 @@ mail_operation_status (struct _CamelOper } m->pc = pc; m->data = data; @@ -6197,7 +6195,7 @@ /* ******************** */ --- evolution-2.11.3/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-18 06:17:14.000000000 -0400 -+++ evolution-2.11.3/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-06-06 12:59:41.000000000 -0400 @@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe ( @@ -6278,7 +6276,7 @@ + mail_msg_unordered_push (unsub); } --- evolution-2.11.3/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-05-14 00:24:02.000000000 -0400 -+++ evolution-2.11.3/plugins/mark-all-read/mark-all-read.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/mark-all-read/mark-all-read.c 2007-06-06 12:59:41.000000000 -0400 @@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM return; } @@ -6289,7 +6287,7 @@ static void --- evolution-2.11.3/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-05-13 13:41:07.000000000 -0400 -+++ evolution-2.11.3/plugins/exchange-operations/exchange-folder.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/exchange-operations/exchange-folder.c 2007-06-06 12:59:41.000000000 -0400 @@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr inbox_physical_uri = e_folder_get_physical_uri (inbox); @@ -6300,7 +6298,7 @@ } --- evolution-2.11.3/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-18 06:17:20.000000000 -0400 -+++ evolution-2.11.3/plugins/save-attachments/save-attachments.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/save-attachments/save-attachments.c 2007-06-06 12:59:41.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]); @@ -6309,7 +6307,7 @@ + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } --- evolution-2.11.3/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-18 06:17:17.000000000 -0400 -+++ evolution-2.11.3/plugins/mailing-list-actions/mailing-list-actions.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/mailing-list-actions/mailing-list-actions.c 2007-06-06 12:59:41.000000000 -0400 @@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM data->uri = strdup (sel->uri); @@ -6320,7 +6318,7 @@ void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) --- evolution-2.11.3/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-18 06:17:15.000000000 -0400 -+++ evolution-2.11.3/plugins/groupwise-features/share-folder-common.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/groupwise-features/share-folder-common.c 2007-06-06 12:59:41.000000000 -0400 @@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi } @@ -6419,7 +6417,7 @@ return id; } --- evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.h 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.h 2007-06-06 12:59:41.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -6441,7 +6439,7 @@ BonoboObject object; --- evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c 2007-06-06 12:59:41.000000000 -0400 @@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { GMutex *mutex; }; @@ -6555,7 +6553,7 @@ static void --- evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-06-01 03:09:22.000000000 -0400 -+++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c 2007-06-06 12:59:41.000000000 -0400 @@ -97,9 +97,6 @@ static int tray_blink_id = -1; static int tray_blink_state = FALSE; static AlarmNotify *an; diff --git a/evolution.spec b/evolution.spec index c400628..98d3b29 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -711,6 +711,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jun 06 2007 Matthew Barnes - 2.11.3-4.fc8 +- Revise patch for GNOME bug #362638 to fix RH bug #240507 (hang on exit). + * Wed Jun 06 2007 Matthew Barnes - 2.11.3-3.fc8 - Remove some debug messages that accidentally slipped in.