/* 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
#ifdef MODEST_TOOLKIT_HILDON2
+#define MODEST_ICON_SIZE_XSMALL 16
#define MODEST_ICON_SIZE_SMALL 24
#define MODEST_ICON_SIZE_BIG 48
#else
+#define MODEST_ICON_SIZE_XSMALL 16
#define MODEST_ICON_SIZE_SMALL 26
#define MODEST_ICON_SIZE_BIG 64
#endif
#else
+#define MODEST_ICON_SIZE_XSMALL 16
#define MODEST_ICON_SIZE_SMALL 16
#define MODEST_ICON_SIZE_BIG 32
#endif
#define MODEST_CONF_SHOW_CC (modest_defs_namespace ("/show_cc"))
#define MODEST_CONF_SHOW_BCC (modest_defs_namespace ("/show_bcc"))
+/* Last used folders for insert images, attach file and save attachments */
+#define MODEST_CONF_LATEST_ATTACH_FILE_PATH (modest_defs_namespace ("/latest_attach_file_path"))
+#define MODEST_CONF_LATEST_INSERT_IMAGE_PATH (modest_defs_namespace ("/latest_inset_image_path"))
+#define MODEST_CONF_LATEST_SAVE_ATTACHMENT_PATH (modest_defs_namespace ("/latest_save_attachment_path"))
+
/* 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.
/* 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