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

source-dialog: join two conditionals

Browse Source 
Below the main conditionals were another if with no else block.
Those can be joined using && operator.
Some minor style fixes in here also.
This commit is contained in:
Erick Pérez Castellanos
2015-05-25 12:36:54 -04:00
parent d1f437f4d9
commit 46a92fd96b
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-source-dialog.c
+13 -23
View File
@@ -739,34 +739,24 @@ response_signal (GtkDialog *dialog,
g_clear_object (&priv->source);
}
/* commit the new source */
if (priv->mode == GCAL_SOURCE_DIALOG_MODE_NORMAL && response_id == GTK_RESPONSE_APPLY)
{
/* save the current page's source */
if (priv->remote_sources != NULL)
{
GList *l;
/* commit the new source; save the current page's source */
if (priv->mode == GCAL_SOURCE_DIALOG_MODE_NORMAL && response_id == GTK_RESPONSE_APPLY && priv->remote_sources != NULL)
{
GList *l;
for (l = priv->remote_sources; l != NULL; l = l->next)
{
// Commit each new remote source
gcal_manager_save_source (priv->manager, l->data);
}
// Commit each new remote source
for (l = priv->remote_sources; l != NULL; l = l->next)
gcal_manager_save_source (priv->manager, l->data);
g_list_free (priv->remote_sources);
priv->remote_sources = NULL;
}
}
g_list_free (priv->remote_sources);
priv->remote_sources = NULL;
}
/* Destroy the source when the operation is cancelled */
if (priv->mode == GCAL_SOURCE_DIALOG_MODE_NORMAL && response_id == GTK_RESPONSE_CANCEL)
if (priv->mode == GCAL_SOURCE_DIALOG_MODE_NORMAL && response_id == GTK_RESPONSE_CANCEL && priv->remote_sources != NULL)
{
if (priv->remote_sources != NULL)
{
g_list_free_full (priv->remote_sources, g_object_unref);
priv->remote_sources = NULL;
}
g_list_free_full (priv->remote_sources, g_object_unref);
priv->remote_sources = NULL;
}
}