Namespaces can now have names. This could make some types of configuration cleaner.

--HG--
branch : HEAD

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index 994398e37485cbfa493f9f4f3ac24f74c2a8a91c..af1331c0e3888b12b8c5a9bff3ef9d0be8a5b3bd 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -82,6 +82,7 @@ const struct setting_parser_info mail_storage_setting_parser_info = {
        { type, #name, offsetof(struct mail_namespace_settings, name), NULL }
 
 static const struct setting_define mail_namespace_setting_defines[] = {
+       DEF(SET_STR, name),
        DEF(SET_ENUM, type),
        DEF(SET_STR, separator),
        DEF(SET_STR_VARS, prefix),
@@ -99,6 +100,7 @@ static const struct setting_define mail_namespace_setting_defines[] = {
 };
 
 const struct mail_namespace_settings mail_namespace_default_settings = {
+       .name = "",
        .type = "private:shared:public",
        .separator = "",
        .prefix = "",
@@ -115,7 +117,7 @@ const struct setting_parser_info mail_namespace_setting_parser_info = {
        .defines = mail_namespace_setting_defines,
        .defaults = &mail_namespace_default_settings,
 
-       .type_offset = offsetof(struct mail_namespace_settings, prefix),
+       .type_offset = offsetof(struct mail_namespace_settings, name),
        .struct_size = sizeof(struct mail_namespace_settings),
 
        .parent_offset = offsetof(struct mail_namespace_settings, user_set),

diff --git a/src/lib-storage/mail-storage-settings.h b/src/lib-storage/mail-storage-settings.h
index 900bb583d6039e4db7018d8d31925655c4ba6cea..e4df6c3893505e4c70b8b3257daac66860d3560b 100644 (file)
--- a/src/lib-storage/mail-storage-settings.h
+++ b/src/lib-storage/mail-storage-settings.h
@@ -31,6 +31,7 @@ struct mail_storage_settings {
 };
 
 struct mail_namespace_settings {
+       const char *name;
        const char *type;
        const char *separator;
        const char *prefix;