From 6ba0a6a95bc68ea6bb49b4b2d623e3ea60ba6d79 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 8 Feb 2013 07:03:26 -0500 Subject: Revert "Bug #683867 - Schedule actions with higher idle priority" This reverts commit 2b507716b257e6ef98dae8463180dbe718eb7b64. The commit contains not a single comment as to why these custom priority values are being used. The rationale needs to be documented in the code, either at each call point or preferrably at a centralized priority value definition. --- em-format/e-mail-parser.c | 5 ++--- libemail-engine/e-mail-utils.c | 2 +- libemail-engine/mail-folder-cache.c | 4 ++-- libemail-engine/mail-mt.c | 10 +++++----- mail/e-mail-browser.c | 2 +- mail/e-mail-display.c | 2 +- mail/e-mail-ui-session.c | 2 +- modules/itip-formatter/itip-view.c | 2 +- modules/settings/e-settings-mail-reader.c | 2 +- plugins/mail-to-task/mail-to-task.c | 2 +- shell/e-shell-searchbar.c | 2 +- smime/gui/certificate-manager.c | 2 +- 12 files changed, 18 insertions(+), 19 deletions(-) diff --git a/em-format/e-mail-parser.c b/em-format/e-mail-parser.c index f2832b1f03..359efe7d9b 100644 --- a/em-format/e-mail-parser.c +++ b/em-format/e-mail-parser.c @@ -723,10 +723,9 @@ e_mail_parser_wrap_as_attachment (EMailParser *parser, } /* e_attachment_load_async must be called from main thread */ - g_idle_add_full (G_PRIORITY_HIGH, + g_idle_add ( (GSourceFunc) load_attachment_idle, - g_object_ref (empa->attachment), - NULL); + g_object_ref (empa->attachment)); if (size != 0) { GFileInfo *fileinfo; diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c index 17e61365db..5e9a6db853 100644 --- a/libemail-engine/e-mail-utils.c +++ b/libemail-engine/e-mail-utils.c @@ -824,7 +824,7 @@ free_mail_cache_thread (gpointer user_data) e_cancellable_mutex_unlock (&photos_cache_lock); } - g_idle_add_full (G_PRIORITY_HIGH, free_mail_cache_idle, user_data, NULL); + g_idle_add (free_mail_cache_idle, user_data); return NULL; } diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c index f1af370b1e..35e620862e 100644 --- a/libemail-engine/mail-folder-cache.c +++ b/libemail-engine/mail-folder-cache.c @@ -304,8 +304,8 @@ flush_updates (MailFolderCache *cache) if (g_queue_is_empty (&cache->priv->updates)) return; - cache->priv->update_id = g_idle_add_full (G_PRIORITY_DEFAULT, - (GSourceFunc) flush_updates_idle_cb, cache, NULL); + cache->priv->update_id = g_idle_add ( + (GSourceFunc) flush_updates_idle_cb, cache); } /* This is how unread counts work (and don't work): diff --git a/libemail-engine/mail-mt.c b/libemail-engine/mail-mt.c index 3ff5242344..baf1476f82 100644 --- a/libemail-engine/mail-mt.c +++ b/libemail-engine/mail-mt.c @@ -216,7 +216,7 @@ mail_msg_unref (gpointer msg) /* Destroy the message from an idle callback * so we know we're in the main loop thread. */ - g_idle_add_full (G_PRIORITY_DEFAULT, (GSourceFunc) mail_msg_free, mail_msg, NULL); + g_idle_add ((GSourceFunc) mail_msg_free, mail_msg); } } @@ -429,8 +429,8 @@ mail_msg_proxy (MailMsg *msg) G_LOCK (idle_source_id); if (idle_source_id == 0) - idle_source_id = g_idle_add_full (G_PRIORITY_DEFAULT, - (GSourceFunc) mail_msg_idle_cb, NULL, NULL); + idle_source_id = g_idle_add ( + (GSourceFunc) mail_msg_idle_cb, NULL); G_UNLOCK (idle_source_id); } @@ -484,8 +484,8 @@ mail_msg_main_loop_push (gpointer msg) G_LOCK (idle_source_id); if (idle_source_id == 0) - idle_source_id = g_idle_add_full (G_PRIORITY_DEFAULT, - (GSourceFunc) mail_msg_idle_cb, NULL, NULL); + idle_source_id = g_idle_add ( + (GSourceFunc) mail_msg_idle_cb, NULL); G_UNLOCK (idle_source_id); } diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index 15f61c50a5..9ca4ce230f 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -302,7 +302,7 @@ mail_browser_message_list_built_cb (EMailBrowser *browser, g_return_if_fail (IS_MESSAGE_LIST (message_list)); if (!message_list_count (message_list)) - g_idle_add_full (G_PRIORITY_DEFAULT, close_on_idle_cb, browser, NULL); + g_idle_add (close_on_idle_cb, browser); } static gboolean diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index d1e27f8fa3..a286787be0 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -1926,7 +1926,7 @@ e_mail_display_reload (EMailDisplay *display) /* Schedule reloading if neccessary */ display->priv->scheduled_reload = - g_idle_add_full (G_PRIORITY_DEFAULT, (GSourceFunc) do_reload_display, display, NULL); + g_idle_add ((GSourceFunc) do_reload_display, display); } GtkAction * diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c index 62defbc914..d07bc1ee77 100644 --- a/mail/e-mail-ui-session.c +++ b/mail/e-mail-ui-session.c @@ -597,7 +597,7 @@ mail_ui_session_add_service (CamelSession *session, context->service = g_object_ref (service); g_idle_add_full ( - G_PRIORITY_DEFAULT, + G_PRIORITY_DEFAULT_IDLE, (GSourceFunc) mail_ui_session_add_service_cb, context, (GDestroyNotify) source_context_free); } diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c index 6f72c9bda2..1a8742b574 100644 --- a/modules/itip-formatter/itip-view.c +++ b/modules/itip-formatter/itip-view.c @@ -5705,7 +5705,7 @@ view_response_cb (ItipView *view, send_item (pitip, view); break; case ITIP_VIEW_RESPONSE_OPEN: - g_idle_add_full (G_PRIORITY_DEFAULT, idle_open_cb, pitip, NULL); + g_idle_add (idle_open_cb, pitip); return; default: break; diff --git a/modules/settings/e-settings-mail-reader.c b/modules/settings/e-settings-mail-reader.c index 360ce321d3..9cf906fbef 100644 --- a/modules/settings/e-settings-mail-reader.c +++ b/modules/settings/e-settings-mail-reader.c @@ -86,7 +86,7 @@ settings_mail_reader_constructed (GObject *object) /* Bind properties to settings from an idle callback so the * EMailReader interface has a chance to be initialized first. */ g_idle_add_full ( - G_PRIORITY_DEFAULT, + G_PRIORITY_DEFAULT_IDLE, (GSourceFunc) settings_mail_reader_idle_cb, g_object_ref (object), (GDestroyNotify) g_object_unref); diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 4e773f06a7..978011f12f 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -1011,7 +1011,7 @@ do_mail_to_event (AsyncData *data) if (!e_cal_client_get_object_sync (E_CAL_CLIENT (client), icalcomponent_get_uid (icalcomp), NULL, &(mc->stored_comp), NULL, NULL)) mc->stored_comp = NULL; - g_idle_add_full (G_PRIORITY_DEFAULT, (GSourceFunc) do_manage_comp_idle, mc, NULL); + g_idle_add ((GSourceFunc) do_manage_comp_idle, mc); oldmc = mc; diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c index 2c762a31ea..b62d255ec3 100644 --- a/shell/e-shell-searchbar.c +++ b/shell/e-shell-searchbar.c @@ -1735,7 +1735,7 @@ e_shell_searchbar_load_state (EShellSearchbar *searchbar) /* Execute the search when we have time. */ g_object_ref (shell_view); searchbar->priv->state_dirty = FALSE; - g_idle_add_full (G_PRIORITY_DEFAULT, idle_execute_search, shell_view, NULL); + g_idle_add (idle_execute_search, shell_view); } void diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index a34e7ec04f..30bfb62291 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -1085,7 +1085,7 @@ e_cert_manager_config_init (ECertManagerConfig *ecmc) * fully initialize itself and start its main loop before we * load certificates, since doing so may trigger a password * dialog, and dialogs require a main loop. */ - g_idle_add_full (G_PRIORITY_DEFAULT, (GSourceFunc) populate_ui, ecmc, NULL); + g_idle_add ((GSourceFunc) populate_ui, ecmc); /* Disconnect cert-manager-notebook from it's window and attach it * to this ECertManagerConfig */ -- cgit v1.2.3