X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-utils.c;h=1f0938507c685bac93572264663614dc99afae5a;hp=5f934c15c1575fa89597211ef69f7c15e2be7aa1;hb=b2deee4c8e8ef8eb71db460c66bfed9994c23b56;hpb=059f215cec94c21c941a925b521f6c4bef640550 diff --git a/src/modest-utils.c b/src/modest-utils.c index 5f934c1..1f09385 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 { @@ -742,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); @@ -800,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); @@ -828,60 +833,27 @@ modest_utils_on_entry_invalid_character (ModestValidatingEntry *self, } FILE* -modest_utils_open_mcc_mapping_file (gboolean from_lc_messages, gboolean *translated) +modest_utils_open_mcc_mapping_file (void) { FILE* result = NULL; const gchar* path; - const gchar *env_list; - gchar **parts, **node; - if (from_lc_messages) { - env_list = getenv ("LC_MESSAGES"); + if (access (MODEST_OPERATOR_WIZARD_MCC_MAPPING, R_OK) == 0) { + path = MODEST_OPERATOR_WIZARD_MCC_MAPPING; + } else if (access (MODEST_MCC_MAPPING, R_OK) == 0) { + path = MODEST_MCC_MAPPING; } else { - env_list = getenv ("LANG"); - } - parts = g_strsplit (env_list, ":", 0); - gchar *path1; - const gchar* path2 = MODEST_MCC_MAPPING; - - if (translated) - *translated = TRUE; - - 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; - } + g_warning ("%s: neither '%s' nor '%s' is a readable mapping file", + __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; } @@ -937,8 +909,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 @@ -973,7 +946,6 @@ 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; @@ -981,7 +953,7 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc) FILE *file; /* First we need to know our current region */ - file = modest_utils_open_mcc_mapping_file (FALSE, &translated); + file = modest_utils_open_mcc_mapping_file (); if (!file) { g_warning ("Could not open mcc_mapping file"); return; @@ -1007,25 +979,14 @@ 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; } } - 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; - } - + 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) { @@ -1042,7 +1003,7 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc) if (mcc == previous_mcc || g_hash_table_lookup (country_hash, country)) { - g_message ("already seen: '%s' %d", country, mcc); + g_debug ("already seen: '%s' %d", country, mcc); continue; } previous_mcc = mcc; @@ -1051,12 +1012,16 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc) name_translated = dgettext ("osso-countries", country); - /* Add the row to the model: */ - 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); + /* 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); + } } @@ -1129,6 +1094,8 @@ free_notification_data (gpointer data, g_free (notification_data->from); g_free (notification_data->subject); g_free (notification_data->uri); + + g_slice_free (ModestMsgNotificationData, notification_data); } void @@ -1139,3 +1106,27 @@ modest_utils_free_notification_list (GList *notification_list) 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); + } +}