2007-05-03 Murray Cumming <murrayc@murrayc.com>

[modest] / src / modest-defs.h

diff --git a/src/modest-defs.h b/src/modest-defs.h
index 57550cb..fb7f0e3 100644 (file)
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -60,6 +60,8 @@
 #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_PREFER_FORMATTED_TEXT MODEST_CONF_NAMESPACE "/prefer_formatted_text"
+
 #define MODEST_CONF_CONNECT_AT_STARTUP   MODEST_CONF_NAMESPACE "/connect_at_startup"      
 
 #define MODEST_CONF_SHOW_CC              MODEST_CONF_NAMESPACE "/show_cc"           
@@ -67,6 +69,12 @@
 #define MODEST_CONF_SHOW_TOOLBAR         MODEST_CONF_NAMESPACE "/show_toolbar"
 #define MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN         MODEST_CONF_NAMESPACE "/show_toolbar_fullscreen"
 
+/* This is the alarmd cookie, obtained from alarm_event_add(), 
+ * which apparently remains valid between application instances.
+ * We store it so that we can remove it later.
+ */
+#define MODEST_CONF_ALARM_ID MODEST_CONF_NAMESPACE "/alarm_id"
+
 /*
  * in the maemo case, we try to replace this
  * with the device name
@@ -81,6 +89,14 @@
 
 /* place for widget settings */
 #define MODEST_CONF_WIDGET_NAMESPACE     MODEST_CONF_NAMESPACE "/widgets"
+#define MODEST_CONF_FOLDER_VIEW_KEY      "folder-view"
+#define MODEST_CONF_HEADER_VIEW_KEY      "header-view"
+#define MODEST_CONF_MAIN_PANED_KEY       "modest-main-paned"
+#define MODEST_CONF_MSG_PANED_KEY        "modest-msg-paned"
+#define MODEST_CONF_FOLDER_PANED_KEY     "modest-folder-paned"
+#define MODEST_CONF_MAIN_WINDOW_KEY      "modest-main-window"
+#define MODEST_CONF_EDIT_WINDOW_KEY      "modest-edit-msg-window"
+#define MODEST_CONF_MSG_VIEW_WINDOW_KEY  "modest-msg-view-window"
 
 #define MODEST_SERVER_ACCOUNT_NAMESPACE  MODEST_CONF_NAMESPACE "/" "server_accounts"
 
@@ -89,14 +105,22 @@
 #define MODEST_ACCOUNT_DISPLAY_NAME      "display_name"      /* string */
 #define MODEST_ACCOUNT_STORE_ACCOUNT     "store_account"     /* string */
 #define MODEST_ACCOUNT_TRANSPORT_ACCOUNT "transport_account" /* string */
-#define MODEST_ACCOUNT_FULLNAME                 "fullname"
-#define MODEST_ACCOUNT_EMAIL             "email"
+#define MODEST_ACCOUNT_FULLNAME                 "fullname"          /* string */
+#define MODEST_ACCOUNT_EMAIL             "email"             /* string */
+
+/* This is a list of strings, with each strings, 
+ * alernating between a connection name, followed by a corresponding server account name.
+ * That's not pretty, but it's nicer than dealing with escaping of a = separator if 
+ * putting them both in one string. */
+#define MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST "specific_smtp"
 
 /* server account keys */
 #define MODEST_ACCOUNT_PASSWORD          "password"          /* string */
 #define MODEST_ACCOUNT_REMEMBER_PWD     "remember_pwd"      /* boolean */
 #define MODEST_ACCOUNT_HOSTNAME          "hostname"          /* string */
 #define MODEST_ACCOUNT_USERNAME          "username"          /* string */
+#define MODEST_ACCOUNT_USE_SIGNATURE         "use_signature"         /* boolean */
+#define MODEST_ACCOUNT_SIGNATURE         "signature"         /* string */
 #define MODEST_ACCOUNT_URI              "uri"               /* string */
 
 #define MODEST_ACCOUNT_PROTO             "proto"             /* string */
@@ -121,16 +145,16 @@
 
 #define MODEST_ACCOUNT_LIMIT_RETRIEVE   "limit-retrieve"            /* int */
 
-/* Keys and values used in the text items in the options GSList: */
-#define MODEST_ACCOUNT_OPTION_SECURITY "security"
-#define MODEST_ACCOUNT_OPTION_SECURITY_VALUE_NONE "none"
-#define MODEST_ACCOUNT_OPTION_SECURITY_VALUE_NORMAL "normal"
-#define MODEST_ACCOUNT_OPTION_SECURITY_VALUE_SSL "ssl"
+#define MODEST_ACCOUNT_SECURITY "security"
+#define MODEST_ACCOUNT_SECURITY_VALUE_NONE "none"
+#define MODEST_ACCOUNT_SECURITY_VALUE_NORMAL "normal"
+#define MODEST_ACCOUNT_SECURITY_VALUE_SSL "ssl"
 
 
 /* Options keys that correspond directly to camel options.
  * These probably should not be written to user configuration, 
  * because they are specific API implementation details. */
+/* Keys and values used in the text items in the options GSList: */
 #define MODEST_ACCOUNT_OPTION_SSL "use_ssl"
 #define MODEST_ACCOUNT_OPTION_SSL_NEVER "never"
 #define MODEST_ACCOUNT_OPTION_SSL_ALWAYS "always"
@@ -139,5 +163,8 @@
 #define MODEST_ACCOUNT_OPTION_USE_LSUB "use_lsub"
 #define MODEST_ACCOUNT_OPTION_CHECK_ALL "check_all"
 
+/* Macros for different text formats in mail editor */
+#define MODEST_FILE_FORMAT_PLAIN_TEXT 0
+#define MODEST_FILE_FORMAT_FORMATTED_TEXT 1
 
 #endif /*__MODEST_DEFS_H__*/