X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-defs.h;h=4198225eed1c2c70781d34847504deabeae4ebb6;hb=5e30d31cfcd1ab7f1049a1969d8e6bd71e28a7b6;hp=18ac528446a4d62371ddd6a76052302991a5cb77;hpb=4e00aa5fcd63aca03c7d7cf9494c3191f1d64721;p=modest

diff --git a/src/modest-defs.h b/src/modest-defs.h
index 18ac528..4198225 100644
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -82,12 +82,12 @@ const gchar *modest_defs_namespace (const gchar *string);
 /* configuration key definitions for modest */
 #define MODEST_CONF_NAMESPACE		(modest_defs_namespace (NULL))
 
-/* the mapping files, there are two possibilities; used in modest_maemo_open_mcc_mapping_file */
+/* the mapping files, there are two possibilities; used in modest_utils_open_mcc_mapping_file */
 #define MODEST_MCC_MAPPING                 PREFIX "/share/modest/provider-data/mcc_mapping"
 #define MODEST_OPERATOR_WIZARD_MCC_MAPPING "/usr/share/operator-wizard/mcc_mapping"
 
 #define MODEST_PROVIDER_DATA_FILE         PREFIX "/share/modest/provider-data/modest-provider-data.keyfile"  
-#define MODEST_MAEMO_PROVIDER_DATA_FILE	  PREFIX "/share/modest/provider-data/maemo-provider-data.keyfile"  
+#define MODEST_FALLBACK_PROVIDER_DATA_FILE	  PREFIX "/share/modest/provider-data/fallback-provider-data.keyfile"  
 
 
 #ifndef MODEST_TOOLKIT_GTK
@@ -240,6 +240,8 @@ const gchar *modest_defs_namespace (const gchar *string);
 #define MODEST_CONF_PREFER_FORMATTED_TEXT (modest_defs_namespace ("/prefer_formatted_text")) /* bool */
 #define MODEST_CONF_REPLY_TYPE           (modest_defs_namespace ("/reply_type"))        /*  int  */
 #define MODEST_CONF_FORWARD_TYPE         (modest_defs_namespace  ("/forward_type"))      /*  int  */
+#define MODEST_CONF_NOTIFICATIONS (modest_defs_namespace ("/notifications")) /* bool */
+#define MODEST_CONF_AUTO_ADD_TO_CONTACTS (modest_defs_namespace ("/auto_add_to_contacs")) /* bool */
 
 /* hidden global settings */
 #define MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES (modest_defs_namespace ("/fetch_external_images")) /* bool */
@@ -247,8 +249,11 @@ const gchar *modest_defs_namespace (const gchar *string);
 /* Notification ids */
 #define MODEST_CONF_NOTIFICATION_IDS (modest_defs_namespace ("/notification_ids"))      /* list of ints */
 
-
+#ifdef MODEST_TOOLKIT_HILDON2
+#define MODEST_EXAMPLE_EMAIL_ADDRESS _("mcen_va_example_email_address")
+#else
 #define MODEST_EXAMPLE_EMAIL_ADDRESS "first.last@example.com"
+#endif
 
 
 /* max size of message we still allow to save/send when we're in low-mem