X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-utils.c;h=f56a3a8d0249b7f2d9214221678393da20ee4dcd;hp=7fe1833782bd50cf406f21731b7884a8bb8600a3;hb=12a672c559d983c4e49a7e4054ee14c0177ecb1c;hpb=3b5dc6fc08a4bb09b660ce6c777edc2e35fdcdfa diff --git a/src/modest-utils.c b/src/modest-utils.c index 7fe1833..f56a3a8 100644 --- a/src/modest-utils.c +++ b/src/modest-utils.c @@ -36,10 +36,11 @@ #include #include #include +#include #include #include #include - +#include #include #include "modest-utils.h" #include "modest-platform.h" @@ -70,7 +71,7 @@ modest_utils_folder_writable (const gchar *filename) if (!filename) return FALSE; - if (g_strncasecmp (filename, "obex", 4) != 0) { + if (g_ascii_strncasecmp (filename, "obex", 4) != 0) { GnomeVFSFileInfo *folder_info = NULL; GnomeVFSResult result = GNOME_VFS_OK; GnomeVFSURI *uri = NULL; @@ -105,16 +106,20 @@ modest_utils_folder_writable (const gchar *filename) gboolean modest_utils_file_exists (const gchar *filename) { - GnomeVFSURI *uri = NULL; gboolean result = FALSE; + gchar *path; g_return_val_if_fail (filename, FALSE); - uri = gnome_vfs_uri_new (filename); - if (uri) { - result = gnome_vfs_uri_exists (uri); - gnome_vfs_uri_unref (uri); - } + path = strstr (filename, "file://"); + if (!path) + path = (gchar *) filename; + else + path = (gchar *) filename + strlen ("file://"); + + if (g_access (path, F_OK) == 0) + result = TRUE; + return result; } @@ -135,7 +140,7 @@ modest_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base, return NULL; } - if (g_strstr_len (orig_name, strlen(orig_name), "/") != NULL) { + if (g_strstr_len (orig_name, strlen (orig_name), "/") != NULL) { g_warning ("%s: filename contains '/' character(s) (%s)", __FUNCTION__, orig_name); return NULL; @@ -155,15 +160,14 @@ modest_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base, return NULL; } - filepath = g_strconcat (tmpdir, "/", orig_name, NULL); + filepath = g_build_filename (tmpdir, orig_name, NULL); /* if file exists, first we try to remove it */ - if (modest_utils_file_exists (filepath)) { + if (g_access (filepath, F_OK) == 0) g_unlink (filepath); - } /* don't overwrite if it already exists, even if it is writable */ - if (modest_utils_file_exists (filepath)) { + if (g_access (filepath, F_OK) == 0) { if (path!=NULL) { *path = filepath; } else { @@ -618,8 +622,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 +746,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 +782,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,59 +833,28 @@ modest_utils_on_entry_invalid_character (ModestValidatingEntry *self, } FILE* -modest_utils_open_mcc_mapping_file (gboolean *translated) +modest_utils_open_mcc_mapping_file (void) { FILE* result = NULL; const gchar* path; - gchar *path1 = g_strdup_printf ("%s.%s", MODEST_OPERATOR_WIZARD_MCC_MAPPING, getenv("LANG")); - 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) { + 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 if (access (MODEST_MCC_MAPPING, R_OK) == 0) { + path = MODEST_MCC_MAPPING; } else { g_warning ("%s: neither '%s' nor '%s' is a readable mapping file", - __FUNCTION__, path1, path2); - goto end; + __FUNCTION__, MODEST_OPERATOR_WIZARD_MCC_MAPPING, MODEST_MCC_MAPPING); + return NULL; } result = fopen (path, "r"); if (!result) { g_warning ("%s: error opening mapping file '%s': %s", __FUNCTION__, path, strerror(errno)); - goto end; } - end: - g_free (path1); - return result; -} -/* cluster mcc's, based on the list - * http://en.wikipedia.org/wiki/Mobile_country_code - */ -static int -effective_mcc (gint mcc) -{ - switch (mcc) { - case 405: return 404; /* india */ - case 441: return 440; /* japan */ - case 235: return 234; /* united kingdom */ - case 311: - case 312: - case 313: - case 314: - case 315: - case 316: return 310; /* united states */ - default: return mcc; - } + return result; } /* each line is of the form: @@ -890,12 +863,6 @@ effective_mcc (gint mcc) NOTE: this function is NOT re-entrant, the out-param country are static strings that should NOT be freed. and will change when calling this function again - - also note, this function will return the "effective mcc", which - is the normalized mcc for a country - ie. even if the there - are multiple entries for the United States with various mccs, - this function will always return 310, even if the real mcc parsed - would be 314. see the 'effective_mcc' function above. */ static int parse_mcc_mapping_line (const char* line, char** country) @@ -916,8 +883,9 @@ parse_mcc_mapping_line (const char* line, char** country) *country = g_utf8_find_next_char (tab, NULL); /* Replace by end of string. We need to use strlen, because - g_utf8_strrchr expects bytes and not UTF8 characters */ - final = g_utf8_strrchr (tab, strlen (tab) + 1, '\n'); + g_utf8_strrchr expects bytes and not UTF8 characters. File + lines end with \r\n */ + final = g_utf8_strrchr (tab, strlen (tab) + 1, '\r'); if (G_LIKELY (final)) *final = '\0'; else @@ -931,7 +899,7 @@ parse_mcc_mapping_line (const char* line, char** country) mcc[2] = g_utf8_get_char (iter); mcc[3] = '\0'; - return effective_mcc ((int) strtol ((const char*)mcc, NULL, 10)); + return (int) strtol ((const char*)mcc, NULL, 10); } #define MCC_FILE_MAX_LINE_LEN 128 /* max length of a line in MCC file */ @@ -952,26 +920,27 @@ modest_utils_create_country_model (void) void modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc) { - gboolean translated; 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 (); 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); + territory = nl_langinfo (_NL_IDENTIFICATION_TERRITORY); - while (fgets (line, MCC_FILE_MAX_LINE_LEN, file) != NULL) { + setlocale (LC_MESSAGES, "en_GB"); + 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) { @@ -986,25 +955,55 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc) previous_mcc = mcc; if (!(*locale_mcc)) { - if (translated) { - if (!g_utf8_collate (country, territory)) - *locale_mcc = mcc; - } else { - gchar *translation = dgettext ("osso-countries", country); - if (!g_utf8_collate (translation, territory)) - *locale_mcc = mcc; - } + gchar *translation = dgettext ("osso-countries", country); + if (!g_utf8_collate (translation, territory)) + *locale_mcc = mcc; } - name_translated = dgettext ("osso-countries", country); + } + + setlocale (LC_MESSAGES, ""); + + /* Now we fill the model */ + rewind (file); + 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) { - /* Add the row to the model: */ + int mcc; + char *country = NULL; 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); + 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 if we have translation for it */ + if (g_utf8_collate (country, name_translated)) { + 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); + } else { + g_debug ("%s no translation for %s", __FUNCTION__, country); + } } + + + g_hash_table_unref (country_hash); fclose (file); /* Fallback to Finland */ @@ -1016,3 +1015,96 @@ 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); + + g_slice_free (ModestMsgNotificationData, notification_data); +} + +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); +} + +void +modest_utils_flush_send_queue (const gchar *account_id) +{ + TnyTransportAccount *account; + + /* Get the transport account */ + account = (TnyTransportAccount *) + modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), + account_id, + TNY_ACCOUNT_TYPE_TRANSPORT); + if (account) { + ModestMailOperation *wakeup_op; + ModestTnySendQueue *send_queue = modest_runtime_get_send_queue (account, TRUE); + + /* Flush it! */ + wakeup_op = modest_mail_operation_new (NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + wakeup_op); + modest_mail_operation_queue_wakeup (wakeup_op, send_queue); + + g_object_unref (account); + } +}