Properly use the account protocol api to fetch streams from attachments

in msg view.

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index f81ce01..912cdcf 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -2667,7 +2667,11 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window,
                                                               &filepath);
 
                if (temp_stream != NULL) {
                                                               &filepath);
 
                if (temp_stream != NULL) {

+                       ModestAccountMgr *mgr;

                        DecodeAsyncHelper *helper;
                        DecodeAsyncHelper *helper;

+                       gboolean decode_in_provider;
+                       ModestProtocol *protocol;
+                       const gchar *account; 

 
                        /* Activate progress hint */
                        set_progress_hint (window, TRUE);
 
                        /* Activate progress hint */
                        set_progress_hint (window, TRUE);

@@ -2676,10 +2680,27 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window,
                        helper->self = g_object_ref (window);
                        helper->file_path = g_strdup (filepath);
 
                        helper->self = g_object_ref (window);
                        helper->file_path = g_strdup (filepath);
 

-                       tny_mime_part_decode_to_stream_async (mime_part, TNY_STREAM (temp_stream),
-                                                             on_decode_to_stream_async_handler,
-                                                             NULL,
-                                                             helper);
+                       decode_in_provider = FALSE;
+                       mgr = modest_runtime_get_account_mgr ();
+                       account = modest_window_get_active_account (MODEST_WINDOW (window));
+                       if (modest_account_mgr_account_is_multimailbox (mgr, account, &protocol)) {
+                               if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) {
+                                       decode_in_provider = 
+                                               modest_account_protocol_decode_part_to_stream_async (
+                                                       MODEST_ACCOUNT_PROTOCOL (protocol),
+                                                       mime_part, 
+                                                       TNY_STREAM (temp_stream),
+                                                       on_decode_to_stream_async_handler,
+                                                       NULL,
+                                                       helper);
+                               }
+                       }
+
+                       if (!decode_in_provider)
+                               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);
                        /* NOTE: files in the temporary area will be automatically
                         * cleaned after some time if they are no longer in use */
                        g_object_unref (temp_stream);
                        /* NOTE: files in the temporary area will be automatically
                         * cleaned after some time if they are no longer in use */

@@ -2786,6 +2807,7 @@ typedef struct
        GList *pairs;
        GnomeVFSResult result;
        gchar *uri;
        GList *pairs;
        GnomeVFSResult result;
        gchar *uri;

+       ModestMsgViewWindow *window;

 } SaveMimePartInfo;
 
 static void save_mime_part_info_free (SaveMimePartInfo *info, gboolean with_struct);
 } SaveMimePartInfo;
 
 static void save_mime_part_info_free (SaveMimePartInfo *info, gboolean with_struct);

@@ -2807,6 +2829,8 @@ save_mime_part_info_free (SaveMimePartInfo *info, gboolean with_struct)
        g_list_free (info->pairs);
        info->pairs = NULL;
        g_free (info->uri);
        g_list_free (info->pairs);
        info->pairs = NULL;
        g_free (info->uri);

+       g_object_unref (info->window);
+       info->window = NULL;

        if (with_struct) {
                g_slice_free (SaveMimePartInfo, info);
        }
        if (with_struct) {
                g_slice_free (SaveMimePartInfo, info);
        }

@@ -2850,8 +2874,32 @@ 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;
        info->result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0644);
        if (info->result == GNOME_VFS_OK) {
                GError *error = NULL;

+               gboolean decode_in_provider;
+               gssize written;
+               ModestAccountMgr *mgr;
+               const gchar *account;
+               ModestProtocol *protocol = NULL;
+

                stream = tny_vfs_stream_new (handle);
                stream = tny_vfs_stream_new (handle);

-               if (tny_mime_part_decode_to_stream (pair->part, stream, &error) < 0) {
+
+               decode_in_provider = FALSE;
+               mgr = modest_runtime_get_account_mgr ();
+               account = modest_window_get_active_account (MODEST_WINDOW (info->window));
+               if (modest_account_mgr_account_is_multimailbox (mgr, account, &protocol)) {
+                       if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) {
+                               decode_in_provider = 
+                                       modest_account_protocol_decode_part_to_stream (
+                                               MODEST_ACCOUNT_PROTOCOL (protocol),
+                                               pair->part,
+                                               stream,
+                                               &written,
+                                               &error);
+                       }
+               }
+               if (!decode_in_provider)
+                       written = tny_mime_part_decode_to_stream (pair->part, stream, &error);
+
+               if (written < 0) {

                        g_warning ("modest: could not save attachment %s: %d (%s)\n", pair->filename, error?error->code:-1, error?error->message:"Unknown error");
 
                        if ((error->domain == TNY_ERROR_DOMAIN) && 
                        g_warning ("modest: could not save attachment %s: %d (%s)\n", pair->filename, error?error->code:-1, error?error->message:"Unknown error");
 
                        if ((error->domain == TNY_ERROR_DOMAIN) && 

@@ -2930,6 +2978,11 @@ save_mime_parts_to_file_with_checks (GtkWindow *parent,
 
 }
 
 
 }
 

+typedef struct _SaveAttachmentsInfo {
+       TnyList *attachments_list;
+       ModestMsgViewWindow *window;
+} SaveAttachmentsInfo;
+

 static void
 save_attachments_response (GtkDialog *dialog,
                           gint       arg1,
 static void
 save_attachments_response (GtkDialog *dialog,
                           gint       arg1,

@@ -2939,8 +2992,9 @@ save_attachments_response (GtkDialog *dialog,
        gchar *chooser_uri;
        GList *files_to_save = NULL;
        gchar *current_folder;
        gchar *chooser_uri;
        GList *files_to_save = NULL;
        gchar *current_folder;

+       SaveAttachmentsInfo *sa_info = (SaveAttachmentsInfo *) user_data;

 
 

-       mime_parts = TNY_LIST (user_data);
+       mime_parts = TNY_LIST (sa_info->attachments_list);

 
        if (arg1 != GTK_RESPONSE_OK)
                goto end;
 
        if (arg1 != GTK_RESPONSE_OK)
                goto end;

@@ -3006,6 +3060,7 @@ save_attachments_response (GtkDialog *dialog,
                info->pairs = files_to_save;
                info->result = TRUE;
                info->uri = g_strdup (chooser_uri);
                info->pairs = files_to_save;
                info->result = TRUE;
                info->uri = g_strdup (chooser_uri);

+               info->window = g_object_ref (sa_info->window);

                save_mime_parts_to_file_with_checks ((GtkWindow *) dialog, info);
        }
        g_free (chooser_uri);
                save_mime_parts_to_file_with_checks ((GtkWindow *) dialog, info);
        }
        g_free (chooser_uri);

@@ -3013,6 +3068,8 @@ save_attachments_response (GtkDialog *dialog,
  end:
        /* Free and close the dialog */
        g_object_unref (mime_parts);
  end:
        /* Free and close the dialog */
        g_object_unref (mime_parts);

+       g_object_unref (sa_info->window);
+       g_slice_free (SaveAttachmentsInfo, sa_info);

        gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
        gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 

@@ -3120,8 +3177,12 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window,
        /* We must run this asynchronously, because the hildon dialog
           performs a gtk_dialog_run by itself which leads to gdk
           deadlocks */
        /* We must run this asynchronously, because the hildon dialog
           performs a gtk_dialog_run by itself which leads to gdk
           deadlocks */

+       SaveAttachmentsInfo *sa_info;
+       sa_info = g_slice_new (SaveAttachmentsInfo);
+       sa_info->attachments_list = mime_parts;
+       sa_info->window = g_object_ref (window);

        g_signal_connect (save_dialog, "response", 
        g_signal_connect (save_dialog, "response", 

-                         G_CALLBACK (save_attachments_response), mime_parts);
+                         G_CALLBACK (save_attachments_response), sa_info);

 
        gtk_widget_show_all (save_dialog);
 }
 
        gtk_widget_show_all (save_dialog);
 }

diff --git a/src/modest-account-protocol.c b/src/modest-account-protocol.c
index ef7d1b7..bc1e00f 100644 (file)
--- a/src/modest-account-protocol.c
+++ b/src/modest-account-protocol.c
@@ -94,7 +94,8 @@ static void modest_account_protocol_wizard_finished_default (ModestAccountProtoc
 static gboolean modest_account_protocol_decode_part_to_stream_default (ModestAccountProtocol *protocol,
                                                                       TnyMimePart *part,
                                                                       TnyStream *stream,
 static gboolean modest_account_protocol_decode_part_to_stream_default (ModestAccountProtocol *protocol,
                                                                       TnyMimePart *part,
                                                                       TnyStream *stream,

-                                                                      GError *error);
+                                                                      gssize *written,
+                                                                      GError **error);

 static gboolean modest_account_protocol_decode_part_to_stream_async_default (ModestAccountProtocol *protocol,
                                                                             TnyMimePart *self, 
                                                                             TnyStream *stream, 
 static gboolean modest_account_protocol_decode_part_to_stream_async_default (ModestAccountProtocol *protocol,
                                                                             TnyMimePart *self, 
                                                                             TnyStream *stream, 

@@ -705,7 +706,8 @@ static gboolean
 modest_account_protocol_decode_part_to_stream_default (ModestAccountProtocol *self,
                                                       TnyMimePart *part,
                                                       TnyStream *stream,
 modest_account_protocol_decode_part_to_stream_default (ModestAccountProtocol *self,
                                                       TnyMimePart *part,
                                                       TnyStream *stream,

-                                                      GError *error)
+                                                      gssize *written,
+                                                      GError **error)

 {
        /* By default account protocols do not handle themselves the transfer */
        return FALSE;
 {
        /* By default account protocols do not handle themselves the transfer */
        return FALSE;

@@ -715,11 +717,13 @@ gboolean
 modest_account_protocol_decode_part_to_stream (ModestAccountProtocol *self,
                                               TnyMimePart *part,
                                               TnyStream *stream,
 modest_account_protocol_decode_part_to_stream (ModestAccountProtocol *self,
                                               TnyMimePart *part,
                                               TnyStream *stream,

-                                              GError *error)
+                                              gssize *written,
+                                              GError **error)

 {
        return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->decode_part_to_stream (self,
                                                                                part,
                                                                                stream,
 {
        return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->decode_part_to_stream (self,
                                                                                part,
                                                                                stream,

+                                                                               written,

                                                                                error);
 }
 
                                                                                error);
 }
 

diff --git a/src/modest-account-protocol.h b/src/modest-account-protocol.h
index f59f538..9936d83 100644 (file)
--- a/src/modest-account-protocol.h
+++ b/src/modest-account-protocol.h
@@ -103,7 +103,8 @@ struct _ModestAccountProtocolClass {
        gboolean (*decode_part_to_stream) (ModestAccountProtocol *protocol,
                                           TnyMimePart *part,
                                           TnyStream *stream,
        gboolean (*decode_part_to_stream) (ModestAccountProtocol *protocol,
                                           TnyMimePart *part,
                                           TnyStream *stream,

-                                          GError *error);
+                                          gssize *written,
+                                          GError **error);

        gboolean (*decode_part_to_stream_async) (ModestAccountProtocol *protocol,
                                                 TnyMimePart *part, 
                                                 TnyStream *stream, 
        gboolean (*decode_part_to_stream_async) (ModestAccountProtocol *protocol,
                                                 TnyMimePart *part, 
                                                 TnyStream *stream, 

@@ -495,6 +496,7 @@ void modest_account_protocol_save_remote_draft (ModestAccountProtocol *self,
  * @self: a #ModestAccountProtocol
  * @part: a #TnyMimePart
  * @stream: a #TnyStream
  * @self: a #ModestAccountProtocol
  * @part: a #TnyMimePart
  * @stream: a #TnyStream

+ * @written: a #gssize pointer, with the number of bytes written

  * @error: a #GError
  *
  * This virtual method delegates on the account protocol to decode @part
  * @error: a #GError
  *
  * This virtual method delegates on the account protocol to decode @part

@@ -509,14 +511,14 @@ gboolean
 modest_account_protocol_decode_part_to_stream (ModestAccountProtocol *protocol,
                                                TnyMimePart *part,
                                                TnyStream *stream,
 modest_account_protocol_decode_part_to_stream (ModestAccountProtocol *protocol,
                                                TnyMimePart *part,
                                                TnyStream *stream,

-                                               GError *error);
+                                              gssize *written,
+                                               GError **error);

 
 /**
  * modest_account_protocol_decode_part_to_stream_async:
  * @self: a #ModestAccountProtocol
  * @part: a #TnyMimePart
  * @stream: a #TnyStream
 
 /**
  * modest_account_protocol_decode_part_to_stream_async:
  * @self: a #ModestAccountProtocol
  * @part: a #TnyMimePart
  * @stream: a #TnyStream

- * @error: a #GError

  *
  * This virtual method delegates on the account protocol to decode @part
  * into @stream, but asynchronously.
  *
  * This virtual method delegates on the account protocol to decode @part
  * into @stream, but asynchronously.