X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=d31351f766c39d7c594282d03b4eb010703ed8ee;hp=95fcb9037ad7e1d43a57157c42f9458f1526a11a;hb=e374da56f67092cecb1572dd4bee2ca34e0bc04c;hpb=685427085fa93c93dc08853eff3d635aa28f46dd diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index 95fcb90..d31351f 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -775,6 +775,7 @@ select_next_valid_row (GtkTreeModel *model, if (msg_is_visible (header, is_outbox)) { next = gtk_tree_model_get_path (model, &tmp_iter); *row_reference = gtk_tree_row_reference_new (model, next); + gtk_tree_path_free (next); retval = TRUE; finished = TRUE; } @@ -804,6 +805,7 @@ select_next_valid_row (GtkTreeModel *model, message */ finished = TRUE; } + gtk_tree_path_free (next); } else { /* If there are no more messages and we don't want to start again in the first one then @@ -814,8 +816,6 @@ select_next_valid_row (GtkTreeModel *model, /* Free */ gtk_tree_path_free (path); - if (next) - gtk_tree_path_free (next); return retval; } @@ -1425,6 +1425,7 @@ modest_msg_view_window_toggle_find_toolbar (GtkToggleAction *toggle, hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE); } else { gtk_widget_hide (priv->find_toolbar); + modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view)); } /* update the toggle buttons status */ @@ -2389,7 +2390,7 @@ on_mail_operation_started (ModestMailOperation *mail_op, tmp = priv->progress_widgets; source = modest_mail_operation_get_source(mail_op); if (G_OBJECT (self) == source) { - if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE || op_type == MODEST_MAIL_OPERATION_TYPE_OPEN ) { + if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE ) { set_toolbar_transfer_mode(self); while (tmp) { modest_progress_object_add_operation ( @@ -2416,7 +2417,7 @@ on_mail_operation_finished (ModestMailOperation *mail_op, op_type = modest_mail_operation_get_type_operation (mail_op); tmp = priv->progress_widgets; - if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE || op_type == MODEST_MAIL_OPERATION_TYPE_OPEN ) { + if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE ) { while (tmp) { modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data), mail_op); @@ -2487,14 +2488,69 @@ modest_msg_view_window_get_attachments (ModestMsgViewWindow *win) return selected_attachments; } +typedef struct { + gchar *filepath; + GtkWidget *banner; + guint banner_idle_id; +} DecodeAsyncHelper; + +static gboolean +decode_async_banner_idle (gpointer user_data) +{ + DecodeAsyncHelper *helper = (DecodeAsyncHelper *) user_data; + + helper->banner_idle_id = 0; + helper->banner = hildon_banner_show_animation (NULL, NULL, _("mail_me_opening")); + g_object_ref (helper->banner); + + return FALSE; +} + +static void +on_decode_to_stream_async_handler (TnyMimePart *mime_part, + gboolean cancelled, + TnyStream *stream, + GError *err, + gpointer user_data) +{ + DecodeAsyncHelper *helper = (DecodeAsyncHelper *) user_data; + + if (helper->banner_idle_id > 0) { + g_source_remove (helper->banner_idle_id); + helper->banner_idle_id = 0; + } + if (helper->banner) { + gtk_widget_destroy (helper->banner); + } + if (cancelled || err) { + modest_platform_information_banner (NULL, NULL, + _("mail_ib_file_operation_failed")); + goto free; + } + + /* make the file read-only */ + g_chmod(helper->filepath, 0444); + + /* Activate the file */ + modest_platform_activate_file (helper->filepath, modest_tny_mime_part_get_content_type (mime_part)); + + free: + /* Frees */ + g_free (helper->filepath); + g_object_unref (helper->banner); + g_slice_free (DecodeAsyncHelper, helper); +} + void -modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart *mime_part) +modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, + TnyMimePart *mime_part) { ModestMsgViewWindowPrivate *priv; const gchar *msg_uid; gchar *attachment_uid = NULL; gint attachment_index = 0; TnyList *attachments; + TnyMimePart *window_msg; g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window)); g_return_if_fail (TNY_IS_MIME_PART (mime_part) || (mime_part == NULL)); @@ -2536,49 +2592,44 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart return; } - if (!modest_tny_mime_part_is_msg (mime_part)) { + /* we also check for mime_part == priv->msg, as this means it's a direct attachment + * shown as attachment, so it should behave as a file */ + window_msg = TNY_MIME_PART (tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view))); + if (!modest_tny_mime_part_is_msg (mime_part)|| + mime_part == window_msg) { gchar *filepath = NULL; const gchar *att_filename = tny_mime_part_get_filename (mime_part); - const gchar *content_type; gboolean show_error_banner = FALSE; - GError *err; TnyFsStream *temp_stream = NULL; temp_stream = modest_utils_create_temp_stream (att_filename, attachment_uid, &filepath); if (temp_stream != NULL) { - content_type = tny_mime_part_get_content_type (mime_part); - if (tny_mime_part_decode_to_stream (mime_part, TNY_STREAM (temp_stream), &err) >= 0) { - /* make the file read-only */ - if (g_chmod(filepath, 0444) != 0) - g_warning ("%s: failed to set file '%s' to read-only: %s", - __FUNCTION__, filepath, strerror(errno)); - - modest_platform_activate_file (filepath, content_type); - } else { - /* error while saving attachment, maybe cerm_device_memory_full */ - show_error_banner = TRUE; - if (err != NULL) { - g_warning ("%s: tny_mime_part_decode_to_stream failed (%s)", __FUNCTION__, err->message); - g_error_free (err); - } - } + DecodeAsyncHelper *helper = g_slice_new (DecodeAsyncHelper); + helper->filepath = g_strdup (filepath); + helper->banner = NULL; + helper->banner_idle_id = g_timeout_add (1000, decode_async_banner_idle, helper); + tny_mime_part_decode_to_stream_async (mime_part, TNY_STREAM (temp_stream), + on_decode_to_stream_async_handler, + NULL, + helper); g_object_unref (temp_stream); - g_free (filepath); /* NOTE: files in the temporary area will be automatically * cleaned after some time if they are no longer in use */ } else { - if (filepath != NULL) { + if (filepath) { + const gchar *content_type; /* the file may already exist but it isn't writable, * let's try to open it anyway */ - content_type = tny_mime_part_get_content_type (mime_part); + content_type = modest_tny_mime_part_get_content_type (mime_part); modest_platform_activate_file (filepath, content_type); - g_free (filepath); } else { g_warning ("%s: modest_utils_create_temp_stream failed", __FUNCTION__); show_error_banner = TRUE; } } + if (filepath) + g_free (filepath); if (show_error_banner) modest_platform_information_banner (NULL, NULL, _("mail_ib_file_operation_failed")); } else { @@ -2608,10 +2659,11 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, attachment_uid); modest_window_set_zoom (MODEST_WINDOW (msg_win), modest_window_get_zoom (MODEST_WINDOW (window))); - modest_window_mgr_register_window (mgr, msg_win); + modest_window_mgr_register_window (mgr, msg_win, MODEST_WINDOW (window)); gtk_widget_show_all (GTK_WIDGET (msg_win)); } } + g_object_unref (window_msg); g_object_unref (mime_part); } @@ -2686,8 +2738,11 @@ save_mime_part_to_file (SaveMimePartInfo *info) info->result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0644); if (info->result == GNOME_VFS_OK) { + GError *error = NULL; stream = tny_vfs_stream_new (handle); - if (tny_mime_part_decode_to_stream (pair->part, stream, NULL) < 0) { + if (tny_mime_part_decode_to_stream (pair->part, stream, &error) < 0) { + g_warning ("modest: could not save attachment %s: %d (%s)\n", pair->filename, error?error->code:-1, error?error->message:"Unknown error"); + info->result = GNOME_VFS_ERROR_IO; } g_object_unref (G_OBJECT (stream)); @@ -2695,6 +2750,7 @@ save_mime_part_to_file (SaveMimePartInfo *info) g_slice_free (SaveMimePartPair, pair); info->pairs = g_list_delete_link (info->pairs, info->pairs); } else { + g_warning ("modest: could not create save attachment %s: %s\n", pair->filename, gnome_vfs_result_to_string (info->result)); save_mime_part_info_free (info, FALSE); } @@ -2747,10 +2803,11 @@ save_attachments_response (GtkDialog *dialog, gchar *chooser_uri; GList *files_to_save = NULL; + mime_parts = TNY_LIST (user_data); + if (arg1 != GTK_RESPONSE_OK) goto end; - mime_parts = TNY_LIST (user_data); chooser_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); if (!modest_utils_folder_writable (chooser_uri)) { @@ -2808,6 +2865,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m gchar *folder = NULL; gchar *filename = NULL; gchar *save_multiple_str = NULL; + TnyMsg *window_msg; g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window)); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); @@ -2820,6 +2878,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m g_object_ref (mime_parts); } + window_msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)); /* prepare dialog */ if (tny_list_get_length (mime_parts) == 1) { TnyIterator *iter; @@ -2842,6 +2901,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m save_multiple_str = g_strdup_printf (_FM("sfil_va_number_of_objects_attachments"), tny_list_get_length (mime_parts)); } + g_object_unref (window_msg); save_dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_SAVE); @@ -2905,7 +2965,6 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean gint n_attachments; TnyMsg *msg; TnyIterator *iter; -/* TnyFolder *folder; */ g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window)); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); @@ -2968,10 +3027,6 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean } priv->purge_timeout = g_timeout_add (2000, show_remove_attachment_information, window); -/* folder = tny_msg_get_folder (msg); */ -/* tny_msg_uncache_attachments (msg); */ -/* tny_folder_refresh (folder, NULL); */ -/* g_object_unref (folder); */ iter = tny_list_create_iterator (mime_parts); while (!tny_iterator_is_done (iter)) { @@ -2979,7 +3034,6 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean part = (TnyMimePart *) tny_iterator_get_current (iter); tny_mime_part_set_purged (TNY_MIME_PART (part)); -/* modest_msg_view_remove_attachment (MODEST_MSG_VIEW (priv->msg_view), node->data); */ g_object_unref (part); tny_iterator_next (iter); } @@ -3154,3 +3208,11 @@ on_fetch_image (ModestMsgView *msgview, return TRUE;; } + +void +modest_msg_view_window_add_to_contacts (ModestMsgViewWindow *self) +{ + modest_ui_actions_on_add_to_contacts (NULL, MODEST_WINDOW (self)); +} + +