* began work on identities storage. right now, this is a ugly hack into modest-accoun...

[modest] / src / modest-account-keys.h

diff --git a/src/modest-account-keys.h b/src/modest-account-keys.h
index ae56675..d8b0b3e 100644 (file)
--- a/src/modest-account-keys.h
+++ b/src/modest-account-keys.h
@@ -3,27 +3,35 @@
 
 #include "modest-conf-keys.h"
 
-#define MODEST_CONF_DEFAULT_ACCOUNT     "/default_account"
+#define MODEST_CONF_DEFAULT_ACCOUNT      "/default_account"
 
 
-#define MODEST_SERVER_ACCOUNT_NAMESPACE MODEST_CONF_NAMESPACE "/" "server_accounts"
-
 /* configuration key definitions for modest */
-#define MODEST_ACCOUNT_NAMESPACE       MODEST_CONF_NAMESPACE "/" "accounts"
+#define MODEST_ACCOUNT_NAMESPACE         MODEST_CONF_NAMESPACE "/" "accounts"
+#define MODEST_SERVER_ACCOUNT_NAMESPACE  MODEST_CONF_NAMESPACE "/" "server_accounts"
+#define MODEST_IDENTITY_NAMESPACE        MODEST_CONF_NAMESPACE "/" "identities"
 
 /* per-account data */
-#define MODEST_ACCOUNT_DISPLAY_NAME     "display_name"                  /* string */
-#define MODEST_ACCOUNT_STORE_ACCOUNT    "store_account"                 /* string */
-#define MODEST_ACCOUNT_TRANSPORT_ACCOUNT "transport_account"             /* string */
+#define MODEST_ACCOUNT_DISPLAY_NAME      "display_name"      /* string */
+#define MODEST_ACCOUNT_STORE_ACCOUNT     "store_account"     /* string */
+#define MODEST_ACCOUNT_TRANSPORT_ACCOUNT "transport_account" /* string */
 
 /* server account keys */
-#define MODEST_ACCOUNT_PASSWORD        "password"       /* string */
-#define MODEST_ACCOUNT_HOSTNAME        "hostname"      /* string */
-#define MODEST_ACCOUNT_USERNAME        "username"       /* string */
-#define MODEST_ACCOUNT_PROTO           "proto"         /* string */
-
-
-#define MODEST_ACCOUNT_LEAVE_ON_SERVER       "leave_on_server"          /* boolean */ \
-#define MODEST_ACCOUNT_PREFERRED_CNX         "preferred_cnx"            /* string */
+#define MODEST_ACCOUNT_PASSWORD          "password"          /* string */
+#define MODEST_ACCOUNT_HOSTNAME          "hostname"          /* string */
+#define MODEST_ACCOUNT_USERNAME          "username"          /* string */
+#define MODEST_ACCOUNT_PROTO             "proto"             /* string */
+
+#define MODEST_ACCOUNT_LEAVE_ON_SERVER   "leave_on_server"   /* boolean */
+#define MODEST_ACCOUNT_PREFERRED_CNX     "preferred_cnx"     /* string */
+
+/* user identity keys */
+#define MODEST_ACCOUNT_EMAIL             "email"             /* string */
+#define MODEST_ACCOUNT_REPLYTO           "replyto"           /* string */
+#define MODEST_ACCOUNT_SIGNATURE         "signature"         /* string */
+#define MODEST_ACCOUNT_USE_SIGNATURE     "use_signature"     /* boolean */
+#define MODEST_ACCOUNT_ID_VIA            "id_via"            /* string */
+#define MODEST_ACCOUNT_USE_ID_VIA        "use_id_via"        /* boolean */
+/* MISSING: everything related to gpg */
 
 #endif /*__MODEST_CONF_KEYS_H__*/