X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-defs.h;h=078d7e4b6c75ebe908fc616c53b37937e412bedd;hp=12c10418a637224ab10f64f13ab97571242383bc;hb=7441d1df9d7eb43ff93e411e7b4b9e7d72d9d066;hpb=b5cf1a8ddef61c1b8ee227a37d3c32e4c60c3ccd

diff --git a/src/modest-defs.h b/src/modest-defs.h
index 12c1041..078d7e4 100644
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -33,11 +33,11 @@
 
 #include <glib/gi18n.h>
 
-/* some interesting dirs. NOTE, they should be prefixed
- * with $HOME; also, except MODEST_DIR itself, they
+/* Some interesting directories. NOTE, they should be prefixed
+ * with $HOME; Also, except for MODEST_DIR itself, they
  * need to be prefixed with MODEST_DIR;
- * why these seperate things? well, this is for crossplatform
- * building of dirs from their components..
+ * The parts of the path are separate for crossplatform
+ * building of dirs from their components.
  * g_build_dir is your friend
  */
 #define MODEST_DIR	                  ".modest"
@@ -45,10 +45,25 @@
 
 #define MODEST_LOCAL_FOLDERS_ACCOUNT_ID   "local_folders"
 #define MODEST_LOCAL_FOLDERS_ACCOUNT_NAME MODEST_LOCAL_FOLDERS_ACCOUNT_ID
+
+/** Sent, Drafts, etc, are on-disk 
+ * but not outbox, because outbox is a virtual folder merged from the 
+ * various outboxes/<account-name>/outbox folders.
+ */
 #define MODEST_LOCAL_FOLDERS_MAILDIR      MODEST_LOCAL_FOLDERS_ACCOUNT_ID
 
+/** There is an outboxes/<account-name>/outbox/ folder for each account,
+ * though we merge them so that the user sees only one outbox.
+ */
+#define MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "outboxes"
+#define MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDERS_MAILDIR MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX
+
 #define MODEST_MMC_ACCOUNT_ID             "mcc"
-#define MODEST_MCC_ACCOUNT_MAILDIR	  "/media/mmc1/.Maildir"
+
+/* Without the trailing / because gnome-vfs reports mounted 
+ * volume URIs without the trailing, and we want to match them: */
+#define MODEST_MCC1_VOLUMEPATH	  "/media/mmc1" 
+#define MODEST_MCC1_VOLUMEPATH_URI "file://" MODEST_MCC1_VOLUMEPATH
 
 /* configuration key definitions for modest */
 #define MODEST_CONF_NAMESPACE		"/apps/modest"
@@ -57,7 +72,7 @@
 #define MODEST_ACCOUNT_NAMESPACE         MODEST_CONF_NAMESPACE "/accounts"
 #define MODEST_CONF_DEFAULT_ACCOUNT      MODEST_CONF_NAMESPACE "/default_account"
 
-#define MODEST_CONF_CONNECT_AT_STARTUP   MODEST_CONF_NAMESPACE "/connect_at_startup"      
+/* Not used: #define MODEST_CONF_CONNECT_AT_STARTUP   MODEST_CONF_NAMESPACE "/connect_at_startup" */      
 
 #define MODEST_CONF_SHOW_CC              MODEST_CONF_NAMESPACE "/show_cc"           
 #define MODEST_CONF_SHOW_BCC             MODEST_CONF_NAMESPACE "/show_bcc"           
@@ -117,6 +132,8 @@
 #define MODEST_ACCOUNT_USERNAME_HAS_SUCCEEDED          "username_succeeded"          /* string */
 #define MODEST_ACCOUNT_USE_SIGNATURE         "use_signature"         /* boolean */
 #define MODEST_ACCOUNT_SIGNATURE         "signature"         /* string */
+
+/* Only used for mbox and maildir accounts: */
 #define MODEST_ACCOUNT_URI		 "uri"	             /* string */
 
 #define MODEST_ACCOUNT_PROTO             "proto"             /* string */
@@ -127,7 +144,6 @@
 #define MODEST_ACCOUNT_LEAVE_ON_SERVER   "leave_on_server"   /* boolean */
 #define MODEST_ACCOUNT_PREFERRED_CNX     "preferred_cnx"     /* string */
 #define MODEST_ACCOUNT_PORT		         "port"	             /* int */
-#define MODEST_ACCOUNT_OPTIONS		 "options"	     /* list */
 
 #define MODEST_ACCOUNT_AUTH_MECH	 "auth_mech"	     /* string */
 #define MODEST_ACCOUNT_AUTH_MECH_VALUE_NONE "none"
@@ -143,22 +159,9 @@
 
 #define MODEST_ACCOUNT_SECURITY "security"
 #define MODEST_ACCOUNT_SECURITY_VALUE_NONE "none"
-#define MODEST_ACCOUNT_SECURITY_VALUE_NORMAL "normal"
+#define MODEST_ACCOUNT_SECURITY_VALUE_NORMAL "normal" /* Meaning "Normal (TLS)", as in our UI spec. */ 
 #define MODEST_ACCOUNT_SECURITY_VALUE_SSL "ssl"
 
-
-/* Options keys that correspond directly to camel options.
- * These probably should not be written to user configuration, 
- * because they are specific API implementation details. */
-/* Keys and values used in the text items in the options GSList: */
-#define MODEST_ACCOUNT_OPTION_SSL "use_ssl"
-#define MODEST_ACCOUNT_OPTION_SSL_NEVER "never"
-#define MODEST_ACCOUNT_OPTION_SSL_ALWAYS "always"
-#define MODEST_ACCOUNT_OPTION_SSL_WHEN_POSSIBLE "when-possible"
-
-#define MODEST_ACCOUNT_OPTION_USE_LSUB "use_lsub"
-#define MODEST_ACCOUNT_OPTION_CHECK_ALL "check_all"
-
 /* Macros for different text formats in mail editor */
 #define MODEST_FILE_FORMAT_PLAIN_TEXT 0
 #define MODEST_FILE_FORMAT_FORMATTED_TEXT 1