2010-06-29 [pawel] 3.7.6cvs12

	* src/compose.c
		Revert 3.7.5cvs41, it breaks templates that use %X

diff --git a/ChangeLog b/ChangeLog
index 01326dbcded9885abe1bb1a90a6bf30b95126956..35361f685e12d445d0babbf76f5f914cf32652a2 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
 2010-06-23 [wwp]       3.7.6cvs11
 
        * src/gtk/colorlabel.c

diff --git a/PATCHSETS b/PATCHSETS
index 5bd8a615c9268b397d1135704cfe9be1af48dc57..9c44e21be8ffa1a0f81ac0cb7d248c111252db2b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4007,3 +4007,4 @@
 ( 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.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

diff --git a/configure.ac b/configure.ac
index e9ab31090a1634dde8fb5a78fbf035978d11190e..7613946b37070befdb11b0f1fd23313a796b127a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=11
+EXTRA_VERSION=12

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 9761ed139188de18f3fce375f184a9ae58d91a2d..0870ee9c5aa7f94fc98e2945ba65b7448005b075 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -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);
 
        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;
        gtk_text_buffer_place_cursor(buffer, &iter);
 
        compose->autowrap = prev_autowrap;