fix wrapping

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 3a7c310639235e3c02774f124dd138de77657c41..806c0c099100e1a7787a8ff4c4d783a136eda8e9 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2004-07-18 [colin]     0.9.12cvs30.3
+
+       * src/compose.c
+               Fix smart wrapping (block text_inserted handler
+               while putting quotation to avoid wrap on input,
+               don't join lines if next is sig separator)
+
 2004-07-17 [colin]     0.9.12cvs30.2
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 1e20d4b0b5bcacd15018a3d9c58681042fd6079a..60356df50b0082f99f7563e475c9c156d3cf1bc0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -34,3 +34,4 @@
 ( cvs diff -u -r 1.83.2.10 -r 1.83.2.11 src/mimeview.c; cvs diff -u -r 1.49.2.7 -r 1.49.2.8 src/procmime.c; cvs diff -u -r 1.395.2.18 -r 1.395.2.19 src/summaryview.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/gtk/menu.c; ) > 0.9.12cvs28.2.patchset
 ( cvs diff -u -r 1.29.2.1 -r 1.29.2.2 INSTALL; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 commitHelper; cvs diff -u -r 1.87.2.7 -r 1.87.2.8 src/folder.h; cvs diff -u -r 1.207.2.6 -r 1.207.2.7 src/folderview.c; cvs diff -u -r 1.395.2.19 -r 1.395.2.20 src/summaryview.c; ) > 0.9.12cvs28.3.patchset
 ( cvs diff -u -r 1.207.2.7 -r 1.207.2.8 src/folderview.c; cvs diff -u -r 1.274.2.9 -r 1.274.2.10 src/mainwindow.c; cvs diff -u -r 1.83.2.11 -r 1.83.2.12 src/mimeview.c; cvs diff -u -r 1.395.2.20 -r 1.395.2.21 src/summaryview.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/quicksearch.h; ) > 0.9.12cvs30.2.patchset
+( cvs diff -u -r 1.382.2.21 -r 1.382.2.22 src/compose.c; ) > 0.9.12cvs30.3.patchset

diff --git a/src/compose.c b/src/compose.c
index 8def5a210cd8201e73ddd728ba0676443208d488..66d31ca600407bde41e0d6c42f727a3398ee5aa4 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1808,17 +1808,24 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
                g_signal_handlers_block_by_func(G_OBJECT(buffer),
                                        G_CALLBACK(compose_changed_cb),
                                        compose);
+               g_signal_handlers_block_by_func(G_OBJECT(buffer),
+                                       G_CALLBACK(text_inserted),
+                                       compose);
                
                mark = gtk_text_buffer_get_insert(buffer);
                gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
 
                lastp = strchr(p, '\n');
                len = lastp ? lastp - p + 1 : -1;
+
                gtk_text_buffer_insert(buffer, &iter, p, len);
 
                g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
                                        G_CALLBACK(compose_changed_cb),
                                        compose);
+               g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+                                       G_CALLBACK(text_inserted),
+                                       compose);
                
                if (lastp)
                        p = lastp + 1;
@@ -2704,6 +2711,35 @@ static guint ins_quote(GtkTextBuffer *textbuf, GtkTextIter *iter,
        return ins_len;
 }
 
+static gboolean is_sig_separator(Compose *compose, GtkTextBuffer *textbuf, guint start_pos) 
+{
+       char *text = NULL;
+       GtkTextIter iter; 
+       GtkTextIter end_iter;
+       if (!compose->account->sig_sep)
+               return FALSE;
+       
+       gtk_text_buffer_get_iter_at_offset(textbuf, &iter, start_pos+1);
+       gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
+               start_pos+strlen(compose->account->sig_sep)+1);
+
+       if (!strcmp(gtk_text_iter_get_text(&iter, &end_iter),
+                       compose->account->sig_sep)) {
+               /* check \n */
+               gtk_text_buffer_get_iter_at_offset(textbuf, &iter,
+                       start_pos+strlen(compose->account->sig_sep)+1);
+               gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
+                       start_pos+strlen(compose->account->sig_sep)+2);
+
+               if (!strcmp(gtk_text_iter_get_text(&iter, &end_iter),"\n"));
+                       return TRUE;
+               
+
+       }
+
+       return FALSE;
+}
+
 /* check if we should join the next line */
 static gboolean join_next_line_is_needed(GtkTextBuffer *textbuf,
                                         guint start_pos, guint tlen,
@@ -2720,6 +2756,7 @@ static gboolean join_next_line_is_needed(GtkTextBuffer *textbuf,
                gtk_text_buffer_get_iter_at_offset(textbuf, &iter,
                                                   start_pos + indent_len);
                GET_CHAR(&iter, cbuf, ch_len);
+               
                if (ch_len > 0 && (cbuf[0] != '\n'))
                        do_join = TRUE;
        }
@@ -2783,10 +2820,11 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
 
                        /* should we join the next line */
                        if ((autowrap || i_len != cur_len) && do_delete &&
+                       !is_sig_separator(compose, textbuf, cur_pos+i_len) &&
                            join_next_line_is_needed
-                               (textbuf, cur_pos + 1, tlen, i_len, autowrap))
+                               (textbuf, cur_pos + 1, tlen, i_len, autowrap)) {
                                do_delete = TRUE;
-                       else
+                       } else
                                do_delete = FALSE;
 
                        /* skip delete if it is continuous URL */
@@ -2959,9 +2997,9 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
                        /* start over with current line */
                        is_new_line = TRUE;
                        line_len = cur_len = 0;
-                       if (autowrap || i_len > 0)
+                       if (autowrap || i_len > 0) {
                                do_delete = TRUE;
-                       else
+                       } else
                                do_delete = FALSE;
 #ifdef WRAP_DEBUG
                        g_print("after CR insert ");