2005-01-03 [colin] 0.9.13cvs25.5

	* src/compose.c
		Fix my broken patch apply

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d3f6c02e84f97237cf22b35faf6e7ddeb86b17f1..861ed84ce5f1784e522dfd2035a71238e9267c30 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-01-03 [colin]     0.9.13cvs25.5
+
+       * src/compose.c
+               Fix my broken patch apply 
+
 2005-01-03 [colin]     0.9.13cvs25.4
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index 8de32c718abfd8a65cfcce3a0bee0066a5e3d899..38e027204d9641dd2061931a9664e96079dcf75a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -304,3 +304,4 @@
 ( cvs diff -u -r 1.115.2.25 -r 1.115.2.26 src/main.c; cvs diff -u -r 1.100.2.9 -r 1.100.2.10 AUTHORS; ) > 0.9.13cvs25.2.patchset
 ( cvs diff -u -r 1.382.2.81 -r 1.382.2.82 src/compose.c; cvs diff -u -r 1.10.2.8 -r 1.10.2.9 src/prefs_gtk.c; cvs diff -u -r 1.12.2.4 -r 1.12.2.5 src/prefs_template.c; cvs diff -u -r 1.96.2.37 -r 1.96.2.38 src/textview.c; ) > 0.9.13cvs25.3.patchset
 ( cvs diff -u -r 1.36.2.18 -r 1.36.2.19 src/common/utils.c; cvs diff -u -r 1.20.2.12 -r 1.20.2.13 src/common/utils.h; cvs diff -u -r 1.12.2.13 -r 1.12.2.14 src/gtk/prefswindow.c; ) > 0.9.13cvs25.4.patchset
+( cvs diff -u -r 1.382.2.82 -r 1.382.2.83 src/compose.c; ) > 0.9.13cvs25.5.patchset

diff --git a/configure.ac b/configure.ac
index 766f042c80e7a0e5a35937698ac4a8e3a9c08ac0..2fa902f068340083f30896e6500124d2a66d1300 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=25
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.4
+EXTRA_GTK2_VERSION=.5
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/compose.c b/src/compose.c
index 3a5d9930d5d01b13bcabc300f29492b1d413c798..43b3a761993a8d34ceadbb4b11c01130d3a0669d 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5399,7 +5399,7 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
                compose_entry_append(compose, tmpl->bcc, COMPOSE_BCC);
 
        if (replace)
-               gtk_text_buffer_set_text(buffer, "", 1);
+               gtk_text_buffer_set_text(buffer, "", -1);
 
        mark = gtk_text_buffer_get_insert(buffer);
        gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
@@ -6002,7 +6002,7 @@ static void compose_input_cb(gpointer data, gint source,
                GtkTextView *text = GTK_TEXT_VIEW(compose->text);
                GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
 
-               gtk_text_buffer_set_text(buffer, "", 1);
+               gtk_text_buffer_set_text(buffer, "", -1);
                compose_insert_file(compose, compose->exteditor_file);
                compose_changed_cb(NULL, compose);