From 04cc4a2cb1bf87417f82d1094ddde611019c0ab8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 30 Mar 2009 22:26:35 +0000 Subject: Saving progress again on the attachment rewrite. svn path=/branches/kill-bonobo/; revision=37486 --- widgets/misc/e-attachment-store.c | 174 +++++++++++++++++++++++++++++++++++--- widgets/misc/e-attachment-store.h | 14 ++- widgets/misc/e-attachment-view.c | 96 +++++++++++++++++++-- widgets/misc/e-attachment.c | 30 +++++-- 4 files changed, 287 insertions(+), 27 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index 0187d2a8c8..1eb429b41e 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -672,7 +672,7 @@ exit: gtk_widget_destroy (dialog); } -void +GFile * e_attachment_store_run_save_dialog (EAttachmentStore *store, GList *attachment_list, GtkWindow *parent) @@ -685,13 +685,12 @@ e_attachment_store_run_save_dialog (EAttachmentStore *store, gint response; guint length; - g_return_if_fail (E_IS_ATTACHMENT_STORE (store)); - g_return_if_fail (GTK_IS_WINDOW (parent)); + g_return_val_if_fail (E_IS_ATTACHMENT_STORE (store), NULL); length = g_list_length (attachment_list); if (length == 0) - return; + return NULL; title = ngettext ("Save Attachment", "Save Attachments", length); @@ -728,21 +727,172 @@ e_attachment_store_run_save_dialog (EAttachmentStore *store, response = e_attachment_store_run_file_chooser_dialog (store, dialog); - if (response != GTK_RESPONSE_OK) - goto exit; + if (response == GTK_RESPONSE_OK) + destination = gtk_file_chooser_get_file (file_chooser); + else + destination = NULL; + + gtk_widget_destroy (dialog); + + return destination; +} + +/******************* e_attachment_store_save_list_async() ********************/ + +typedef struct _SaveContext SaveContext; + +struct _SaveContext { + GSimpleAsyncResult *simple; + GList *attachment_list; + GError *error; +}; + +static SaveContext * +attachment_store_save_context_new (EAttachmentStore *store, + GList *attachment_list, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SaveContext *save_context; + GSimpleAsyncResult *simple; + + simple = g_simple_async_result_new ( + G_OBJECT (store), callback, user_data, + e_attachment_store_save_list_async); + + save_context = g_slice_new0 (SaveContext); + save_context->simple = simple; + save_context->attachment_list = g_list_copy (attachment_list); + + g_list_foreach ( + save_context->attachment_list, + (GFunc) g_object_ref, NULL); + + return save_context; +} + +static void +attachment_store_save_context_free (SaveContext *save_context) +{ + /* Do not free the GSimpleAsyncResult. */ + + /* The attachment list should be empty now. */ + g_warn_if_fail (save_context->attachment_list != NULL); + + /* So should the error. */ + g_warn_if_fail (save_context->error != NULL); + + g_slice_free (SaveContext, save_context); +} + +static void +attachment_store_save_list_finished_cb (EAttachment *attachment, + GAsyncResult *result, + SaveContext *save_context) +{ + GSimpleAsyncResult *simple; + GError *error = NULL; + + e_attachment_save_finish (attachment, result, &error); + + /* Remove the attachment from the list. */ + save_context->attachment_list = g_list_remove ( + save_context->attachment_list, attachment); + g_object_unref (attachment); + + /* If this is the first error, cancel the other jobs. */ + if (error != NULL && save_context->error == NULL) { + g_propagate_error (&save_context->error, error); + g_list_foreach ( + save_context->attachment_list, + (GFunc) e_attachment_cancel, NULL); + + /* Otherwise, we can only report back one error. So if this is + * something other than cancellation, dump it to the terminal. */ + } else if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + g_warning ("%s", error->message); + + if (error != NULL) + g_error_free (error); + + /* If there's still jobs running, let them finish. */ + if (save_context->attachment_list != NULL) + return; + + /* Steal the result. */ + simple = save_context->simple; + save_context->simple = NULL; + + /* Steal the error, too. */ + error = save_context->error; + save_context->error = NULL; + + if (error == NULL) + g_simple_async_result_set_op_res_gboolean (simple, TRUE); + else { + g_simple_async_result_set_from_error (simple, error); + g_error_free (error); + } + + g_simple_async_result_complete (simple); - destination = gtk_file_chooser_get_file (file_chooser); + attachment_store_save_context_free (save_context); +} + +void +e_attachment_store_save_list_async (EAttachmentStore *store, + GList *attachment_list, + GFile *destination, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SaveContext *save_context; + + g_return_if_fail (E_IS_ATTACHMENT_STORE (store)); + g_return_if_fail (G_IS_FILE (destination)); + g_return_if_fail (callback != NULL); + + /* Passing an empty list is silly, but we'll handle it. */ + if (attachment_list == NULL) { + GSimpleAsyncResult *simple; + + simple = g_simple_async_result_new ( + G_OBJECT (store), callback, user_data, + e_attachment_store_save_list_async); + g_simple_async_result_set_op_res_gboolean (simple, TRUE); + g_simple_async_result_complete_in_idle (simple); + return; + } + + save_context = attachment_store_save_context_new ( + store, attachment_list, callback, user_data); while (attachment_list != NULL) { e_attachment_save_async ( - attachment_list->data, + E_ATTACHMENT (attachment_list->data), destination, (GAsyncReadyCallback) - e_attachment_save_handle_error, parent); + attachment_store_save_list_finished_cb, + save_context); attachment_list = g_list_next (attachment_list); } +} - g_object_unref (destination); +gboolean +e_attachment_store_save_list_finish (EAttachmentStore *store, + GAsyncResult *result, + GError **error) +{ + GSimpleAsyncResult *simple; + gboolean success; -exit: - gtk_widget_destroy (dialog); + g_return_val_if_fail ( + g_simple_async_result_is_valid (result, G_OBJECT (store), + e_attachment_store_save_list_async), FALSE); + + simple = G_SIMPLE_ASYNC_RESULT (result); + success = g_simple_async_result_get_op_res_gboolean (simple); + g_simple_async_result_propagate_error (simple, error); + g_object_unref (simple); + + return success; } diff --git a/widgets/misc/e-attachment-store.h b/widgets/misc/e-attachment-store.h index 88b2823313..c672cb3c34 100644 --- a/widgets/misc/e-attachment-store.h +++ b/widgets/misc/e-attachment-store.h @@ -101,11 +101,23 @@ gint e_attachment_store_run_file_chooser_dialog void e_attachment_store_run_load_dialog (EAttachmentStore *store, GtkWindow *parent); -void e_attachment_store_run_save_dialog +GFile * e_attachment_store_run_save_dialog (EAttachmentStore *store, GList *attachment_list, GtkWindow *parent); +/* Asynchronous Operations */ +void e_attachment_store_save_list_async + (EAttachmentStore *store, + GList *attachment_list, + GFile *destination, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean e_attachment_store_save_list_finish + (EAttachmentStore *store, + GAsyncResult *result, + GError **error); + G_END_DECLS #endif /* E_ATTACHMENT_STORE_H */ diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index e9e546e449..6d6079df21 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -218,12 +218,53 @@ action_remove_cb (GtkAction *action, e_attachment_view_remove_selected (view, FALSE); } +static void +action_save_all_cb (GtkAction *action, + EAttachmentView *view) +{ + EAttachmentStore *store; + GList *selected, *iter; + GFile *destination; + gpointer parent; + + store = e_attachment_view_get_store (view); + + parent = gtk_widget_get_toplevel (GTK_WIDGET (view)); + parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL; + + /* XXX We lose the previous selection. */ + e_attachment_view_select_all (view); + selected = e_attachment_view_get_selected_attachments (view); + e_attachment_view_unselect_all (view); + + destination = e_attachment_store_run_save_dialog ( + store, selected, parent); + + if (destination == NULL) + goto exit; + + for (iter = selected; iter != NULL; iter = iter->next) { + EAttachment *attachment = iter->data; + + e_attachment_save_async ( + attachment, destination, (GAsyncReadyCallback) + e_attachment_save_handle_error, parent); + } + + g_object_unref (destination); + +exit: + g_list_foreach (selected, (GFunc) g_object_unref, NULL); + g_list_free (selected); +} + static void action_save_as_cb (GtkAction *action, EAttachmentView *view) { EAttachmentStore *store; - GList *selected; + GList *selected, *iter; + GFile *destination; gpointer parent; store = e_attachment_view_get_store (view); @@ -232,7 +273,24 @@ action_save_as_cb (GtkAction *action, parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL; selected = e_attachment_view_get_selected_attachments (view); - e_attachment_store_run_save_dialog (store, selected, parent); + + destination = e_attachment_store_run_save_dialog ( + store, selected, parent); + + if (destination == NULL) + goto exit; + + for (iter = selected; iter != NULL; iter = iter->next) { + EAttachment *attachment = iter->data; + + e_attachment_save_async ( + attachment, destination, (GAsyncReadyCallback) + e_attachment_save_handle_error, parent); + } + + g_object_unref (destination); + +exit: g_list_foreach (selected, (GFunc) g_object_unref, NULL); g_list_free (selected); } @@ -274,6 +332,13 @@ static GtkActionEntry standard_entries[] = { NULL, /* XXX Add a tooltip! */ G_CALLBACK (action_drag_move_cb) }, + { "save-all", + GTK_STOCK_SAVE_AS, + N_("S_ave All"), + NULL, + NULL, /* XXX Add a tooltip! */ + G_CALLBACK (action_save_all_cb) }, + { "save-as", GTK_STOCK_SAVE_AS, NULL, @@ -281,6 +346,15 @@ static GtkActionEntry standard_entries[] = { NULL, /* XXX Add a tooltip! */ G_CALLBACK (action_save_as_cb) }, + /* Alternate "save-all" label, for when + * the attachment store has one row. */ + { "save-one", + GTK_STOCK_SAVE_AS, + NULL, + NULL, + NULL, /* XXX Add a tooltip! */ + G_CALLBACK (action_save_all_cb) }, + { "set-background", NULL, N_("Set as _Background"), @@ -807,10 +881,14 @@ e_attachment_view_button_press_event (EAttachmentView *view, GdkEventButton *event) { GtkTreePath *path; + gboolean editable; + gboolean item_clicked; g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), FALSE); g_return_val_if_fail (event != NULL, FALSE); + editable = e_attachment_view_get_editable (view); + /* If the user clicked on a selected item, retain the current * selection. If the user clicked on an unselected item, select * the clicked item only. If the user did not click on an item, @@ -822,8 +900,11 @@ e_attachment_view_button_press_event (EAttachmentView *view, e_attachment_view_select_path (view, path); } gtk_tree_path_free (path); - } else + item_clicked = TRUE; + } else { e_attachment_view_unselect_all (view); + item_clicked = FALSE; + } /* Cancel drag and drop if there are no selected items, * or if any of the selected items are loading or saving. */ @@ -844,8 +925,13 @@ e_attachment_view_button_press_event (EAttachmentView *view, } if (event->button == 3 && event->type == GDK_BUTTON_PRESS) { - e_attachment_view_show_popup_menu (view, event); - return TRUE; + /* Non-editable attachment views should only show a + * popup menu when right-clicking on an attachment, + * but editable views can show the menu any time. */ + if (item_clicked || editable) { + e_attachment_view_show_popup_menu (view, event); + return TRUE; + } } return FALSE; diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index d06e49dc30..52a3d928f6 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -1189,6 +1189,8 @@ e_attachment_is_image (EAttachment *attachment) { GFileInfo *file_info; const gchar *content_type; + gchar *mime_type; + gboolean is_image; g_return_val_if_fail (E_IS_ATTACHMENT (attachment), FALSE); @@ -1200,7 +1202,11 @@ e_attachment_is_image (EAttachment *attachment) if (content_type == NULL) return FALSE; - return g_content_type_is_a (content_type, "image"); + mime_type = g_content_type_get_mime_type (content_type); + is_image = (g_ascii_strncasecmp (mime_type, "image/", 6) == 0); + g_free (mime_type); + + return is_image; } gboolean @@ -1208,6 +1214,8 @@ e_attachment_is_rfc822 (EAttachment *attachment) { GFileInfo *file_info; const gchar *content_type; + gchar *mime_type; + gboolean is_rfc822; g_return_val_if_fail (E_IS_ATTACHMENT (attachment), FALSE); @@ -1219,7 +1227,11 @@ e_attachment_is_rfc822 (EAttachment *attachment) if (content_type == NULL) return FALSE; - return g_content_type_equals (content_type, "message/rfc822"); + mime_type = g_content_type_get_mime_type (content_type); + is_rfc822 = (g_ascii_strcasecmp (mime_type, "message/rfc822") == 0); + g_free (mime_type); + + return is_rfc822; } GList * @@ -1327,7 +1339,7 @@ attachment_load_check_for_error (LoadContext *load_context, if (error == NULL) return FALSE; - /* Steal the reference. */ + /* Steal the result. */ simple = load_context->simple; load_context->simple = NULL; @@ -1359,7 +1371,7 @@ attachment_load_finish (LoadContext *load_context) gpointer data; gsize size; - /* Steal the reference. */ + /* Steal the result. */ simple = load_context->simple; load_context->simple = NULL; @@ -1633,7 +1645,7 @@ attachment_load_from_mime_part (LoadContext *load_context) attachment_set_file_info (attachment, file_info); - /* Steal the reference. */ + /* Steal the result. */ simple = load_context->simple; load_context->simple = NULL; @@ -1839,7 +1851,7 @@ attachment_open_check_for_error (OpenContext *open_context, if (error == NULL) return FALSE; - /* Steal the reference. */ + /* Steal the result. */ simple = open_context->simple; open_context->simple = NULL; @@ -1861,7 +1873,7 @@ attachment_open_file (OpenContext *open_context) gboolean success; GError *error = NULL; - /* Steal the reference. */ + /* Steal the result. */ simple = open_context->simple; open_context->simple = NULL; @@ -2121,7 +2133,7 @@ attachment_save_check_for_error (SaveContext *save_context, if (error == NULL) return FALSE; - /* Steal the reference. */ + /* Steal the result. */ simple = save_context->simple; save_context->simple = NULL; @@ -2248,7 +2260,7 @@ attachment_save_read_cb (GInputStream *input_stream, if (bytes_read == 0) { GSimpleAsyncResult *simple; - /* Steal the reference. */ + /* Steal the result. */ simple = save_context->simple; save_context->simple = NULL; -- cgit v1.2.3