aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-02-08 20:04:44 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-02-08 20:04:44 +0800
commit7fe46413c8062df133bcd3e98b8264c551fe645e (patch)
tree119416118ce723355e1d66e567f263e7a1722c9f
parent6be763ed338adfb3daba523f2ad3a51f4927339c (diff)
downloadgsoc2013-evolution-7fe46413c8062df133bcd3e98b8264c551fe645e.tar.gz
gsoc2013-evolution-7fe46413c8062df133bcd3e98b8264c551fe645e.tar.zst
gsoc2013-evolution-7fe46413c8062df133bcd3e98b8264c551fe645e.zip
Revert "Bug #683867 - Schedule actions with higher idle priority"
This reverts commit 6be763ed338adfb3daba523f2ad3a51f4927339c. 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.
-rw-r--r--em-format/e-mail-parser.c5
-rw-r--r--libemail-engine/e-mail-utils.c2
-rw-r--r--libemail-engine/mail-folder-cache.c4
-rw-r--r--libemail-utils/mail-mt.c10
-rw-r--r--mail/e-mail-browser.c2
-rw-r--r--mail/e-mail-display.c2
-rw-r--r--mail/e-mail-ui-session.c2
-rw-r--r--modules/itip-formatter/itip-view.c2
-rw-r--r--plugins/mail-to-task/mail-to-task.c2
-rw-r--r--shell/e-shell-searchbar.c2
-rw-r--r--smime/gui/certificate-manager.c2
11 files changed, 17 insertions, 18 deletions
diff --git a/em-format/e-mail-parser.c b/em-format/e-mail-parser.c
index b13ebd9886..36e6676266 100644
--- a/em-format/e-mail-parser.c
+++ b/em-format/e-mail-parser.c
@@ -660,10 +660,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 3043e06cdf..f29b2f7dd9 100644
--- a/libemail-engine/e-mail-utils.c
+++ b/libemail-engine/e-mail-utils.c
@@ -883,7 +883,7 @@ free_mail_cache_thread (gpointer user_data)
G_UNLOCK (photos_cache);
- 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 9c9c17d440..5561bb65f9 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-utils/mail-mt.c b/libemail-utils/mail-mt.c
index f27a6458e8..00b327248a 100644
--- a/libemail-utils/mail-mt.c
+++ b/libemail-utils/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 6b9d04f017..ac7271668f 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -306,7 +306,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 7430a2ede5..9da768631a 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -1923,7 +1923,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 66057c32ff..47eeea2eea 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -599,7 +599,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 c15fa5dd0c..0e9b39f6e2 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -5723,7 +5723,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/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 1ff2ccc99f..553955c30a 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -1014,7 +1014,7 @@ do_mail_to_event (AsyncData *data)
if (!e_cal_client_get_object_sync (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 5c8e050bda..7975f749e4 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -1546,7 +1546,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 f9f1b8a26c..3d823e6f8f 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -1078,7 +1078,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 */