X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-utils.c;h=8df81afb8ad49ae00cae307ebd3d3f3e141ac612;hp=afd91ebfa9f618d29057c182d48166757102109d;hb=eb9463f21b1942a3c05020fcbea02672925f63f1;hpb=aae23d8d941e2023b6158db1795bfbe4e3e54673 diff --git a/src/modest-utils.c b/src/modest-utils.c index afd91eb..8df81af 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; } @@ -123,19 +128,23 @@ modest_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base, { gint fd; gchar *filepath = NULL; - gchar *tmpdir; + gchar *tmpdir, *tmp; guint hash_number; /* hmmm... maybe we need a modest_text_utils_validate_file_name? */ g_return_val_if_fail (orig_name && strlen(orig_name) != 0, NULL); - if (strlen(orig_name) > 200) { + tmp = g_uri_escape_string (orig_name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT, FALSE); + + if (strlen(tmp) > 200) { + g_free (tmp); g_warning ("%s: filename too long ('%s')", __FUNCTION__, orig_name); return NULL; } - if (g_strstr_len (orig_name, strlen(orig_name), "/") != NULL) { + if (g_strstr_len (tmp, strlen (tmp), "/") != NULL) { + g_free (tmp); g_warning ("%s: filename contains '/' character(s) (%s)", __FUNCTION__, orig_name); return NULL; @@ -155,15 +164,15 @@ 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, tmp, NULL); + g_free (tmp); /* 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 +627,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 +751,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 +787,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); @@ -837,12 +846,12 @@ modest_utils_open_mcc_mapping_file (gboolean from_lc_messages, gboolean *transla gchar **parts, **node; if (from_lc_messages) { - env_list = getenv ("LC_MESSAGES"); + env_list = setlocale (LC_MESSAGES, NULL); } else { env_list = getenv ("LANG"); } parts = g_strsplit (env_list, ":", 0); - gchar *path1; + gchar *path1 = NULL; const gchar* path2 = MODEST_MCC_MAPPING; if (translated) @@ -1043,7 +1052,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; @@ -1073,3 +1082,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); + } +}