/* 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
/* 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