diff options
| author | Dan Vrátil <dvratil@redhat.com> | 2011-04-22 23:55:02 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:56 +0800 |
| commit | 55def673bd9d9f951cfc5b69eb485a8f8a6998fa (patch) | |
| tree | 559c34ade6f82b0b6b1d4a2ccf6a4fc445dec7cc | |
| parent | 63f3a7d250c8cb8c2ef0d6216d7b23ecd4d9d846 (diff) | |
| download | gsoc2013-evolution-55def673bd9d9f951cfc5b69eb485a8f8a6998fa.tar.gz gsoc2013-evolution-55def673bd9d9f951cfc5b69eb485a8f8a6998fa.tar.zst gsoc2013-evolution-55def673bd9d9f951cfc5b69eb485a8f8a6998fa.zip | |
Bug 648308 - Do not display full folder URI in "Opening folder" activity
| -rw-r--r-- | mail/e-mail-session.c | 9 |
1 files changed, 7 insertions, 2 deletions
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); |