X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-defs.h;h=078d7e4b6c75ebe908fc616c53b37937e412bedd;hp=e3646bed30ba4e4f9148fa2de4cca39e3075e209;hb=40a8f5cbe03bd040fe3403dbfa6806df4fb6bc8a;hpb=eed204e3afa5e864f1329725cb5adc8764991a2a

diff --git a/src/modest-defs.h b/src/modest-defs.h
index e3646be..078d7e4 100644
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -43,13 +43,14 @@
 #define MODEST_DIR	                  ".modest"
 #define MODEST_CACHE_DIR                  "cache"
 
-/** Sent, Drafts, etc, 
+#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_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID   "local_folders"
-#define MODEST_LOCAL_FOLDERS_ACCOUNT_NAME MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID
-#define MODEST_LOCAL_FOLDERS_MAILDIR      MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID
+#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.
@@ -71,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"