X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-defs.h;h=1a57444d44f336b258974ed8bd6decc1479983f3;hp=6629e593e4cfcb2023a47f389bbc6436b7414b18;hb=89e160bc529653c83e480de512561219d4134c1d;hpb=8a1881658d61d71222ee9fbec6abd10d2da6a273

diff --git a/src/modest-defs.h b/src/modest-defs.h
index 6629e59..1a57444 100644
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -31,6 +31,8 @@
 #ifndef __MODEST_DEFS_H__
 #define __MODEST_DEFS_H__
 
+#include <glib/gi18n.h>
+
 /* some interesting dirs. NOTE, they should be prefixed
  * with $HOME; also, except MODEST_DIR itself, they
  * need to be prefixed with MODEST_DIR;
@@ -38,23 +40,35 @@
  * building of dirs from their components..
  * g_build_dir is your friend
  */
-#define MODEST_DIR	             ".modest"
-#define MODEST_CACHE_DIR             "cache"
-#define MODEST_LOCAL_FOLDERS_MAILDIR "local_folder"
+#define MODEST_DIR	                  ".modest"
+#define MODEST_CACHE_DIR                  "cache"
 
+#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_LOCAL_FOLDERS_DISPLAY_NAME  N_("Local folders")
 
 
 /* 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_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"           
+
+
 /* 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_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 */
 #define MODEST_ACCOUNT_DISPLAY_NAME      "display_name"      /* string */
@@ -65,16 +79,19 @@
 
 /* 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 */
+
 #define MODEST_ACCOUNT_PROTO             "proto"             /* string */
 #define MODEST_ACCOUNT_ENABLED		 "enabled"	     /* boolean */
 #define MODEST_ACCOUNT_TYPE		 "type"	             /* string */
+#define MODEST_ACCOUNT_LAST_UPDATED      "last_updated"      /* int */
 
 #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__*/