[evolution/gnome-3-32] Fix two memory leaks

[Milan Crha <mcrha src gnome org>]

commit 8c9a7bdf9aab0b76e0cc4b8775694388e2a7521b
Author: Milan Crha <mcrha redhat com>
Date:   Mon Apr 8 11:12:08 2019 +0200

    Fix two memory leaks

 src/composer/e-msg-composer.c | 6 ++++--
 src/mail/e-mail-templates.c   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/composer/e-msg-composer.c b/src/composer/e-msg-composer.c
index eedc538251..6128c32724 100644
--- a/src/composer/e-msg-composer.c
+++ b/src/composer/e-msg-composer.c
@@ -3607,7 +3607,7 @@ set_signature_gui (EMsgComposer *composer)
        EContentEditor *cnt_editor;
        EComposerHeaderTable *table;
        EMailSignatureComboBox *combo_box;
-       gchar *uid = NULL;
+       gchar *uid;
 
        table = e_msg_composer_get_header_table (composer);
        combo_box = e_composer_header_table_get_signature_combo_box (table);
@@ -3615,9 +3615,11 @@ set_signature_gui (EMsgComposer *composer)
        editor = e_msg_composer_get_editor (composer);
        cnt_editor = e_html_editor_get_content_editor (editor);
 
-       if ((uid = e_content_editor_get_current_signature_uid (cnt_editor))) {
+       uid = e_content_editor_get_current_signature_uid (cnt_editor);
+       if (uid) {
                /* The combo box active ID is the signature's ESource UID. */
                gtk_combo_box_set_active_id (GTK_COMBO_BOX (combo_box), uid);
+               g_free (uid);
        }
 }
 
diff --git a/src/mail/e-mail-templates.c b/src/mail/e-mail-templates.c
index ad3777962e..fd46b09bf0 100644
--- a/src/mail/e-mail-templates.c
+++ b/src/mail/e-mail-templates.c
@@ -512,7 +512,7 @@ e_mail_templates_apply_sync (CamelMimeMessage *source_message,
        /* Add the headers from the message we are replying to, so CC and that
         * stuff is preserved. Also replace any $ORIG[header-name] modifiers ignoring
         * 'content-*' headers */
-       headers = camel_medium_dup_headers (CAMEL_MEDIUM (source_message));
+       headers = camel_medium_get_headers (CAMEL_MEDIUM (source_message));
        len = camel_name_value_array_get_length (headers);
        for (ii = 0; ii < len; ii++) {
                const gchar *header_name = NULL, *header_value = NULL;