*/
guint64 modest_utils_get_available_space (const gchar *maildir_path);
-<<<<<<< .working
/**
* modest_images_cache_get_id:
* @account: a #TnyAccount
* 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 *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);
+
+/**
+ * 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);
+
-void modest_utils_on_entry_invalid_character (ModestValidatingEntry *self,
- const gchar* character,
- gpointer user_data);
->>>>>>> .merge-right.r5668
#endif /*__MODEST_MAEMO_UTILS_H__*/