X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-defs.h;h=adb65b970a0b7d40922ee7bd5a281aaf7f88af9d;hp=b36e8561c3af7ec5ebcf2210784e711d1393ebca;hb=9b2d6b21063f3adbee86a734424bf643cac64511;hpb=cb68944c4c0c8e36453b07926bca8ebee668aa7b

diff --git a/src/modest-defs.h b/src/modest-defs.h
index b36e856..adb65b9 100644
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -82,18 +82,26 @@ 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
+#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
@@ -108,6 +116,11 @@ const gchar *modest_defs_namespace (const gchar *string);
 #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.
@@ -192,6 +205,7 @@ const gchar *modest_defs_namespace (const gchar *string);
 #define MODEST_ACCOUNT_ENABLED		 "enabled"	     /* boolean */
 #define MODEST_ACCOUNT_TYPE		 "type"	             /* string */
 #define MODEST_ACCOUNT_LAST_UPDATED      "last_updated"      /* int */
+#define MODEST_ACCOUNT_HAS_NEW_MAILS     "has_new_mails"     /* boolean */
 
 #define MODEST_ACCOUNT_LEAVE_ON_SERVER   "leave_on_server"   /* boolean */
 #define MODEST_ACCOUNT_PREFERRED_CNX     "preferred_cnx"     /* string */
@@ -227,15 +241,21 @@ 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 */
 
 /* Notification ids */
 #define MODEST_CONF_NOTIFICATION_IDS (modest_defs_namespace ("/notification_ids"))      /* list of ints */
+#define MODEST_ACCOUNT_NOTIFICATION_IDS "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