X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-utils.c;h=c6e50e7b8dd6dbd9ea99af7bdeced43e5a4ecddb;hp=7fe1833782bd50cf406f21731b7884a8bb8600a3;hb=aa2550dd7c4bd174d8953961d4ff64c3e88c01ad;hpb=3b5dc6fc08a4bb09b660ce6c777edc2e35fdcdfa diff --git a/src/modest-utils.c b/src/modest-utils.c index 7fe1833..c6e50e7 100644 --- a/src/modest-utils.c +++ b/src/modest-utils.c @@ -618,8 +618,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK; priority_sort_id = sort_key; - sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model - (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))))); + sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))); /* Launch dialogs */ if (!gtk_tree_sortable_get_sort_column_id (sortable, ¤t_sort_colid, ¤t_sort_type)) { @@ -743,28 +742,6 @@ modest_utils_get_account_name_from_recipient (const gchar *from_header, gchar ** break; } - from = - modest_account_mgr_get_from_string (mgr, node->data, NULL); - - if (from) { - gchar *from_email = - modest_text_utils_get_email_address (from); - gchar *from_header_email = - modest_text_utils_get_email_address (from_header); - - if (from_email && from_header_email) { - if (!modest_text_utils_utf8_strcmp (from_header_email, from_email, TRUE)) { - account_name = g_strdup (node->data); - g_free (from); - g_free (from_email); - break; - } - } - g_free (from_email); - g_free (from_header_email); - g_free (from); - } - transport_account = modest_account_mgr_get_server_account_name (modest_runtime_get_account_mgr (), (const gchar *) node->data, TNY_ACCOUNT_TYPE_TRANSPORT); @@ -801,6 +778,29 @@ modest_utils_get_account_name_from_recipient (const gchar *from_header, gchar ** } if (mailbox && *mailbox) break; + + from = + modest_account_mgr_get_from_string (mgr, node->data, NULL); + + if (from) { + gchar *from_email = + modest_text_utils_get_email_address (from); + gchar *from_header_email = + modest_text_utils_get_email_address (from_header); + + if (from_email && from_header_email) { + if (!modest_text_utils_utf8_strcmp (from_header_email, from_email, TRUE)) { + account_name = g_strdup (node->data); + g_free (from); + g_free (from_email); + break; + } + } + g_free (from_email); + g_free (from_header_email); + g_free (from); + } + } g_slist_foreach (accounts, (GFunc) g_free, NULL); @@ -829,28 +829,50 @@ modest_utils_on_entry_invalid_character (ModestValidatingEntry *self, } FILE* -modest_utils_open_mcc_mapping_file (gboolean *translated) +modest_utils_open_mcc_mapping_file (gboolean from_lc_messages, gboolean *translated) { FILE* result = NULL; const gchar* path; - gchar *path1 = g_strdup_printf ("%s.%s", MODEST_OPERATOR_WIZARD_MCC_MAPPING, getenv("LANG")); + const gchar *env_list; + gchar **parts, **node; + + if (from_lc_messages) { + env_list = getenv ("LC_MESSAGES"); + } else { + env_list = getenv ("LANG"); + } + parts = g_strsplit (env_list, ":", 0); + gchar *path1 = NULL; const gchar* path2 = MODEST_MCC_MAPPING; if (translated) *translated = TRUE; - if (access (path1, R_OK) == 0) { - path = path1; - } else if (access (MODEST_OPERATOR_WIZARD_MCC_MAPPING, R_OK) == 0) { - path = MODEST_OPERATOR_WIZARD_MCC_MAPPING; - if (translated) - *translated = FALSE; - } else if (access (path2, R_OK) == 0) { - path = path2; - } else { - g_warning ("%s: neither '%s' nor '%s' is a readable mapping file", - __FUNCTION__, path1, path2); - goto end; + path = NULL; + for (node = parts; path == NULL && node != NULL && *node != NULL && **node != '\0'; node++) { + path1 = g_strdup_printf ("%s.%s", MODEST_OPERATOR_WIZARD_MCC_MAPPING, *node); + if (access (path1, R_OK) == 0) { + path = path1; + break; + } else { + g_free (path1); + path1 = NULL; + } + } + g_strfreev (parts); + + if (path == NULL) { + if (access (MODEST_OPERATOR_WIZARD_MCC_MAPPING, R_OK) == 0) { + path = MODEST_OPERATOR_WIZARD_MCC_MAPPING; + if (translated) + *translated = FALSE; + } else if (access (path2, R_OK) == 0) { + path = path2; + } else { + g_warning ("%s: neither '%s' nor '%s' is a readable mapping file", + __FUNCTION__, path1, path2); + goto end; + } } result = fopen (path, "r"); @@ -956,22 +978,22 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc) char line[MCC_FILE_MAX_LINE_LEN]; guint previous_mcc = 0; gchar *territory; - + GHashTable *country_hash; FILE *file; - file = modest_utils_open_mcc_mapping_file (&translated); + /* First we need to know our current region */ + file = modest_utils_open_mcc_mapping_file (FALSE, &translated); if (!file) { - g_warning("Could not open mcc_mapping file"); + g_warning ("Could not open mcc_mapping file"); + return; } /* Get the territory specified for the current locale */ territory = nl_langinfo (_NL_ADDRESS_COUNTRY_NAME); while (fgets (line, MCC_FILE_MAX_LINE_LEN, file) != NULL) { - int mcc; char *country = NULL; - const gchar *name_translated; mcc = parse_mcc_mapping_line (line, &country); if (!country || mcc == 0) { @@ -995,16 +1017,51 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc) *locale_mcc = mcc; } } + } + fclose (file); + + /* Now we fill the model */ + file = modest_utils_open_mcc_mapping_file (TRUE, &translated); + if (!file) { + g_warning ("Could not open mcc_mapping file"); + return; + } + + country_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + while (fgets (line, MCC_FILE_MAX_LINE_LEN, file) != NULL) { + + int mcc; + char *country = NULL; + GtkTreeIter iter; + const gchar *name_translated; + + mcc = parse_mcc_mapping_line (line, &country); + if (!country || mcc == 0) { + g_warning ("%s: error parsing line: '%s'", __FUNCTION__, line); + continue; + } + + if (mcc == previous_mcc || + g_hash_table_lookup (country_hash, country)) { + g_debug ("already seen: '%s' %d", country, mcc); + continue; + } + previous_mcc = mcc; + + g_hash_table_insert (country_hash, g_strdup (country), GINT_TO_POINTER (mcc)); + name_translated = dgettext ("osso-countries", country); /* Add the row to the model: */ - GtkTreeIter iter; gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set(GTK_LIST_STORE (model), &iter, MODEST_UTILS_COUNTRY_MODEL_COLUMN_MCC, mcc, MODEST_UTILS_COUNTRY_MODEL_COLUMN_NAME, name_translated, -1); } + + + g_hash_table_unref (country_hash); fclose (file); /* Fallback to Finland */ @@ -1016,3 +1073,70 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc) MODEST_UTILS_COUNTRY_MODEL_COLUMN_NAME, GTK_SORT_ASCENDING); } +GList * +modest_utils_create_notification_list_from_header_list (TnyList *header_list) +{ + GList *new_headers_list; + TnyIterator *iter; + + g_return_val_if_fail (TNY_IS_LIST (header_list), NULL); + g_return_val_if_fail (tny_list_get_length (header_list) > 0, NULL); + + new_headers_list = NULL; + iter = tny_list_create_iterator (header_list); + while (!tny_iterator_is_done (iter)) { + ModestMsgNotificationData *data; + TnyHeader *header; + TnyFolder *folder; + + header = (TnyHeader *) tny_iterator_get_current (iter); + if (header) { + folder = tny_header_get_folder (header); + + if (folder) { + gchar *uri, *uid; + + uid = tny_header_dup_uid (header); + uri = g_strdup_printf ("%s/%s", + tny_folder_get_url_string (folder), + uid); + g_free (uid); + + /* Create data & add to list */ + data = g_slice_new0 (ModestMsgNotificationData); + data->subject = tny_header_dup_subject (header); + data->from = tny_header_dup_from (header); + data->uri = uri; + + new_headers_list = g_list_append (new_headers_list, data); + + g_object_unref (folder); + } + g_object_unref (header); + } + tny_iterator_next (iter); + } + g_object_unref (iter); + + return new_headers_list; +} + +static void +free_notification_data (gpointer data, + gpointer user_data) +{ + ModestMsgNotificationData *notification_data = (ModestMsgNotificationData *) data; + + g_free (notification_data->from); + g_free (notification_data->subject); + g_free (notification_data->uri); +} + +void +modest_utils_free_notification_list (GList *notification_list) +{ + g_return_if_fail (g_list_length (notification_list) > 0); + + g_list_foreach (notification_list, free_notification_data, NULL); + g_list_free (notification_list); +}