X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-defs.h;h=7bd305b04b59d4c106ba7bbe3b53a6af74e10bee;hb=af22975e59fa7288ce28e7cf089eb12f7f2e07b8;hp=a0b62ecc024c6504359b17c227de34bfdbcf2f16;hpb=8cb5d470d68036f3fc73156897144bafb83c78ef;p=modest

diff --git a/src/modest-defs.h b/src/modest-defs.h
index a0b62ec..7bd305b 100644
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -33,20 +33,6 @@
 
 #include <glib/gi18n.h>
 
-/* exit codes for the modest executable*/
-enum {
-	MODEST_ERR_NONE    = 0,  /* no error */
-	MODEST_ERR_OPTIONS,      /* error in the options */
-	MODEST_ERR_CONF,         /* error getting confuration db */
-	MODEST_ERR_UI,           /* error in the UI */
-	MODEST_ERR_HILDON,       /* error with Hildon (maemo-only) */
-	MODEST_ERR_RUN,          /* errr running */
-	MODEST_ERR_SEND,         /* error sending mail */
-	MODEST_ERR_PARAM,        /* error in one or more of the parameters */
-	MODEST_ERR_INIT          /* error in initialization */
-};
-
-
 /* some interesting dirs. NOTE, they should be prefixed
  * with $HOME; also, except MODEST_DIR itself, they
  * need to be prefixed with MODEST_DIR;
@@ -56,25 +42,47 @@ enum {
  */
 #define MODEST_DIR	                  ".modest"
 #define MODEST_CACHE_DIR                  "cache"
-#define MODEST_LOCAL_FOLDERS_ACCOUNT_NAME "local_folders"
-#define MODEST_LOCAL_FOLDERS_ACCOUNT_ID   MODEST_LOCAL_FOLDERS_ACCOUNT_NAME
-#define MODEST_LOCAL_FOLDERS_MAILDIR      MODEST_LOCAL_FOLDERS_ACCOUNT_NAME
 
-#define MODEST_LOCAL_FOLDERS_DISPLAY_NAME N_(MODEST_LOCAL_FOLDERS_ACCOUNT_NAME)
+#define MODEST_LOCAL_FOLDERS_ACCOUNT_ID   "local_folders"
+#define MODEST_LOCAL_FOLDERS_ACCOUNT_NAME MODEST_LOCAL_FOLDERS_ACCOUNT_ID
+#define MODEST_LOCAL_FOLDERS_MAILDIR      MODEST_LOCAL_FOLDERS_ACCOUNT_ID
+
+#define MODEST_MMC_ACCOUNT_ID             "mcc"
+#define MODEST_MCC_ACCOUNT_MAILDIR	  "/media/mmc1/.Maildir"
 
 /* configuration key definitions for modest */
 #define MODEST_CONF_NAMESPACE		"/apps/modest"
 
+/* configuration key definitions for modest */
+#define MODEST_ACCOUNT_NAMESPACE         MODEST_CONF_NAMESPACE "/accounts"
+#define MODEST_CONF_DEFAULT_ACCOUNT      MODEST_CONF_NAMESPACE "/default_account"
+
+#define MODEST_CONF_REPLY_TYPE           MODEST_CONF_NAMESPACE "/reply_type"        /*  int  */
+#define MODEST_CONF_FORWARD_TYPE         MODEST_CONF_NAMESPACE "/forward_type"      /*  int  */
+
+#define MODEST_CONF_CONNECT_AT_STARTUP   MODEST_CONF_NAMESPACE "/connect_at_startup"      
+
+#define MODEST_CONF_SHOW_TOOLBAR         MODEST_CONF_NAMESPACE "/show_toolbar"      
+#define MODEST_CONF_SHOW_CC              MODEST_CONF_NAMESPACE "/show_cc"           
+#define MODEST_CONF_SHOW_BCC             MODEST_CONF_NAMESPACE "/show_bcc"           
+
+
+/*
+ * in the maemo case, we try to replace this
+ * with the device name
+ */
+#define MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME  N_("Local folders")
+
+/* the name of the device; in case of maemo this is set and updated
+ * using dbus; see modest-maemo-utils.[ch]
+ */
+#define MODEST_CONF_DEVICE_NAME       MODEST_CONF_NAMESPACE "/device_name"
+
+
 /* place for widget settings */
 #define MODEST_CONF_WIDGET_NAMESPACE     MODEST_CONF_NAMESPACE "/widgets"
 
-/* configuration key definitions for modest */
-#define MODEST_ACCOUNT_NAMESPACE         MODEST_CONF_NAMESPACE "/" "accounts"
-#define MODEST_CONF_DEFAULT_ACCOUNT      MODEST_CONF_NAMESPACE "/" "default_account"
-
 #define MODEST_SERVER_ACCOUNT_NAMESPACE  MODEST_CONF_NAMESPACE "/" "server_accounts"
-#define MODEST_CONF_REPLY_TYPE           "reply_type"        /*  int  */
-#define MODEST_CONF_FORWARD_TYPE         "forward_type"      /*  int  */
 
 
 /* per-account data */
@@ -86,7 +94,7 @@ enum {
 
 /* server account keys */
 #define MODEST_ACCOUNT_PASSWORD          "password"          /* string */
-#define MDOEST_ACCOUNT_REMEMBER_PWD	 "remember_pwd"      /* boolean */
+#define MODEST_ACCOUNT_REMEMBER_PWD	 "remember_pwd"      /* boolean */
 #define MODEST_ACCOUNT_HOSTNAME          "hostname"          /* string */
 #define MODEST_ACCOUNT_USERNAME          "username"          /* string */
 #define MODEST_ACCOUNT_URI		 "uri"	             /* string */
@@ -99,6 +107,6 @@ enum {
 #define MODEST_ACCOUNT_LEAVE_ON_SERVER   "leave_on_server"   /* boolean */
 #define MODEST_ACCOUNT_PREFERRED_CNX     "preferred_cnx"     /* string */
 #define MODEST_ACCOUNT_OPTIONS		 "options"	     /* list */
-
+#define MODEST_ACCOUNT_AUTH_MECH	 "auth_mech"	     /* string */
 
 #endif /*__MODEST_DEFS_H__*/