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

source-dialog: first action goes top, second goes down

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2015-05-25 12:35:55 -04:00
committed by Erick Pérez Castellanos
parent d5b04e24ac
commit d892f981cb
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-source-dialog.c
+15 -15
View File
@@ -1191,11 +1191,25 @@ validate_url_cb (GcalSourceDialog *dialog)
*/ */
credentials = e_named_parameters_new (); credentials = e_named_parameters_new ();
if (priv->prompt_password) if (!priv->prompt_password)
{
g_debug ("[source-dialog] Trying to connect without credentials...");
// NULL credentials
e_named_parameters_set (credentials, E_SOURCE_CREDENTIAL_USERNAME, NULL);
e_named_parameters_set (credentials, E_SOURCE_CREDENTIAL_PASSWORD, NULL);
e_webdav_discover_sources (source, gtk_entry_get_text (GTK_ENTRY (priv->calendar_address_entry)),
E_WEBDAV_DISCOVER_SUPPORTS_EVENTS, credentials, NULL, discover_sources_cb,
dialog);
}
else
{ {
gint response; gint response;
gchar *user, *password; gchar *user, *password;
g_debug ("[source-dialog] No credentials failed, retrying with user credentials...");
user = password = NULL; user = password = NULL;
response = prompt_credentials (dialog, &user, &password); response = prompt_credentials (dialog, &user, &password);
@@ -1219,18 +1233,6 @@ validate_url_cb (GcalSourceDialog *dialog)
if (password) if (password)
g_free (password); g_free (password);
} }
else
{
g_debug ("[source-dialog] Trying to connect without credentials...");
// NULL credentials
e_named_parameters_set (credentials, E_SOURCE_CREDENTIAL_USERNAME, NULL);
e_named_parameters_set (credentials, E_SOURCE_CREDENTIAL_PASSWORD, NULL);
e_webdav_discover_sources (source, gtk_entry_get_text (GTK_ENTRY (priv->calendar_address_entry)),
E_WEBDAV_DISCOVER_SUPPORTS_EVENTS, credentials, NULL, discover_sources_cb,
dialog);
}
e_named_parameters_free (credentials); e_named_parameters_free (credentials);
} }
@@ -1406,8 +1408,6 @@ discover_sources_cb (GObject *source,
*/ */
if (!priv->prompt_password && error->code == 14) if (!priv->prompt_password && error->code == 14)
{ {
g_debug ("[source-dialog] No credentials failed, retrying with user credentials...");
priv->prompt_password = TRUE; priv->prompt_password = TRUE;
validate_url_cb (GCAL_SOURCE_DIALOG (user_data)); validate_url_cb (GCAL_SOURCE_DIALOG (user_data));