From be3025aa4451ea342f519db940e56c1a9d4d519f Mon Sep 17 00:00:00 2001 From: Dan Vrátil Date: Fri, 22 Apr 2011 11:55:02 -0400 Subject: Bug 648308 - Do not display full folder URI in "Opening folder" activity --- mail/e-mail-session.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c index c95b21b3ba..f85c4ecb8a 100644 --- a/mail/e-mail-session.c +++ b/mail/e-mail-session.c @@ -1288,8 +1288,12 @@ e_mail_session_uri_to_folder_sync (EMailSession *session, g_return_val_if_fail (E_IS_MAIL_SESSION (session), NULL); g_return_val_if_fail (folder_uri != NULL, NULL); + url = camel_url_new (folder_uri, NULL); + g_return_val_if_fail (url, NULL); + + /* url->path[1] skips the leading "/" */ camel_operation_push_message ( - cancellable, _("Opening folder '%s'"), folder_uri); + cancellable, _("Opening folder '%s'"), &url->path[1]); /* FIXME vtrash and vjunk are no longer used for these URI's. */ if (g_str_has_prefix (folder_uri, "vtrash:")) { @@ -1305,11 +1309,12 @@ e_mail_session_uri_to_folder_sync (EMailSession *session, if (camel_uri == NULL) { g_set_error ( error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, - _("Invalid folder: %s"), folder_uri); + _("Invalid folder: %s"), &url->path[1]); goto exit; } folder_uri = camel_uri; } + camel_url_free (url); url = camel_url_new (folder_uri, error); -- cgit