X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-utils.h;h=393f869ae7ba69507551396b8b6d20638dec8c47;hp=ff453b619e24b3239443a5dcc8d0e26fc4a4f247;hb=4d39841513a3a7f7aa9d38ab97cb9fcc9171e80b;hpb=627c4af6ac85444cc3256fa568baf4a8d62178ae

diff --git a/src/modest-utils.h b/src/modest-utils.h
index ff453b6..393f869 100644
--- a/src/modest-utils.h
+++ b/src/modest-utils.h
@@ -45,6 +45,12 @@ typedef enum _ModestSortDialogType {
 	MODEST_SORT_HEADERS,
 } ModestSortDialogType;
 
+typedef struct _ModestMsgNotificationData {
+	gchar *subject;
+	gchar *from;
+	gchar *uri;
+} ModestMsgNotificationData;
+
 GQuark modest_utils_get_supported_secure_authentication_error_quark (void);
 
 
@@ -161,7 +167,6 @@ gint modest_list_index (TnyList *list, GObject *object);
  */
 guint64 modest_utils_get_available_space (const gchar *maildir_path);
 
-<<<<<<< .working
 /**
  * modest_images_cache_get_id:
  * @account: a #TnyAccount
@@ -184,36 +189,68 @@ gchar *modest_images_cache_get_id (const gchar *account, const gchar *uri);
  * Returns: a newly allocated string containing the account name or
  * %NULL in case of error
  */
-gchar *modest_utils_get_account_name_from_recipient (const gchar *from);
+gchar *modest_utils_get_account_name_from_recipient (const gchar *from, gchar **mailbox);
+
+void modest_utils_on_entry_invalid_character (ModestValidatingEntry *self, 
+					      const gchar* character,
+					      gpointer user_data);
 
-=======
 /**
- * modest_images_cache_get_id:
- * @account: a #TnyAccount
- * @uri: an uri string
+ * modest_utils_open_mcc_mapping_file:
+ * @translated: a #gboolean pointer
  *
- * obtains the hash corresponding to an image external resource to be
- * stored in image cache.
+ * open the mcc mapping file, or %NULL if it fails. It also
+ * sets @translated to %TRUE if the file is translated
  *
- * Returns: a newly allocated string containing the hash key
+ * Returns: file ptr or %NULL in case of error
  */
-gchar *modest_images_cache_get_id (const gchar *account, const gchar *uri);
+FILE* modest_utils_open_mcc_mapping_file (gboolean from_lc_messages, gboolean *translated);
 
+typedef enum {
+	MODEST_UTILS_COUNTRY_MODEL_COLUMN_NAME = 0,
+	MODEST_UTILS_COUNTRY_MODEL_COLUMN_MCC = 1,
+	MODEST_UTILS_COUNTRY_MODEL_N_COLUMNS
+} ModestUtilsCountryModelColumns;
 
 /**
- * modest_utils_get_account_name_from_recipient:
- * @from: the result of a call to tny_header_dup_from
+ * modest_utils_create_country_model:
+ * @locale_mcc: a #gboolean
  *
- * returns the account name that corresponds to the given from address
+ * creates the countries tree model used in wizard from the mcc
+ * files.
  *
- * Returns: a newly allocated string containing the account name or
- * %NULL in case of error
+ * Returns: an empty #GtkTreeModel with the columns enumerated in
+ *  #ModestUtilsCountryModelColumns
  */
-gchar *modest_utils_get_account_name_from_recipient (const gchar *from);
+GtkTreeModel *modest_utils_create_country_model (void);
 
-void modest_utils_on_entry_invalid_character (ModestValidatingEntry *self, 
-					      const gchar* character,
-					      gpointer user_data);
+/**
+ * modest_utils_fill_country_model:
+ * @model: a #GtkTreeModel (obtained with modest_utils_create_country_model
+ * @locale_mcc: a #gboolean
+ *
+ * fills the countries tree model used in wizard from the mcc
+ * files.
+ *
+ */
+void modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc);
 
->>>>>>> .merge-right.r5668
+/**
+ * modest_utils_create_notification_list_from_header_list:
+ * @header_list: a #TnyList of #TnyHeader instances
+ *
+ * This function transforms a list of #TnyHeader objects into a list
+ * that will be used to issue new email notifications
+ *
+ * Returns: a #GList of #ModestMsgNotificationData
+ **/
+GList *modest_utils_create_notification_list_from_header_list (TnyList *header_list);
+
+/**
+ * modest_utils_free_notification_list:
+ * @notification_list: a #GList of #ModestMsgNotificationData
+ *
+ * Frees a list of #ModestMsgNotificationData structures
+ **/
+void  modest_utils_free_notification_list (GList *notification_list);
 #endif /*__MODEST_MAEMO_UTILS_H__*/