aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-01-25 01:02:11 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-01-25 01:10:31 +0800
commit60c5c7170f5642a78a4fd2092e4e78caae8475d6 (patch)
tree70620e5c6207172473e96d405cfeb90f3eb6a205 /e-util
parentf3dfdae8458d08331551ce441be045f4dfaa8b77 (diff)
downloadgsoc2013-evolution-60c5c7170f5642a78a4fd2092e4e78caae8475d6.tar
gsoc2013-evolution-60c5c7170f5642a78a4fd2092e4e78caae8475d6.tar.gz
gsoc2013-evolution-60c5c7170f5642a78a4fd2092e4e78caae8475d6.tar.bz2
gsoc2013-evolution-60c5c7170f5642a78a4fd2092e4e78caae8475d6.tar.lz
gsoc2013-evolution-60c5c7170f5642a78a4fd2092e4e78caae8475d6.tar.xz
gsoc2013-evolution-60c5c7170f5642a78a4fd2092e4e78caae8475d6.tar.zst
gsoc2013-evolution-60c5c7170f5642a78a4fd2092e4e78caae8475d6.zip
E_CLIENT_ERROR_BUSY is no longer used.
Diffstat (limited to 'e-util')
-rw-r--r--e-util/e-client-utils.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/e-util/e-client-utils.c b/e-util/e-client-utils.c
index ed0688b637..04efbe8177 100644
--- a/e-util/e-client-utils.c
+++ b/e-util/e-client-utils.c
@@ -246,7 +246,6 @@ client_utils_open_new_done (EClientUtilsAsyncOpData *async_data)
e_client_retrieve_capabilities (async_data->client, async_data->cancellable, client_utils_capabilities_retrieved_cb, async_data);
}
-static gboolean client_utils_retry_open_timeout_cb (gpointer user_data);
static void client_utils_opened_cb (EClient *client, const GError *error, EClientUtilsAsyncOpData *async_data);
static void
@@ -255,11 +254,7 @@ finish_or_retry_open (EClientUtilsAsyncOpData *async_data,
{
g_return_if_fail (async_data != NULL);
- if (error && g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_BUSY)) {
- /* postpone for 1/2 of a second, backend is busy now */
- async_data->open_finished = FALSE;
- async_data->retry_open_id = g_timeout_add (500, client_utils_retry_open_timeout_cb, async_data);
- } else if (error) {
+ if (error) {
return_async_error (error, async_data->callback, async_data->user_data, async_data->source, e_client_utils_open_new);
free_client_utils_async_op_data (async_data);
} else {
@@ -325,25 +320,6 @@ client_utils_open_new_async_cb (GObject *source_object,
/* wait for 'opened' signal, which is received in client_utils_opened_cb */
}
-static gboolean
-client_utils_retry_open_timeout_cb (gpointer user_data)
-{
- EClientUtilsAsyncOpData *async_data = user_data;
-
- g_return_val_if_fail (async_data != NULL, FALSE);
-
- g_signal_handlers_disconnect_matched (async_data->cancellable, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, async_data);
-
- /* reconnect to the signal */
- g_signal_connect (async_data->client, "opened", G_CALLBACK (client_utils_opened_cb), async_data);
-
- e_client_open (async_data->client, async_data->only_if_exists, async_data->cancellable, client_utils_open_new_async_cb, async_data);
-
- async_data->retry_open_id = 0;
-
- return FALSE;
-}
-
/**
* e_client_utils_open_new:
* @source: an #ESource to be opened