diff options
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/mail-config-druid.c | 18 |
2 files changed, 20 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 9b89f23a3a..b79f192cd0 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,9 @@ 2001-01-22 Dan Winship <danw@ximian.com> + * mail-config-druid.c (incoming_type_changed): Change "Path:" + label to "Namespace:" for IMAP. Use $MAILDIR rather than $MAIL for + Maildir. If $MAIL isn't set, guess. + * component-factory.c (mail_hash_storage): Function to add a store/storage mapping. (add_storage): Use it. diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c index 62a4144970..4e6f96b3a3 100644 --- a/mail/mail-config-druid.c +++ b/mail/mail-config-druid.c @@ -453,13 +453,27 @@ incoming_type_changed (GtkWidget *widget, gpointer user_data) /* path */ label = glade_xml_get_widget (druid->gui, "lblSourcePath"); + /* FIXME */ + if (!strcmp (provider->protocol, "imap")) + gtk_label_set_text (GTK_LABEL (label), _("Namespace:")); + else + gtk_label_set_text (GTK_LABEL (label), _("Path:")); if (provider && provider->url_flags & CAMEL_URL_ALLOW_PATH) { if (!dwidget) dwidget = GTK_WIDGET (druid->incoming_path); - if (!strcmp (provider->protocol, "mbox") || !strcmp (provider->protocol, "maildir")){ + if (!strcmp (provider->protocol, "mbox")) { + char *path; + if (getenv ("MAIL")) - gtk_entry_set_text (druid->incoming_path, getenv ("MAIL")); + path = g_strdup (getenv ("MAIL")); + else + path = g_strdup_printf (SYSTEM_MAIL_DIR "/%s", g_get_user_name ()); + gtk_entry_set_text (druid->incoming_path, path); + g_free (path); + } else if (!strcmp (provider->protocol, "maildir") && + getenv ("MAILDIR")) { + gtk_entry_set_text (druid->incoming_path, getenv ("MAILDIR")); } else { gtk_entry_set_text (druid->incoming_path, ""); } |