talons

commit dd8cbea0fd06cff4672b7a019b8da01e90caebf8
parent 28e718bfcdf36c295858c150dadd9e82cf80b65e
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Sat, 27 Mar 2010 12:04:59 +0000

2010-03-27 [pawel]	3.7.5cvs41

	* src/compose.c
		Make sure that quote ends with new line char

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

4 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-27 [pawel]	3.7.5cvs41
+
+	* src/compose.c
+		Make sure that quote ends with new line char
+
 2010-03-26 [pawel]	3.7.5cvs40
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3981,3 +3981,4 @@
 ( cvs diff -u -r 1.27.2.46 -r 1.27.2.47 src/addr_compl.c;  cvs diff -u -r 1.382.2.547 -r 1.382.2.548 src/compose.c;  cvs diff -u -r 1.207.2.215 -r 1.207.2.216 src/folderview.c;  cvs diff -u -r 1.14.2.25 -r 1.14.2.26 src/grouplistdialog.c;  cvs diff -u -r 1.8.2.30 -r 1.8.2.31 src/headerview.c;  cvs diff -u -r 1.274.2.308 -r 1.274.2.309 src/mainwindow.c;  cvs diff -u -r 1.83.2.162 -r 1.83.2.163 src/mimeview.c;  cvs diff -u -r 1.105.2.158 -r 1.105.2.159 src/prefs_account.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtkcmoptionmenu.c;  cvs diff -u -r 1.1.4.57 -r 1.1.4.58 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/gtk/gtkshruler.c;  cvs diff -u -r 1.5.2.89 -r 1.5.2.90 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.48 -r 1.4.2.49 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.2.2.37 -r 1.2.2.38 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/spell_entry.c;  cvs diff -u -r 1.14.2.70 -r 1.14.2.71 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/plugins/trayicon/libeggtrayicon/Makefile.am;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c;  ) > 3.7.5cvs38.patchset
 ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/gtkcmclist.c;  ) > 3.7.5cvs39.patchset
 ( cvs diff -u -r 1.382.2.548 -r 1.382.2.549 src/compose.c;  cvs diff -u -r 1.50.2.59 -r 1.50.2.60 src/compose.h;  cvs diff -u -r 1.96.2.222 -r 1.96.2.223 src/textview.c;  ) > 3.7.5cvs40.patchset
+( cvs diff -u -r 1.382.2.549 -r 1.382.2.550 src/compose.c;  ) > 3.7.5cvs41.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -2999,6 +2999,15 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
 
 	gtk_text_buffer_get_start_iter(buffer, &iter);
 	gtk_text_buffer_get_iter_at_offset(buffer, &iter, cursor_pos);
+	
+	/* Some quotes may not end with new line - when replying with
+	 * quote from GtkTextBuffer selection for example. Add new
+	 * line character so cursor is at the beginning of the line */
+	if (!gtk_text_iter_starts_line(&iter)) {
+		gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+		gtk_text_buffer_get_end_iter(buffer, &iter);
+		compose->set_cursor_pos = gtk_text_iter_get_offset(&iter);
+	}
 	gtk_text_buffer_place_cursor(buffer, &iter);
 
 	compose->autowrap = prev_autowrap;