gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix undoing file insertion.

Browse source
This commit is contained in:
Colin Leroy 2013-05-24 20:27:02 +02:00
parent 6b97861793
commit 7e2654802e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/compose.c
View file

@ -3504,6 +3504,7 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
gboolean badtxt = FALSE;
struct stat file_stat;
int ret;
GString *file_contents = NULL;
cm_return_val_if_fail(file != NULL, COMPOSE_INSERT_NO_FILE);
@ -3563,6 +3564,7 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
cur_encoding = conv_get_locale_charset_str_no_utf8();
file_contents = g_string_new("");
while (fgets(buf, sizeof(buf), fp) != NULL) {
gchar *str;
@ -3582,10 +3584,14 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
if (str[len] == '\r') str[len] = '\n';
}
gtk_text_buffer_insert(buffer, &iter, str, -1);
file_contents = g_string_append(file_contents, str);
g_free(str);
}
gtk_text_buffer_insert(buffer, &iter, file_contents->str, -1);
g_string_free(file_contents, TRUE);
compose_changed_cb(NULL, compose);
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
G_CALLBACK(text_inserted),
compose);