From 714d59900e44e6e2dd744bd7b76862e1d11a4f61 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 13 Dec 2009 20:09:00 -0500 Subject: [PATCH] Added setting aliases: mail for mail_location, both of them for namespace location. Removed special case handling for changing mail to mail_location in userdb. --HG-- branch : HEAD --- src/lib-storage/mail-storage-service.c | 5 +---- src/lib-storage/mail-storage-settings.c | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c index c257744c3d..fe987ecaa9 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -140,10 +140,7 @@ user_reply_handle(struct mail_storage_service_user *user, } #endif } else T_BEGIN { - if (strncmp(line, "mail=", 5) == 0) { - line = t_strconcat("mail_location=", - line + 5, NULL); - } else if ((p = strchr(str[i], '=')) == NULL) + if ((p = strchr(str[i], '=')) == NULL) line = t_strconcat(str[i], "=yes", NULL); else line = str[i]; diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c index 043685a0a9..145af84a51 100644 --- a/src/lib-storage/mail-storage-settings.c +++ b/src/lib-storage/mail-storage-settings.c @@ -22,6 +22,7 @@ static bool mail_user_settings_check(void *_set, pool_t pool, const char **error static const struct setting_define mail_storage_setting_defines[] = { DEF(SET_STR_VARS, mail_location), + { SET_ALIAS, "mail", 0, NULL }, DEF(SET_STR, mail_cache_fields), DEF(SET_STR, mail_never_cache_fields), DEF(SET_UINT, mail_cache_min_mail_count), @@ -85,6 +86,8 @@ static const struct setting_define mail_namespace_setting_defines[] = { DEF(SET_STR, separator), DEF(SET_STR_VARS, prefix), DEF(SET_STR_VARS, location), + { SET_ALIAS, "mail", 0, NULL }, + { SET_ALIAS, "mail_location", 0, NULL }, DEF(SET_STR_VARS, alias_for), DEF(SET_BOOL, inbox), -- 2.47.3