* all:

[modest] / src / modest-defs.h

diff --git a/src/modest-defs.h b/src/modest-defs.h
index d3d9749..19239af 100644 (file)
--- 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
@@ -52,10 +40,13 @@ enum {
  * 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_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)
 
 /* configuration key definitions for modest */
 #define MODEST_CONF_NAMESPACE          "/apps/modest"
@@ -65,10 +56,13 @@ enum {
 
 /* 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 */
 #define MODEST_ACCOUNT_DISPLAY_NAME      "display_name"      /* string */
 #define MODEST_ACCOUNT_STORE_ACCOUNT     "store_account"     /* string */
@@ -81,9 +75,12 @@ enum {
 #define MDOEST_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 */