2005-09-02 [paul] 1.9.13cvs79

	* src/compose.c
		compose_wrap_paragraph() becomes
		compose_beautify_paragraph()
		Patch by Colin

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 87effcdd40d9515abe50cee67efa56dd91bb8d92..e1dba2884f04302877312f6288ac5ece82911f4f 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-09-02 [paul]      1.9.13cvs79
+
+       * src/compose.c
+               compose_wrap_paragraph() becomes
+               compose_beautify_paragraph()
+               Patch by Colin
+

 2005-09-02 [cleroy]    1.9.13cvs78
 
        * src/folderview.c
 2005-09-02 [cleroy]    1.9.13cvs78
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index d0cfda30d9eb61cc2366eaaed67c80de2f210f2b..526c1537deca9cb0b42fdc7e91d588ca88fc5178 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -764,3 +764,4 @@
 ( cvs diff -u -r 1.204.2.56 -r 1.204.2.57 src/prefs_common.c;  ) > 1.9.13cvs76.patchset
 ( cvs diff -u -r 1.179.2.64 -r 1.179.2.65 src/imap.c;  cvs diff -u -r 1.395.2.120 -r 1.395.2.121 src/summaryview.c;  ) > 1.9.13cvs77.patchset
 ( cvs diff -u -r 1.207.2.61 -r 1.207.2.62 src/folderview.c;  ) > 1.9.13cvs78.patchset
 ( cvs diff -u -r 1.204.2.56 -r 1.204.2.57 src/prefs_common.c;  ) > 1.9.13cvs76.patchset
 ( cvs diff -u -r 1.179.2.64 -r 1.179.2.65 src/imap.c;  cvs diff -u -r 1.395.2.120 -r 1.395.2.121 src/summaryview.c;  ) > 1.9.13cvs77.patchset
 ( cvs diff -u -r 1.207.2.61 -r 1.207.2.62 src/folderview.c;  ) > 1.9.13cvs78.patchset

+( cvs diff -u -r 1.382.2.158 -r 1.382.2.159 src/compose.c;  ) > 1.9.13cvs79.patchset

diff --git a/configure.ac b/configure.ac
index 5f006037af3b773374aef11d55f3955c8672e20d..045fb7357e07227d5bc7a59c9daddc4942a1de7d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=78
+EXTRA_VERSION=79

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index a6cabec0116e452d7791a64533c14751e81029cb..51d50ed2a6933aaa89d88861dda693a3574ac15b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -239,7 +239,7 @@ static void compose_attach_append           (Compose        *compose,
 static void compose_attach_parts               (Compose        *compose,
                                                 MsgInfo        *msginfo);
 
 static void compose_attach_parts               (Compose        *compose,
                                                 MsgInfo        *msginfo);
 

-static void compose_wrap_paragraph             (Compose        *compose,
+static void compose_beautify_paragraph         (Compose        *compose,

                                                 GtkTextIter    *par_iter,
                                                 gboolean        force);
 static void compose_wrap_all                   (Compose        *compose);
                                                 GtkTextIter    *par_iter,
                                                 gboolean        force);
 static void compose_wrap_all                   (Compose        *compose);


@@ -1749,7 +1749,7 @@ void compose_toolbar_cb(gint action, gpointer data)
                compose_ext_editor_cb(compose, 0, NULL);
                break;
        case A_LINEWRAP_CURRENT:
                compose_ext_editor_cb(compose, 0, NULL);
                break;
        case A_LINEWRAP_CURRENT:

-               compose_wrap_paragraph(compose, NULL, TRUE);
+               compose_beautify_paragraph(compose, NULL, TRUE);

                break;
        case A_LINEWRAP_ALL:
                compose_wrap_all_full(compose, TRUE);
                break;
        case A_LINEWRAP_ALL:
                compose_wrap_all_full(compose, TRUE);


@@ -3012,7 +3012,7 @@ static gboolean compose_join_next_line(Compose *compose,
                g_warning("alloc error scanning URIs\n"); \
        }
 
                g_warning("alloc error scanning URIs\n"); \
        }
 

-static void compose_wrap_paragraph(Compose *compose, GtkTextIter *par_iter, gboolean force)
+static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter, gboolean force)

 {
        GtkTextView *text = GTK_TEXT_VIEW(compose->text);
        GtkTextBuffer *buffer;
 {
        GtkTextView *text = GTK_TEXT_VIEW(compose->text);
        GtkTextBuffer *buffer;


@@ -3101,7 +3101,7 @@ static void compose_wrap_paragraph(Compose *compose, GtkTextIter *par_iter, gboo
                                }
                                goto colorize;
                        }
                                }
                                goto colorize;
                        }

-                       debug_print("compose_wrap_paragraph(): quote_str = '%s'\n", quote_str);
+                       debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str);

                        startq_offset = gtk_text_iter_get_offset(&iter);
                } else {
                        if (startq_offset == -1)
                        startq_offset = gtk_text_iter_get_offset(&iter);
                } else {
                        if (startq_offset == -1)


@@ -3257,7 +3257,7 @@ static void compose_wrap_all_full(Compose *compose, gboolean force)
 
        gtk_text_buffer_get_start_iter(buffer, &iter);
        while (!gtk_text_iter_is_end(&iter))
 
        gtk_text_buffer_get_start_iter(buffer, &iter);
        while (!gtk_text_iter_is_end(&iter))

-               compose_wrap_paragraph(compose, &iter, force);
+               compose_beautify_paragraph(compose, &iter, force);

 
        undo_unblock(compose->undostruct);
 }
 
        undo_unblock(compose->undostruct);
 }


@@ -7248,7 +7248,7 @@ static void compose_wrap_cb(gpointer data, guint action, GtkWidget *widget)
        if (action == 1)
                compose_wrap_all_full(compose, TRUE);
        else
        if (action == 1)
                compose_wrap_all_full(compose, TRUE);
        else

-               compose_wrap_paragraph(compose, NULL, TRUE);
+               compose_beautify_paragraph(compose, NULL, TRUE);

 }
 
 static void compose_toggle_autowrap_cb(gpointer data, guint action,
 }
 
 static void compose_toggle_autowrap_cb(gpointer data, guint action,


@@ -7528,8 +7528,7 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
 
        mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
        
 
        mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
        

-/*     compose_wrap_all_full(compose, FALSE); */
-       compose_wrap_paragraph(compose, iter, FALSE);
+       compose_beautify_paragraph(compose, iter, FALSE);

 
        gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
        gtk_text_buffer_delete_mark(buffer, mark);
 
        gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
        gtk_text_buffer_delete_mark(buffer, mark);