[evolution/wip/webkit-composer: 926/966] EComposerPrivate: Move is_from_draft variable to private

[Tomas Popela <tpopela src gnome org>]

commit de2987fdadba06eec6fd6e3f36c9b0eacb2074d9
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Mar 20 09:09:04 2014 +0100

    EComposerPrivate: Move is_from_draft variable to private

 composer/e-composer-private.c |    1 +
 composer/e-composer-private.h |    1 +
 composer/e-msg-composer.c     |   23 ++++++++++-------------
 3 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 39733f8..2fcd2c2 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -131,6 +131,7 @@ e_composer_private_constructed (EMsgComposer *composer)
 
        priv->charset = e_composer_get_default_charset ();
 
+       priv->is_from_draft = FALSE;
        priv->is_from_message = FALSE;
        priv->is_from_new_message = FALSE;
        priv->set_signature_from_message = FALSE;
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index b2d1ea7..89c4fd7 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -92,6 +92,7 @@ struct _EMsgComposerPrivate {
 
        CamelMimeMessage *redirect;
 
+       gboolean is_from_draft;
        gboolean is_from_message;
        gboolean is_from_new_message;
        gboolean set_signature_from_message;
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 6392cea..75629aa 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -132,8 +132,7 @@ static void handle_multipart                (EMsgComposer *composer,
                                                 CamelMultipart *multipart,
                                                 gboolean keep_signature,
                                                 GCancellable *cancellable,
-                                                gint depth,
-                                                gboolean from_drafts);
+                                                gint depth);
 static void    handle_multipart_alternative    (EMsgComposer *composer,
                                                 CamelMultipart *multipart,
                                                 gboolean keep_signature,
@@ -2670,7 +2669,7 @@ handle_multipart_signed (EMsgComposer *composer,
                } else {
                        /* There must be attachments... */
                        handle_multipart (
-                               composer, multipart, keep_signature, cancellable, depth, FALSE);
+                               composer, multipart, keep_signature, cancellable, depth);
                }
 
        } else if (camel_content_type_is (content_type, "text", "*")) {
@@ -2762,7 +2761,7 @@ handle_multipart_encrypted (EMsgComposer *composer,
                } else {
                        /* There must be attachments... */
                        handle_multipart (
-                               composer, content_multipart, keep_signature, cancellable, depth, FALSE);
+                               composer, content_multipart, keep_signature, cancellable, depth);
                }
 
        } else if (camel_content_type_is (content_type, "text", "*")) {
@@ -2829,7 +2828,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, FALSE);
+                                       composer, mp, keep_signature, cancellable, depth + 1);
                        }
 
                } else if (camel_content_type_is (content_type, "text", "html")) {
@@ -2870,8 +2869,7 @@ handle_multipart (EMsgComposer *composer,
                   CamelMultipart *multipart,
                   gboolean keep_signature,
                   GCancellable *cancellable,
-                  gint depth,
-                 gboolean from_drafts)
+                  gint depth)
 {
        gint i, nparts;
 
@@ -2917,7 +2915,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, from_drafts);
+                                       composer, mp, keep_signature, cancellable, depth + 1);
                        }
 
                } else if (depth == 0 && i == 0) {
@@ -2928,7 +2926,7 @@ handle_multipart (EMsgComposer *composer,
                         * this must be the body. */
 
                        /* If we are opening message from Drafts */
-                       if (from_drafts) {
+                       if (composer->priv->is_from_draft) {
                                /* Extract the body */
                                CamelDataWrapper *dw;
 
@@ -3096,7 +3094,6 @@ 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);
 
@@ -3240,7 +3237,7 @@ e_msg_composer_new_with_message (EShell *shell,
                CAMEL_MEDIUM (message), "X-Evolution-Composer-Mode");
 
        if (composer_mode && *composer_mode)
-               from_drafts = TRUE;
+               composer->priv->is_from_draft = TRUE;
 
        if (format != NULL) {
                gchar **flags;
@@ -3348,7 +3345,7 @@ e_msg_composer_new_with_message (EShell *shell,
                } else {
                        /* There must be attachments... */
                        handle_multipart (
-                               composer, multipart, keep_signature, cancellable, 0, from_drafts);
+                               composer, multipart, keep_signature, cancellable, 0);
                }
        } else {
                CamelMimePart *mime_part;
@@ -3370,7 +3367,7 @@ e_msg_composer_new_with_message (EShell *shell,
                }
 
                /* If we are opening message from Drafts */
-               if (from_drafts) {
+               if (composer->priv->is_from_draft) {
                        /* Extract the body */
                        CamelDataWrapper *dw;