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

source-dialog: give empty credentials instead of none at all

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2015-05-25 12:35:54 -04:00
committed by Erick Pérez Castellanos
parent 1c34dc69d8
commit dc30e1e4b0
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-source-dialog.c
+14 -4
View File
@@ -1257,6 +1257,8 @@ validate_url_cb (GcalSourceDialog *dialog)
} }
else else
{ {
ENamedParameters *credentials;
// Pulse the entry while it performs the check // Pulse the entry while it performs the check
priv->calendar_address_id = g_timeout_add (ENTRY_PROGRESS_TIMEOUT, (GSourceFunc) pulse_web_entry, dialog); priv->calendar_address_id = g_timeout_add (ENTRY_PROGRESS_TIMEOUT, (GSourceFunc) pulse_web_entry, dialog);
@@ -1265,6 +1267,8 @@ validate_url_cb (GcalSourceDialog *dialog)
* username and password. If we get any error, * username and password. If we get any error,
* then it prompts and retry. * then it prompts and retry.
*/ */
credentials = e_named_parameters_new ();
if (priv->prompt_password) if (priv->prompt_password)
{ {
gint response; gint response;
@@ -1279,15 +1283,13 @@ validate_url_cb (GcalSourceDialog *dialog)
*/ */
if (response == GTK_RESPONSE_OK) if (response == GTK_RESPONSE_OK)
{ {
ENamedParameters *credentials = e_named_parameters_new (); // User inputted credentials
e_named_parameters_set (credentials, E_SOURCE_CREDENTIAL_USERNAME, user); e_named_parameters_set (credentials, E_SOURCE_CREDENTIAL_USERNAME, user);
e_named_parameters_set (credentials, E_SOURCE_CREDENTIAL_PASSWORD, password); e_named_parameters_set (credentials, E_SOURCE_CREDENTIAL_PASSWORD, password);
e_webdav_discover_sources (source, gtk_entry_get_text (GTK_ENTRY (priv->calendar_address_entry)), 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, E_WEBDAV_DISCOVER_SUPPORTS_EVENTS, credentials, NULL, discover_sources_cb,
dialog); dialog);
e_named_parameters_free (credentials);
} }
if (user) if (user)
@@ -1298,9 +1300,17 @@ validate_url_cb (GcalSourceDialog *dialog)
else else
{ {
g_debug ("[source-dialog] Trying to connect without credentials..."); 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_sources (source, gtk_entry_get_text (GTK_ENTRY (priv->calendar_address_entry)),
E_WEBDAV_DISCOVER_SUPPORTS_EVENTS, NULL, NULL, discover_sources_cb, dialog); E_WEBDAV_DISCOVER_SUPPORTS_EVENTS, credentials, NULL, discover_sources_cb,
dialog);
} }
e_named_parameters_free (credentials);
} }
out: out: