lib-imap-client: Move imapc_capability* to imapc-settings.[ch]

diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c
index 4afa1fcba300e6e94e4038bc4b01b6452eb97f77..cea6e2d0878a789f449ee6e130bac2268337b070 100644 (file)
--- a/src/lib-imap-client/imapc-client.c
+++ b/src/lib-imap-client/imapc-client.c
@@ -17,30 +17,6 @@ const char *imapc_command_state_names[] = {
        "OK", "NO", "BAD", "(auth failed)", "(disconnected)"
 };
 
-const struct imapc_capability_name imapc_capability_names[] = {
-       { "SASL-IR", IMAPC_CAPABILITY_SASL_IR },
-       { "LITERAL+", IMAPC_CAPABILITY_LITERALPLUS },
-       { "QRESYNC", IMAPC_CAPABILITY_QRESYNC },
-       { "IDLE", IMAPC_CAPABILITY_IDLE },
-       { "UIDPLUS", IMAPC_CAPABILITY_UIDPLUS },
-       { "AUTH=PLAIN", IMAPC_CAPABILITY_AUTH_PLAIN },
-       { "STARTTLS", IMAPC_CAPABILITY_STARTTLS },
-       { "X-GM-EXT-1", IMAPC_CAPABILITY_X_GM_EXT_1 },
-       { "CONDSTORE", IMAPC_CAPABILITY_CONDSTORE },
-       { "NAMESPACE", IMAPC_CAPABILITY_NAMESPACE },
-       { "UNSELECT", IMAPC_CAPABILITY_UNSELECT },
-       { "ESEARCH", IMAPC_CAPABILITY_ESEARCH },
-       { "WITHIN", IMAPC_CAPABILITY_WITHIN },
-       { "QUOTA", IMAPC_CAPABILITY_QUOTA },
-       { "ID", IMAPC_CAPABILITY_ID },
-       { "SAVEDATE", IMAPC_CAPABILITY_SAVEDATE },
-       { "METADATA", IMAPC_CAPABILITY_METADATA },
-
-       { "IMAP4REV1", IMAPC_CAPABILITY_IMAP4REV1 },
-       { "IMAP4REV2", IMAPC_CAPABILITY_IMAP4REV2 },
-       { NULL, 0 }
-};
-
 unsigned int imapc_client_cmd_tag_counter = 0;
 
 static void

diff --git a/src/lib-imap-client/imapc-client.h b/src/lib-imap-client/imapc-client.h
index 27409f1e2fd68b4fe78c77437c9a205c9e6b5160..32d5cb5ba4274dab02e0b2c6000bbe876ecc1356 100644 (file)
--- a/src/lib-imap-client/imapc-client.h
+++ b/src/lib-imap-client/imapc-client.h
@@ -16,34 +16,6 @@ enum imapc_command_state {
 };
 extern const char *imapc_command_state_names[];
 
-enum imapc_capability {
-       IMAPC_CAPABILITY_SASL_IR        = 0x01,
-       IMAPC_CAPABILITY_LITERALPLUS    = 0x02,
-       IMAPC_CAPABILITY_QRESYNC        = 0x04,
-       IMAPC_CAPABILITY_IDLE           = 0x08,
-       IMAPC_CAPABILITY_UIDPLUS        = 0x10,
-       IMAPC_CAPABILITY_AUTH_PLAIN     = 0x20,
-       IMAPC_CAPABILITY_STARTTLS       = 0x40,
-       IMAPC_CAPABILITY_X_GM_EXT_1     = 0x80,
-       IMAPC_CAPABILITY_CONDSTORE      = 0x100,
-       IMAPC_CAPABILITY_NAMESPACE      = 0x200,
-       IMAPC_CAPABILITY_UNSELECT       = 0x400,
-       IMAPC_CAPABILITY_ESEARCH        = 0x800,
-       IMAPC_CAPABILITY_WITHIN         = 0x1000,
-       IMAPC_CAPABILITY_QUOTA          = 0x2000,
-       IMAPC_CAPABILITY_ID             = 0x4000,
-       IMAPC_CAPABILITY_SAVEDATE       = 0x8000,
-       IMAPC_CAPABILITY_METADATA       = 0x10000,
-
-       IMAPC_CAPABILITY_IMAP4REV2      = 0x20000000,
-       IMAPC_CAPABILITY_IMAP4REV1      = 0x40000000,
-};
-struct imapc_capability_name {
-       const char *name;
-       enum imapc_capability capability;
-};
-extern const struct imapc_capability_name imapc_capability_names[];
-
 enum imapc_command_flags {
        /* The command changes the selected mailbox (SELECT, EXAMINE) */
        IMAPC_COMMAND_FLAG_SELECT       = 0x01,

diff --git a/src/lib-imap-client/imapc-settings.c b/src/lib-imap-client/imapc-settings.c
index 31880b9c8b8d066dc361b494b648f70841aeb5cf..01abb4505f1ef3eda340dab90e1addc6c3dd2410 100644 (file)
--- a/src/lib-imap-client/imapc-settings.c
+++ b/src/lib-imap-client/imapc-settings.c
@@ -93,6 +93,30 @@ const struct setting_parser_info imapc_setting_parser_info = {
 };
 
 /* <settings checks> */
+const struct imapc_capability_name imapc_capability_names[] = {
+       { "SASL-IR", IMAPC_CAPABILITY_SASL_IR },
+       { "LITERAL+", IMAPC_CAPABILITY_LITERALPLUS },
+       { "QRESYNC", IMAPC_CAPABILITY_QRESYNC },
+       { "IDLE", IMAPC_CAPABILITY_IDLE },
+       { "UIDPLUS", IMAPC_CAPABILITY_UIDPLUS },
+       { "AUTH=PLAIN", IMAPC_CAPABILITY_AUTH_PLAIN },
+       { "STARTTLS", IMAPC_CAPABILITY_STARTTLS },
+       { "X-GM-EXT-1", IMAPC_CAPABILITY_X_GM_EXT_1 },
+       { "CONDSTORE", IMAPC_CAPABILITY_CONDSTORE },
+       { "NAMESPACE", IMAPC_CAPABILITY_NAMESPACE },
+       { "UNSELECT", IMAPC_CAPABILITY_UNSELECT },
+       { "ESEARCH", IMAPC_CAPABILITY_ESEARCH },
+       { "WITHIN", IMAPC_CAPABILITY_WITHIN },
+       { "QUOTA", IMAPC_CAPABILITY_QUOTA },
+       { "ID", IMAPC_CAPABILITY_ID },
+       { "SAVEDATE", IMAPC_CAPABILITY_SAVEDATE },
+       { "METADATA", IMAPC_CAPABILITY_METADATA },
+
+       { "IMAP4REV1", IMAPC_CAPABILITY_IMAP4REV1 },
+       { "IMAP4REV2", IMAPC_CAPABILITY_IMAP4REV2 },
+       { NULL, 0 }
+};
+
 struct imapc_feature_list {
        const char *name;
        enum imapc_features num;

diff --git a/src/lib-imap-client/imapc-settings.h b/src/lib-imap-client/imapc-settings.h
index 2d102ef403f06c27f52eb7b8a37e34e50a4cc9ab..0ace81bb1e2f024597a8c9801be59d8544af4044 100644 (file)
--- a/src/lib-imap-client/imapc-settings.h
+++ b/src/lib-imap-client/imapc-settings.h
@@ -29,6 +29,35 @@ enum imapc_features {
        IMAPC_FEATURE_NO_QRESYNC                = 0x40000,
        IMAPC_FEATURE_NO_IMAP4REV2              = 0x80000,
 };
+
+enum imapc_capability {
+       IMAPC_CAPABILITY_SASL_IR        = 0x01,
+       IMAPC_CAPABILITY_LITERALPLUS    = 0x02,
+       IMAPC_CAPABILITY_QRESYNC        = 0x04,
+       IMAPC_CAPABILITY_IDLE           = 0x08,
+       IMAPC_CAPABILITY_UIDPLUS        = 0x10,
+       IMAPC_CAPABILITY_AUTH_PLAIN     = 0x20,
+       IMAPC_CAPABILITY_STARTTLS       = 0x40,
+       IMAPC_CAPABILITY_X_GM_EXT_1     = 0x80,
+       IMAPC_CAPABILITY_CONDSTORE      = 0x100,
+       IMAPC_CAPABILITY_NAMESPACE      = 0x200,
+       IMAPC_CAPABILITY_UNSELECT       = 0x400,
+       IMAPC_CAPABILITY_ESEARCH        = 0x800,
+       IMAPC_CAPABILITY_WITHIN         = 0x1000,
+       IMAPC_CAPABILITY_QUOTA          = 0x2000,
+       IMAPC_CAPABILITY_ID             = 0x4000,
+       IMAPC_CAPABILITY_SAVEDATE       = 0x8000,
+       IMAPC_CAPABILITY_METADATA       = 0x10000,
+
+       IMAPC_CAPABILITY_IMAP4REV2      = 0x20000000,
+       IMAPC_CAPABILITY_IMAP4REV1      = 0x40000000,
+};
+
+struct imapc_capability_name {
+       const char *name;
+       enum imapc_capability capability;
+};
+extern const struct imapc_capability_name imapc_capability_names[];
 /* </settings checks> */
 
 /*