[evolution/webkit-composer] When saving the message as draft save it as HTML.

[Tomas Popela <tpopela src gnome org>]

commit 153fc74410cb226c6a96bd13916738fbf8538424
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Oct 11 14:52:44 2013 +0200

    When saving the message as draft save it as HTML.
    
    And remember in what mode the composer was (save it into message
    headers). When opening the draft again in composer set the right
    composer mode.

 composer/e-msg-composer.c |  166 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 146 insertions(+), 20 deletions(-)
---
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index f41a44c..b1dc761 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -81,7 +81,9 @@ typedef enum {
        COMPOSER_FLAG_PGP_SIGN                  = 1 << 4,
        COMPOSER_FLAG_PGP_ENCRYPT               = 1 << 5,
        COMPOSER_FLAG_SMIME_SIGN                = 1 << 6,
-       COMPOSER_FLAG_SMIME_ENCRYPT             = 1 << 7
+       COMPOSER_FLAG_SMIME_ENCRYPT             = 1 << 7,
+       COMPOSER_FLAG_HTML_MODE                 = 1 << 8,
+       COMPOSER_FLAG_SAVE_DRAFT                = 1 << 9
 } ComposerFlags;
 
 enum {
@@ -131,7 +133,8 @@ static void handle_multipart                (EMsgComposer *composer,
                                                 CamelMultipart *multipart,
                                                 gboolean keep_signature,
                                                 GCancellable *cancellable,
-                                                gint depth);
+                                                gint depth,
+                                                gboolean from_drafts);
 static void    handle_multipart_alternative    (EMsgComposer *composer,
                                                 CamelMultipart *multipart,
                                                 gboolean keep_signature,
@@ -1047,6 +1050,25 @@ composer_build_message_thread (GSimpleAsyncResult *simple,
 }
 
 static void
+composer_add_evolution_composer_mode_header (CamelMedium *medium,
+                                             ComposerFlags flags)
+{
+       GString *string;
+
+       string = g_string_sized_new (128);
+
+       if (flags & COMPOSER_FLAG_HTML_MODE)
+               g_string_append (string, "text/html");
+       else
+               g_string_append (string, "text/plain");
+
+       camel_medium_add_header (
+               medium, "X-Evolution-Composer-Mode", string->str);
+
+       g_string_free (string, TRUE);
+}
+
+static void
 composer_add_evolution_format_header (CamelMedium *medium,
                                       ComposerFlags flags)
 {
@@ -1212,6 +1234,41 @@ composer_build_message (EMsgComposer *composer,
        composer_add_evolution_format_header (
                CAMEL_MEDIUM (context->message), flags);
 
+       /* X-Evolution-Composer-Mode */
+       composer_add_evolution_composer_mode_header (
+               CAMEL_MEDIUM (context->message), flags);
+
+       if (flags & COMPOSER_FLAG_SAVE_DRAFT) {
+               gchar *text;
+               EEditor *editor;
+               EEditorWidget *editor_widget;
+               EEditorSelection *selection;
+
+               editor = e_msg_composer_get_editor (composer);
+               editor_widget = e_editor_get_editor_widget (editor);
+               selection = e_editor_widget_get_selection (editor_widget);
+
+               data = g_byte_array_new ();
+
+               e_editor_widget_embed_styles (editor_widget);
+               e_editor_selection_save_caret_position (selection);
+
+               text = e_editor_widget_get_text_html (editor_widget);
+
+               e_editor_widget_remove_embed_styles (editor_widget);
+               e_editor_selection_restore_caret_position (selection);
+
+               g_byte_array_append (data, (guint8 *) text, strlen (text));
+
+               g_free (text);
+
+               type = camel_content_type_new ("text", "html");
+               camel_content_type_set_param (type, "charset", "utf-8");
+               iconv_charset = camel_iconv_charset_name ("utf-8");
+
+               goto wrap_drafts_html;
+       }
+
        /* Build the text/plain part. */
 
        if (priv->mime_body) {
@@ -1257,6 +1314,7 @@ composer_build_message (EMsgComposer *composer,
                }
        }
 
+ wrap_drafts_html:
        mem_stream = camel_stream_mem_new_with_byte_array (data);
        stream = camel_stream_filter_new (mem_stream);
        g_object_unref (mem_stream);
@@ -1303,7 +1361,8 @@ composer_build_message (EMsgComposer *composer,
         *        ...
         */
 
-       if (flags & COMPOSER_FLAG_HTML_CONTENT) {
+       if ((flags & COMPOSER_FLAG_HTML_CONTENT) != 0 &&
+           !(flags & COMPOSER_FLAG_SAVE_DRAFT)) {
                gchar *text;
                gsize length;
                gboolean pre_encode;
@@ -1754,9 +1813,11 @@ msg_composer_drag_data_received_cb (GtkWidget *widget,
        EAttachmentView *view;
        EEditor *editor;
        EEditorWidget *editor_widget;
+       EEditorSelection *editor_selection;
 
        editor = e_msg_composer_get_editor (composer);
        editor_widget = e_editor_get_editor_widget (editor);
+       editor_selection = e_editor_widget_get_selection (editor_widget);
 
        /* HTML mode has a few special cases for drops... */
        if (e_editor_widget_get_html_mode (editor_widget)) {
@@ -2687,7 +2748,7 @@ handle_multipart_signed (EMsgComposer *composer,
                } else {
                        /* There must be attachments... */
                        handle_multipart (
-                               composer, multipart, keep_signature, cancellable, depth);
+                               composer, multipart, keep_signature, cancellable, depth, FALSE);
                }
 
        } else if (camel_content_type_is (content_type, "text", "*")) {
@@ -2778,7 +2839,7 @@ handle_multipart_encrypted (EMsgComposer *composer,
                } else {
                        /* There must be attachments... */
                        handle_multipart (
-                               composer, content_multipart, keep_signature, cancellable, depth);
+                               composer, content_multipart, keep_signature, cancellable, depth, FALSE);
                }
 
        } else if (camel_content_type_is (content_type, "text", "*")) {
@@ -2844,7 +2905,7 @@ handle_multipart_alternative (EMsgComposer *composer,
                                /* Depth doesn't matter so long as we
                                 * don't pass 0. */
                                handle_multipart (
-                                       composer, mp, keep_signature, cancellable, depth + 1);
+                                       composer, mp, keep_signature, cancellable, depth + 1, FALSE);
                        }
 
                } else if (camel_content_type_is (content_type, "text", "html")) {
@@ -2876,7 +2937,8 @@ handle_multipart (EMsgComposer *composer,
                   CamelMultipart *multipart,
                   gboolean keep_signature,
                   GCancellable *cancellable,
-                  gint depth)
+                  gint depth,
+                 gboolean from_drafts)
 {
        gint i, nparts;
 
@@ -2922,7 +2984,7 @@ handle_multipart (EMsgComposer *composer,
                                /* Depth doesn't matter so long as we
                                 * don't pass 0. */
                                handle_multipart (
-                                       composer, mp, keep_signature, cancellable, depth + 1);
+                                       composer, mp, keep_signature, cancellable, depth + 1, from_drafts);
                        }
 
                } else if (depth == 0 && i == 0) {
@@ -2931,8 +2993,30 @@ handle_multipart (EMsgComposer *composer,
 
                        /* Since the first part is not multipart/alternative,
                         * this must be the body. */
-                       html = emcu_part_to_html (
-                               composer, mime_part, &length, keep_signature, cancellable);
+
+                       /* If we are opening message from Drafts */
+                       if (from_drafts) {
+                               /* Extract the body */
+                               CamelDataWrapper *dw;
+
+                               dw = camel_medium_get_content ((CamelMedium *) mime_part);
+                               if (dw) {
+                                       CamelStream *mem = camel_stream_mem_new ();
+                                       GByteArray *bytes;
+
+                                       camel_data_wrapper_decode_to_stream_sync (dw, mem, cancellable, NULL);
+                                       camel_stream_close (mem, cancellable, NULL);
+
+                                       bytes = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (mem));
+                                       if (bytes && bytes->len)
+                                               html = g_strndup ((const gchar *) bytes->data, bytes->len);
+
+                                       g_object_unref (mem);
+                               }
+                       } else {
+                               html = emcu_part_to_html (
+                                       composer, mime_part, &length, keep_signature, cancellable);
+                       }
                        e_msg_composer_set_pending_body (composer, html, length);
 
                } else if (camel_mime_part_get_content_id (mime_part) ||
@@ -3060,7 +3144,7 @@ e_msg_composer_new_with_message (EShell *shell,
 {
        CamelInternetAddress *to, *cc, *bcc;
        GList *To = NULL, *Cc = NULL, *Bcc = NULL, *postto = NULL;
-       const gchar *format, *subject;
+       const gchar *format, *subject, *composer_mode;
        EDestination **Tov, **Ccv, **Bccv;
        GHashTable *auto_cc, *auto_bcc;
        CamelContentType *content_type;
@@ -3076,6 +3160,7 @@ e_msg_composer_new_with_message (EShell *shell,
        struct _camel_header_raw *xev;
        gchar *identity_uid;
        gint len, i;
+       gboolean from_drafts = FALSE;
 
        g_return_val_if_fail (E_IS_SHELL (shell), NULL);
 
@@ -3220,6 +3305,13 @@ e_msg_composer_new_with_message (EShell *shell,
        /* Restore the format editing preference */
        format = camel_medium_get_header (
                CAMEL_MEDIUM (message), "X-Evolution-Format");
+
+       composer_mode = camel_medium_get_header (
+               CAMEL_MEDIUM (message), "X-Evolution-Composer-Mode");
+
+       if (composer_mode && *composer_mode)
+               from_drafts = TRUE;
+
        if (format != NULL) {
                gchar **flags;
 
@@ -3229,11 +3321,21 @@ e_msg_composer_new_with_message (EShell *shell,
                flags = g_strsplit (format, ", ", 0);
                for (i = 0; flags[i]; i++) {
                        if (g_ascii_strcasecmp (flags[i], "text/html") == 0) {
-                               e_editor_widget_set_html_mode (
-                                       editor_widget, TRUE);
+                               if (g_ascii_strcasecmp (composer_mode, "text/html") == 0) {
+                                       e_editor_widget_set_html_mode (
+                                               editor_widget, TRUE);
+                               } else {
+                                       e_editor_widget_set_html_mode (
+                                               editor_widget, FALSE);
+                               }
                        } else if (g_ascii_strcasecmp (flags[i], "text/plain") == 0) {
-                               e_editor_widget_set_html_mode (
-                                       editor_widget, FALSE);
+                               if (g_ascii_strcasecmp (composer_mode, "text/html") == 0) {
+                                       e_editor_widget_set_html_mode (
+                                               editor_widget, TRUE);
+                               } else {
+                                       e_editor_widget_set_html_mode (
+                                               editor_widget, FALSE);
+                               }
                        } else if (g_ascii_strcasecmp (flags[i], "pgp-sign") == 0) {
                                action = GTK_TOGGLE_ACTION (ACTION (PGP_SIGN));
                                gtk_toggle_action_set_active (action, TRUE);
@@ -3316,7 +3418,7 @@ e_msg_composer_new_with_message (EShell *shell,
                } else {
                        /* There must be attachments... */
                        handle_multipart (
-                               composer, multipart, keep_signature, cancellable, 0);
+                               composer, multipart, keep_signature, cancellable, 0, from_drafts);
                }
        } else {
                CamelMimePart *mime_part;
@@ -3337,9 +3439,30 @@ e_msg_composer_new_with_message (EShell *shell,
                                ACTION (SMIME_ENCRYPT)), TRUE);
                }
 
-               html = emcu_part_to_html (
-                       composer, CAMEL_MIME_PART (message),
-                       &length, keep_signature, cancellable);
+               /* If we are opening message from Drafts */
+               if (from_drafts) {
+                       /* Extract the body */
+                       CamelDataWrapper *dw;
+
+                       dw = camel_medium_get_content ((CamelMedium *) mime_part);
+                       if (dw) {
+                               CamelStream *mem = camel_stream_mem_new ();
+                               GByteArray *bytes;
+
+                               camel_data_wrapper_decode_to_stream_sync (dw, mem, cancellable, NULL);
+                               camel_stream_close (mem, cancellable, NULL);
+
+                               bytes = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (mem));
+                               if (bytes && bytes->len)
+                                       html = g_strndup ((const gchar *) bytes->data, bytes->len);
+
+                               g_object_unref (mem);
+                       }
+               } else {
+                       html = emcu_part_to_html (
+                               composer, CAMEL_MIME_PART (message),
+                               &length, keep_signature, cancellable);
+               }
                e_msg_composer_set_pending_body (composer, html, length);
        }
 
@@ -4677,8 +4800,11 @@ e_msg_composer_get_message_draft (EMsgComposer *composer,
 
        editor = e_msg_composer_get_editor (composer);
        editor_widget = e_editor_get_editor_widget (editor);
+       /* We need to remember composer mode */
        if (e_editor_widget_get_html_mode (editor_widget))
-               flags |= COMPOSER_FLAG_HTML_CONTENT;
+               flags |= COMPOSER_FLAG_HTML_MODE;
+       /* We want to save HTML content everytime when we save as draft */
+       flags |= COMPOSER_FLAG_SAVE_DRAFT;
 
        composer_build_message (
                composer, flags, io_priority,