also block text_inserted when inserting a file

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 806c0c099100e1a7787a8ff4c4d783a136eda8e9..61c86943a3ef66be4b5502c1e1eac642f0973e41 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-07-18 [colin]     0.9.12cvs30.3
+
+       * src/compose.c
+               Also block text_inserted when inserting a file
+
 2004-07-18 [colin]     0.9.12cvs30.3
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 60356df50b0082f99f7563e475c9c156d3cf1bc0..2e1d39b922683ac47cf9a6d19757d155fce26cdf 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -35,3 +35,4 @@
 ( 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
+( cvs diff -u -r 1.382.2.22 -r 1.382.2.23 src/compose.c; ) > 0.9.12cvs30.3.patchset

diff --git a/configure.ac b/configure.ac
index f848ccb6d5297f856688637a8a855ca8aea33401..a00b6218e1b5047b02d8abae691838b629283041 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=30
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+EXTRA_GTK2_VERSION=.3
 
 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 66d31ca600407bde41e0d6c42f727a3398ee5aa4..01c4590ba6e361e441c68e2bdd565c118eb353f6 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2130,6 +2130,10 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
        mark = gtk_text_buffer_get_insert(buffer);
        gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
 
+       g_signal_handlers_block_by_func(G_OBJECT(buffer),
+                                       G_CALLBACK(text_inserted),
+                                       compose);
+
        while (fgets(buf, sizeof(buf), fp) != NULL) {
                const gchar *cur_encoding = conv_get_current_charset_str();
                gchar *str = conv_codeset_strdup(buf, cur_encoding, CS_UTF_8);
@@ -2149,6 +2153,10 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
                g_free (str);
        }
 
+       g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+                                         G_CALLBACK(text_inserted),
+                                         compose);
+
        fclose(fp);
 
        if (badtxt)