diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-ops.c | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 465a34f62a..385e627545 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2000-08-11 Dan Winship <danw@helixcode.com> + + * mail-ops.c (describe_fetch_mail): Use camel_service_get_name + rather than showing the URL to the user. + 2000-08-11 Peter Williams <peterw@helixcode.com> * mail-threads.c (get_password_clicked): Fix the case when the diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 066ac09b60..851ba8e816 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -60,13 +60,20 @@ static gchar * describe_fetch_mail (gpointer in_data, gboolean gerund) { fetch_mail_input_t *input = (fetch_mail_input_t *) in_data; + CamelStore *source; + char *name; + + source = camel_session_get_store (session, input->source_url, NULL); + if (source) { + name = camel_service_get_name (CAMEL_SERVICE (source), FALSE); + camel_object_unref (CAMEL_OBJECT (source)); + } else + name = input->source_url; if (gerund) - return g_strdup_printf ("Fetching email from %s", - input->source_url); + return g_strdup_printf ("Fetching email from %s", name); else - return g_strdup_printf ("Fetch email from %s", - input->source_url); + return g_strdup_printf ("Fetch email from %s", name); } static void |