* fix for compile breakage

[modest] / src / modest-defs.h

diff --git a/src/modest-defs.h b/src/modest-defs.h
index 12c1041..ee32ebb 100644 (file)
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -33,11 +33,11 @@
 
 #include <glib/gi18n.h>
 
-/* some interesting dirs. NOTE, they should be prefixed
- * with $HOME; also, except MODEST_DIR itself, they
+/* Some interesting directories. NOTE, they should be prefixed
+ * with $HOME; Also, except for MODEST_DIR itself, they
  * need to be prefixed with MODEST_DIR;
- * why these seperate things? well, this is for crossplatform
- * building of dirs from their components..
+ * The parts of the path are separate for crossplatform
+ * building of dirs from their components.
  * g_build_dir is your friend
  */
 #define MODEST_DIR                       ".modest"
@@ -117,6 +117,8 @@
 #define MODEST_ACCOUNT_USERNAME_HAS_SUCCEEDED          "username_succeeded"          /* string */
 #define MODEST_ACCOUNT_USE_SIGNATURE         "use_signature"         /* boolean */
 #define MODEST_ACCOUNT_SIGNATURE         "signature"         /* string */
+
+/* Only used for mbox and maildir accounts: */
 #define MODEST_ACCOUNT_URI              "uri"               /* string */
 
 #define MODEST_ACCOUNT_PROTO             "proto"             /* string */
@@ -127,7 +129,6 @@
 #define MODEST_ACCOUNT_LEAVE_ON_SERVER   "leave_on_server"   /* boolean */
 #define MODEST_ACCOUNT_PREFERRED_CNX     "preferred_cnx"     /* string */
 #define MODEST_ACCOUNT_PORT                     "port"              /* int */
-#define MODEST_ACCOUNT_OPTIONS          "options"           /* list */
 
 #define MODEST_ACCOUNT_AUTH_MECH        "auth_mech"         /* string */
 #define MODEST_ACCOUNT_AUTH_MECH_VALUE_NONE "none"
@@ -146,19 +147,6 @@
 #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"
-#define MODEST_ACCOUNT_OPTION_SSL_WHEN_POSSIBLE "when-possible"
-
-#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