2010-06-29 [pawel] 3.7.6cvs12
authorPaweł Pękala <c0rn@gazeta.pl>
Tue, 29 Jun 2010 14:42:48 +0000 (14:42 +0000)
committerPaweł Pękala <c0rn@gazeta.pl>
Tue, 29 Jun 2010 14:42:48 +0000 (14:42 +0000)
* src/compose.c
Revert 3.7.5cvs41, it breaks templates that use %X

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index 01326db..35361f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-29 [pawel]     3.7.6cvs12
+
+       * src/compose.c
+               Revert 3.7.5cvs41, it breaks templates that use %X
+
 2010-06-23 [wwp]       3.7.6cvs11
 
        * src/gtk/colorlabel.c
index 5bd8a61..9c44e21 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.395.2.419 -r 1.395.2.420 src/summaryview.c;  cvs diff -u -r 1.68.2.55 -r 1.68.2.56 src/summaryview.h;  ) > 3.7.6cvs9.patchset
 ( cvs diff -u -r 1.1.2.92 -r 1.1.2.93 src/gtk/quicksearch.c;  ) > 3.7.6cvs10.patchset
 ( cvs diff -u -r 1.2.2.28 -r 1.2.2.29 src/gtk/colorlabel.c;  ) > 3.7.6cvs11.patchset
+( cvs diff -u -r 1.382.2.552 -r 1.382.2.553 src/compose.c;  ) > 3.7.6cvs12.patchset
index e9ab310..7613946 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 9761ed1..0870ee9 100644 (file)
@@ -2999,15 +2999,6 @@ 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;