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

manager: avoid deep nesting

Browse Source 
Use an early return rather than deep nesting to improve the
code legibility.

https://bugzilla.gnome.org/show_bug.cgi?id=764623
This commit is contained in:
Georges Basile Stavracas Neto
2016-10-03 14:10:35 -03:00
parent 7d3cd7f727
commit 3d3dddf815
1 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-manager.c
+41 -45
View File
@@ -340,13 +340,11 @@ on_client_connected (GObject *source_object,
GAsyncResult *result, GAsyncResult *result,
gpointer user_data) gpointer user_data)
{ {
GcalManagerUnit *unit;
GcalManager *manager; GcalManager *manager;
ECalClient *client; ECalClient *client;
GError *error;
ESource *source; ESource *source;
GError *error;
GcalManagerUnit *unit;
manager = GCAL_MANAGER (user_data); manager = GCAL_MANAGER (user_data);
source = e_client_get_source (E_CLIENT (source_object)); source = e_client_get_source (E_CLIENT (source_object));
@@ -357,48 +355,9 @@ on_client_connected (GObject *source_object,
error = NULL; error = NULL;
client = E_CAL_CLIENT (e_cal_client_connect_finish (result, &error)); client = E_CAL_CLIENT (e_cal_client_connect_finish (result, &error));
if (error == NULL)
if (error)
{ {
unit = g_new0 (GcalManagerUnit, 1);
unit->connected = TRUE;
unit->client = g_object_ref (client);
g_hash_table_insert (manager->clients, source, unit);
g_debug ("Source %s (%s) connected",
e_source_get_display_name (source),
e_source_get_uid (source));
/* notify the readonly property */
g_signal_connect (client, "notify::readonly", G_CALLBACK (on_client_readonly_changed), user_data);
if (g_strv_contains ((const gchar * const *) manager->disabled_sources, e_source_get_uid (source)))
{
unit->enabled = FALSE;
}
else
{
unit->enabled = TRUE;
e_cal_data_model_add_client (manager->e_data_model, client);
e_cal_data_model_add_client (manager->search_data_model, client);
if (manager->shell_search_data_model != NULL)
e_cal_data_model_add_client (manager->shell_search_data_model, client);
}
/* refresh client when it's added */
if (unit->enabled && e_client_check_refresh_supported (E_CLIENT (client)))
{
e_client_refresh (E_CLIENT (client), NULL, on_client_refreshed, user_data);
}
g_signal_emit (GCAL_MANAGER (user_data), signals[SOURCE_ADDED], 0, source, unit->enabled);
g_clear_object (&client);
}
else
{
/* in any other case, remove it*/
remove_source (GCAL_MANAGER (user_data), source); remove_source (GCAL_MANAGER (user_data), source);
g_warning ("%s: Failed to open/connect '%s': %s", g_warning ("%s: Failed to open/connect '%s': %s",
G_STRFUNC, G_STRFUNC,
@@ -409,6 +368,43 @@ on_client_connected (GObject *source_object,
g_error_free (error); g_error_free (error);
return; return;
} }
unit = g_new0 (GcalManagerUnit, 1);
unit->connected = TRUE;
unit->client = g_object_ref (client);
g_hash_table_insert (manager->clients, source, unit);
g_debug ("Source %s (%s) connected",
e_source_get_display_name (source),
e_source_get_uid (source));
/* notify the readonly property */
g_signal_connect (client, "notify::readonly", G_CALLBACK (on_client_readonly_changed), user_data);
if (g_strv_contains ((const gchar * const *) manager->disabled_sources, e_source_get_uid (source)))
{
unit->enabled = FALSE;
}
else
{
unit->enabled = TRUE;
e_cal_data_model_add_client (manager->e_data_model, client);
e_cal_data_model_add_client (manager->search_data_model, client);
if (manager->shell_search_data_model != NULL)
e_cal_data_model_add_client (manager->shell_search_data_model, client);
}
/* refresh client when it's added */
if (unit->enabled && e_client_check_refresh_supported (E_CLIENT (client)))
{
e_client_refresh (E_CLIENT (client), NULL, on_client_refreshed, user_data);
}
g_signal_emit (GCAL_MANAGER (user_data), signals[SOURCE_ADDED], 0, source, unit->enabled);
g_clear_object (&client);
} }
static void static void