callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix two memory leaks

Browse Source
This commit is contained in:
Milan Crha
2019-04-08 11:12:08 +02:00
parent 2d0116a99c
commit fec7f82ae3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/composer/e-msg-composer.c
View File

@ -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);
}
}

2
src/mail/e-mail-templates.c
View File

@ -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;