*/
#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)
+#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
+
/* 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_CONNECT_AT_STARTUP MODEST_CONF_NAMESPACE "/connect_at_startup"
+
+#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"
+
+
+/*
+ * in the maemo case, we try to replace this
+ * with the device name
+ */
+#define MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME N_("Local folders")
+
+/* the name of the device; in case of maemo this is set and updated
+ * using dbus; see modest-maemo-utils.[ch]
+ */
+#define MODEST_CONF_DEVICE_NAME MODEST_CONF_NAMESPACE "/device_name"
+
+
/* 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 */
#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__*/