+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
( 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
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;
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);