2006-06-30 [colin] 2.3.1cvs45

	* src/compose.c
		Fix signature replacement:
		- when no newline before separator
		- when reediting

diff --git a/ChangeLog b/ChangeLog
index 00792f6a2cb75c54aaac3804806b5d4ed202c0ba..43e92b13f481de0ce484b901c976d6c4b1c50a12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-30 [colin]     2.3.1cvs45
+
+       * src/compose.c
+               Fix signature replacement:
+               - when no newline before separator
+               - when reediting
+
 2006-06-29 [colin]     2.3.1cvs44
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 38c461a1ea2a4f37424e02a2041ca41263607283..87023473b9d949769d54ec29bfa52d5f0da45f60 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1645,3 +1645,4 @@
 ( cvs diff -u -r 1.179.2.125 -r 1.179.2.126 src/imap.c;  ) > 2.3.1cvs42.patchset
 ( cvs diff -u -r 1.9.2.40 -r 1.9.2.41 src/gtk/gtkaspell.c;  ) > 2.3.1cvs43.patchset
 ( cvs diff -u -r 1.207.2.104 -r 1.207.2.105 src/folderview.c;  cvs diff -u -r 1.20.2.11 -r 1.20.2.12 src/folderview.h;  cvs diff -u -r 1.274.2.121 -r 1.274.2.122 src/mainwindow.c;  cvs diff -u -r 1.395.2.221 -r 1.395.2.222 src/summaryview.c;  cvs diff -u -r 1.36.2.69 -r 1.36.2.70 src/common/utils.c;  ) > 2.3.1cvs44.patchset
+( cvs diff -u -r 1.382.2.289 -r 1.382.2.290 src/compose.c;  ) > 2.3.1cvs45.patchset

diff --git a/configure.ac b/configure.ac
index 90ce1a8842c3cd5bb4617d426fa9445b379da497..09bf715241b62c58bc5799869f3b6c38c55d1fab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=44
+EXTRA_VERSION=45
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index d4b7bf04d8f038c3009c2279ad4fd6fe59b1d953..59270a8e7e2e2670987de54ccce925cdfafa37cf 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1812,6 +1812,9 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
                compose_destroy(compose);
                return NULL;
        }
+       
+       compose->sig_str = compose_get_signature_str(compose);
+       
        return compose;
 }
 
@@ -2683,7 +2686,9 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
        GtkTextMark *mark;
        GtkTextIter iter, iter_end;
        gint cur_pos;
+       gchar *search = NULL;
        gboolean prev_autowrap;
+       gboolean found = FALSE, shift = FALSE;
 
        
        g_return_if_fail(compose->account != NULL);
@@ -2701,8 +2706,9 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
 
        gtk_text_buffer_get_end_iter(buffer, &iter);
 
-       if (replace && compose->sig_str) {
-               gboolean found;
+       search = compose->sig_str;
+again:
+       if (replace && search) {
                GtkTextIter first_iter, start_iter, end_iter;
 
                gtk_text_buffer_get_start_iter(buffer, &first_iter);
@@ -2711,7 +2717,7 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
                        found = FALSE;
                else
                        found = gtk_text_iter_forward_search(&first_iter,
-                                                            compose->sig_str,
+                                                            search,
                                                             GTK_TEXT_SEARCH_TEXT_ONLY,
                                                             &start_iter, &end_iter,
                                                             NULL);
@@ -2720,6 +2726,12 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
                        gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
                        iter = start_iter;
                }
+       } 
+       if (replace && !found && search && strlen(search) > 2
+       &&  search[0] == '\n' && search[1] == '\n') {
+               search ++;
+               shift = TRUE;
+               goto again;
        }
 
        g_free(compose->sig_str);
@@ -2728,7 +2740,10 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
                compose->sig_str = g_strdup("");
 
        cur_pos = gtk_text_iter_get_offset(&iter);
-       gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
+       if (shift && found)
+               gtk_text_buffer_insert(buffer, &iter, compose->sig_str + 1, -1);
+       else
+               gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
        /* skip \n\n */
        gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
        gtk_text_iter_forward_char(&iter);