Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manager: improved ESource/EClient connection flow

Browse Source
This commit is contained in:
Erick Pérez Castellanos
2014-12-04 17:10:40 -05:00
parent 503d0345d9
commit 6fa533ba79
1 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-manager.c
+32 -33
View File
@@ -187,18 +187,18 @@ load_source (GcalManager *manager,
unit = g_new0 (GcalManagerUnit, 1); unit = g_new0 (GcalManagerUnit, 1);
g_hash_table_insert (priv->clients, source, unit); g_hash_table_insert (priv->clients, source, unit);
/* NULL: because maybe the operation cannot be really cancelled */
e_cal_client_connect (source,
E_CAL_CLIENT_SOURCE_TYPE_EVENTS, NULL,
on_client_connected,
manager);
} }
else else
{ {
g_warning ("Skipping already loaded source: %s", g_warning ("Skipping already loaded source: %s",
e_source_get_uid (source)); e_source_get_uid (source));
} }
/* NULL: because maybe the operation cannot be really cancelled */
e_cal_client_connect (source,
E_CAL_CLIENT_SOURCE_TYPE_EVENTS, NULL,
on_client_connected,
manager);
} }
static void static void
@@ -229,45 +229,44 @@ on_client_connected (GObject *source_object,
/* FIXME: user should be able to disable sources */ /* FIXME: user should be able to disable sources */
unit->enabled = TRUE; unit->enabled = TRUE;
g_debug ("Source %s connected", g_debug ("Source %s (%s) connected",
e_source_get_display_name (source)); e_source_get_display_name (source),
e_source_get_uid (source));
/* setting view */ /* setting view */
recreate_view (GCAL_MANAGER (user_data), unit); recreate_view (GCAL_MANAGER (user_data), unit);
} }
else else
{ {
if (error != NULL) g_warning ("%s", error->message);
/* handling error */
if (g_error_matches (error,
E_CLIENT_ERROR,
E_CLIENT_ERROR_BUSY))
{ {
g_warning ("%s", error->message); RetryOpenData *rod;
/* handling error */ rod = g_new0 (RetryOpenData, 1);
if (g_error_matches (error, E_CLIENT_ERROR, rod->source = source;
E_CLIENT_ERROR_BUSY)) rod->manager = user_data;
{
RetryOpenData *rod;
rod = g_new0 (RetryOpenData, 1); g_timeout_add_seconds (2, retry_connect_on_timeout, rod);
rod->source = source;
rod->manager = user_data;
g_timeout_add_seconds (2, retry_connect_on_timeout, rod);
g_error_free (error);
return;
}
/* in any other case, remove it*/
remove_source (GCAL_MANAGER (user_data), source);
g_warning ("%s: Failed to open/connect '%s': %s",
G_STRFUNC,
e_source_get_display_name (source),
error->message);
g_object_unref (source);
g_error_free (error); g_error_free (error);
return; return;
} }
/* in any other case, remove it*/
remove_source (GCAL_MANAGER (user_data), source);
g_warning ("%s: Failed to open/connect '%s': %s",
G_STRFUNC,
e_source_get_display_name (source),
error->message);
g_object_unref (source);
g_error_free (error);
return;
} }
} }
@@ -613,7 +612,7 @@ gcal_manager_constructed (GObject *object)
return; return;
} }
sources = e_source_registry_list_sources (priv->source_registry, sources = e_source_registry_list_enabled (priv->source_registry,
E_SOURCE_EXTENSION_CALENDAR); E_SOURCE_EXTENSION_CALENDAR);
for (l = sources; l != NULL; l = l->next) for (l = sources; l != NULL; l = l->next)