X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-defs.h;h=8754c4aca3fa1eebc3cbeef2012be749540e58f6;hp=2aa0e9985690124578127c441d407e270ec720bf;hb=8f5689576717728885ab7d8477dc01ad5cfb5541;hpb=6ad0c7e0fbf8462c0a41c0a42bf34adbb127fe4e

diff --git a/src/modest-defs.h b/src/modest-defs.h
index 2aa0e99..8754c4a 100644
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -31,19 +31,7 @@
 #ifndef __MODEST_DEFS_H__
 #define __MODEST_DEFS_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_INIT          /* error in initialization */
-};
-
+#include <glib/gi18n.h>
 
 /* some interesting dirs. NOTE, they should be prefixed
  * with $HOME; also, except MODEST_DIR itself, they
@@ -54,22 +42,29 @@ enum {
  */
 #define MODEST_DIR	                  ".modest"
 #define MODEST_CACHE_DIR                  "cache"
-#define MODEST_LOCAL_FOLDERS_MAILDIR      "local_folders"
-#define MODEST_LOCAL_FOLDERS_ACCOUNT_NAME "local_folders"
+
+#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  */
+
 /* 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 */
@@ -81,12 +76,15 @@ 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 */
+
 #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 */