talons

commit e07d935e44bf97a6c544d40d4fbaca175ac0c457
parent 596af450350744b4abfbf7e26e76306808988dfd
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 22 Jun 2008 08:11:04 +0000

2008-06-22 [colin]	3.4.0cvs104

	* src/compose.c
		Fix initial cursor pos

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
6
+++---

4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-22 [colin]	3.4.0cvs104
+
+	* src/compose.c
+		Fix initial cursor pos
+
 2008-06-21 [paul]	3.4.0cvs103
 
 	* manual/plugins.xml
diff --git a/PATCHSETS b/PATCHSETS
@@ -3399,3 +3399,4 @@
 ( cvs diff -u -r 1.1.2.50 -r 1.1.2.51 manual/advanced.xml;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 manual/es/advanced.xml;  cvs diff -u -r 1.4.2.62 -r 1.4.2.63 src/gtk/about.c;  ) > 3.4.0cvs101.patchset
 ( cvs diff -u -r 1.4.2.63 -r 1.4.2.64 src/gtk/about.c;  ) > 3.4.0cvs102.patchset
 ( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 manual/plugins.xml;  ) > 3.4.0cvs103.patchset
+( cvs diff -u -r 1.382.2.454 -r 1.382.2.455 src/compose.c;  ) > 3.4.0cvs104.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=103
+EXTRA_VERSION=104
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -2923,10 +2923,10 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
 	}
 
 	cursor_pos = quote_fmt_get_cursor_pos();
+	if (cursor_pos == -1)
+		cursor_pos = gtk_text_iter_get_offset(&iter);
 	compose->set_cursor_pos = cursor_pos;
-	if (cursor_pos == -1) {
-		cursor_pos = 0;
-	}
+
 	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);