diff options
| -rw-r--r-- | mail/ChangeLog | 14 | ||||
| -rw-r--r-- | mail/mail-account-gui.c | 2 | ||||
| -rw-r--r-- | mail/mail-config.c | 2 | ||||
| -rw-r--r-- | mail/mail-local.c | 4 | ||||
| -rw-r--r-- | mail/mail-ops.c | 2 | ||||
| -rw-r--r-- | mail/session.c | 2 |
6 files changed, 20 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 36c36b8272..d4536f53b2 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,17 @@ +2001-03-29 Dan Winship <danw@ximian.com> + + * session.c (auth_callback): Update call to camel_url_to_string. + (Don't include the params in the password hash table key.) + + * mail-config.c (mail_config_folder_to_cachename): Call + camel_url_to_string with HIDE_PASSWORD and HIDE_PARAMS so that + changing URL params doesn't change the cachename. + + * mail-ops.c (add_vtrash_info): + * mail-local.c (reconfigure_folder_reconfigure): + * mail-account-gui.c (save_service): Update calls to + camel_url_to_string. + 2001-03-29 Not Zed <NotZed@Ximian.com> * mail-local.c (init_trash): Create a vtrash folder, not a vee folder. diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index ce32971bc0..e3c2071cb4 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -1106,7 +1106,7 @@ save_service (MailAccountGuiService *gsvc, GHashTable *extra_config, extract_values (gsvc, extra_config, url); g_free (service->url); - service->url = camel_url_to_string (url, FALSE); + service->url = camel_url_to_string (url, 0); /* Temporary until keep_on_server moves into the POP provider */ if (camel_url_get_param (url, "keep_on_server")) diff --git a/mail/mail-config.c b/mail/mail-config.c index 00e0c8e7d0..7c0efea6d1 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -895,7 +895,7 @@ mail_config_folder_to_cachename (CamelFolder *folder, const char *prefix) { char *url, *filename; - url = camel_url_to_string (CAMEL_SERVICE (folder->parent_store)->url, FALSE); + url = camel_url_to_string (CAMEL_SERVICE (folder->parent_store)->url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS); e_filename_make_safe (url); filename = g_strdup_printf ("%s/config/%s%s", evolution_dir, prefix, url); diff --git a/mail/mail-local.c b/mail/mail-local.c index 2511922fa6..489f426046 100644 --- a/mail/mail-local.c +++ b/mail/mail-local.c @@ -854,9 +854,9 @@ reconfigure_folder_reconfigure(struct _mail_msg *mm) local_folder->folder = m->fb->folder = NULL; camel_url_set_protocol (url, meta->format); - fromurl = camel_url_to_string (url, FALSE); + fromurl = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS); camel_url_set_protocol (url, m->newtype); - tourl = camel_url_to_string (url, FALSE); + tourl = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS); d(printf("opening stores %s and %s\n", fromurl, tourl)); diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 475ab7767f..68b9e0d971 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -995,7 +995,7 @@ add_vtrash_info (CamelFolderInfo *info) url = camel_url_new (info->url, NULL); g_free (url->path); url->path = g_strdup_printf ("/%s", _("Trash")); - uri = camel_url_to_string (url, FALSE); + uri = camel_url_to_string (url, 0); camel_url_free (url); if (fi->sibling) { diff --git a/mail/session.c b/mail/session.c index e5084fb7ee..372d104839 100644 --- a/mail/session.c +++ b/mail/session.c @@ -118,7 +118,7 @@ auth_callback (CamelAuthCallbackMode mode, char *data, gboolean secret, char *key, *ans, *url; gboolean accept; - url = camel_url_to_string (service->url, FALSE); + url = camel_url_to_string (service->url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS); key = g_strdup_printf ("%s:%s", url, item); g_free (url); |