2005-03-31 [colin] 1.9.6cvs17

	* src/compose.c
		Fix joining of signature separator again.
		Maybe Hiro could put it in main too...

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 6d360048df5797682b0f1444f7f6478c09534c5b..8d94ca8b371417cf71a43aac5489168683005470 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-03-31 [colin]     1.9.6cvs17
+
+       * src/compose.c
+               Fix joining of signature separator again. 
+               Maybe Hiro could put it in main too...
+
 2005-03-31 [colin]     1.9.6cvs16
 
        * src/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index f89b41d800d7812b5dba06b234af0c522ab8962d..24449433020d263ba4d2a29871fe44275b9d1cb7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -433,3 +433,4 @@
 ( cvs diff -u -r 1.20.2.14 -r 1.20.2.15 src/common/utils.h; cvs diff -u -r 1.36.2.27 -r 1.36.2.28 src/common/utils.c; cvs diff -u -r 1.9.2.10 -r 1.9.2.11 src/common/defs.h; cvs diff -u -r 1.75.2.5 -r 1.75.2.6 src/matcher.c; cvs diff -u -r 1.16.2.15 -r 1.16.2.16 src/msgcache.c; cvs diff -u -r 1.101.2.9 -r 1.101.2.10 src/news.c; cvs diff -u -r 1.150.2.21 -r 1.150.2.22 src/procmsg.c; cvs diff -u -r 1.60.2.10 -r 1.60.2.11 src/procmsg.h; cvs diff -u -r 1.22.2.7 -r 1.22.2.8 src/quote_fmt_parse.y; cvs diff -u -r 1.395.2.62 -r 1.395.2.63 src/summaryview.c; ) > 1.9.6cvs14.patchset
 ( cvs diff -u -r 1.179.2.16 -r 1.179.2.17 src/imap.c; ) > 1.9.6cvs15.patchset
 ( cvs diff -u -r 1.155.2.19 -r 1.155.2.20 src/Makefile.am; cvs diff -u -r 1.26.2.13 -r 1.26.2.14 src/foldersel.c; cvs diff -u -r 1.25.2.9 -r 1.25.2.10 src/stock_pixmap.c; cvs diff -u -r 1.18.2.6 -r 1.18.2.7 src/stock_pixmap.h; cvs diff -u -r 0 -r 1 src/pixmaps/dir-noselect.xpm; ) > 1.9.6cvs16.patchset
+( cvs diff -u -r 1.382.2.115 -r 1.382.2.116 src/compose.c; ) > 1.9.6cvs17.patchset

diff --git a/configure.ac b/configure.ac
index a6c6e2a0127e1453f0b9e512779e7304292ffa8d..c9683552b0e9279fb8415adb85f30e65c655952a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 4389c063d9107c1a5c7af9411430f8dad098f6a0..cd7fb88ecdfe7146945635caf37da0339678a4c8 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2714,7 +2714,7 @@ static gboolean compose_get_line_break_pos(GtkTextBuffer *buffer,
        return do_break;
 }
 
-static gboolean is_sig_separator(Compose *compose, GtkTextBuffer *textbuf, GtkTextIter *iter) 
+static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbuf, GtkTextIter *iter) 
 {
        char *text = NULL;
        GtkTextIter start = *iter;
@@ -2782,6 +2782,10 @@ static gboolean compose_join_next_line(Compose *compose,
        if (compose_is_itemized(buffer, &end))
                return FALSE;
 
+       /* don't join signature separator */
+       if (compose_is_sig_separator(compose, buffer, &iter_))
+               return FALSE;
+
        /* delete quote str */
        if (quote_len > 0)
                gtk_text_buffer_delete(buffer, &iter_, &end);