From 66a6b52840684165e668cf79f4a87adf444e0fb2 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 10 Sep 2005 19:08:41 +0000 Subject: [PATCH] 2005-09-10 [colin] 1.9.14cvs16 * src/compose.c Fix bug #572 (%X option does not work with templates) --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 9 ++++++++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 3a3802be5..9365b258f 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2005-09-10 [colin] 1.9.14cvs16 + + * src/compose.c + Fix bug #572 (%X option does not work with templates) + 2005-09-10 [colin] 1.9.14cvs15 * src/toolbar.c diff --git a/PATCHSETS b/PATCHSETS index 545531beb..7e84c0e3d 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -784,3 +784,4 @@ ( cvs diff -u -r 1.179.2.68 -r 1.179.2.69 src/imap.c; cvs diff -u -r 1.274.2.63 -r 1.274.2.64 src/mainwindow.c; cvs diff -u -r 1.39.2.5 -r 1.39.2.6 src/mainwindow.h; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/prefs_spelling.c; cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/etpan/imap-thread.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/etpan/imap-thread.h; cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/gtk/prefswindow.c; ) > 1.9.14cvs13.patchset ( cvs diff -u -r 1.179.2.69 -r 1.179.2.70 src/imap.c; ) > 1.9.14cvs14.patchset ( cvs diff -u -r 1.43.2.24 -r 1.43.2.25 src/toolbar.c; ) > 1.9.14cvs15.patchset +( cvs diff -u -r 1.382.2.163 -r 1.382.2.164 src/compose.c; ) > 1.9.14cvs16.patchset diff --git a/configure.ac b/configure.ac index b7d57c82f..8c232ed3d 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=14 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=15 +EXTRA_VERSION=16 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index c6c78b03c..344c1f9a6 100644 --- a/src/compose.c +++ b/src/compose.c @@ -5561,7 +5561,7 @@ static void compose_template_apply(Compose *compose, Template *tmpl, GtkTextIter iter; gchar *qmark; gchar *parsed_str; - + gint cursor_pos = 0; if (!tmpl || !tmpl->value) return; text = GTK_TEXT_VIEW(compose->text); @@ -5610,6 +5610,13 @@ static void compose_template_apply(Compose *compose, Template *tmpl, gtk_text_buffer_get_start_iter(buffer, &iter); gtk_text_buffer_place_cursor(buffer, &iter); } + + if (parsed_str) { + cursor_pos = quote_fmt_get_cursor_pos(); + gtk_text_buffer_get_start_iter(buffer, &iter); + gtk_text_buffer_get_iter_at_offset(buffer, &iter, cursor_pos); + gtk_text_buffer_place_cursor(buffer, &iter); + } if (parsed_str) compose_changed_cb(NULL, compose); -- 2.25.1