[evolution/evolution-3-12] Bug 739060 - Signature added to messages with iCalendar

[Milan Crha <mcrha src gnome org>]

commit 26dfb5daddde49b3d704323e2fff7dd5b1a82be9
Author: Milan Crha <mcrha redhat com>
Date:   Wed Oct 29 12:13:51 2014 +0100

    Bug 739060 - Signature added to messages with iCalendar

 composer/e-composer-private.c |    9 +++++++--
 composer/e-composer-private.h |    1 +
 composer/e-msg-composer.c     |    3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 59e1625..d3b5a74 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -192,6 +192,7 @@ e_composer_private_constructed (EMsgComposer *composer)
        priv->charset = e_composer_get_default_charset ();
 
        priv->is_from_message = FALSE;
+       priv->disable_signature = FALSE;
 
        e_composer_actions_init (composer);
 
@@ -883,6 +884,9 @@ composer_load_signature_cb (EMailSignatureComboBox *combo_box,
                goto exit;
        }
 
+       if (composer->priv->disable_signature)
+               goto exit;
+
        /* "Edit as New Message" sets "priv->is_from_message".
         * Always put the signature at the bottom for that case. */
        top_signature =
@@ -1036,8 +1040,9 @@ e_composer_update_signature (EMsgComposer *composer)
 
        g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 
-       /* Do nothing if we're redirecting a message. */
-       if (composer->priv->redirect)
+       /* Do nothing if we're redirecting a message or we disabled
+        * the signature on purpose */
+       if (composer->priv->redirect || composer->priv->disable_signature)
                return;
 
        table = e_msg_composer_get_header_table (composer);
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index b09e025..5dde038 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -98,6 +98,7 @@ struct _EMsgComposerPrivate {
        CamelMimeMessage *redirect;
 
        gboolean is_from_message;
+       gboolean disable_signature;
 
        gchar *selected_signature_uid;
 };
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 74ca819..f926311 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -4276,6 +4276,9 @@ e_msg_composer_set_body (EMsgComposer *composer,
 
        table = e_msg_composer_get_header_table (composer);
 
+       /* Disable signature */
+       priv->disable_signature = TRUE;
+
        identity_uid = e_composer_header_table_get_identity_uid (table);
        source = e_composer_header_table_ref_source (table, identity_uid);