2004-11-15 [colin] 0.9.12cvs146.13

	* src/compose.c
		Fix drafting after insertion
		Patch by Alfons

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 4d63fbb52caab13841949a8e621c3232e7fa7c07..d2b4c75f146169c02160fe5e08ff1b764eec9d4d 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-11-15 [colin]     0.9.12cvs146.13
+
+       * src/compose.c
+               Fix drafting after insertion
+               Patch by Alfons
+
 2004-11-15 [colin]     0.9.12cvs146.12
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 5f629635027671ff4e92938b9009b525f23a0d87..2b055b55ab70e366368c7a8ae9f7a0b30e63a86c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -237,3 +237,4 @@
 ( cvs diff -u -r 1.65.2.18 -r 1.65.2.19 src/codeconv.c; ) > 0.9.12cvs146.10.patchset
 ( cvs diff -u -r 1.395.2.40 -r 1.395.2.41 src/summaryview.c; cvs diff -u -r 1.3.2.11 -r 1.3.2.12 src/prefs_themes.c; cvs diff -u -r 1.94.2.33 -r 1.94.2.34 src/messageview.c; ) > 0.9.12cvs146.11.patchset
 ( cvs diff -u -r 1.382.2.64 -r 1.382.2.65 src/compose.c; cvs diff -u -r 1.59.2.9 -r 1.59.2.10 src/prefs_filtering.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/prefs_filtering_action.c; cvs diff -u -r 1.30.2.6 -r 1.30.2.7 src/prefs_toolbar.c; ) > 0.9.12cvs146.12.patchset
+( cvs diff -u -r 1.382.2.65 -r 1.382.2.66 src/compose.c; ) > 0.9.12cvs146.13.patchset

diff --git a/configure.ac b/configure.ac
index 07c9ef9e23680eb4b7563e420a0a39612e2f5f97..7427ad3fa567278cdce2bd4a416f12ccb7458b33 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=146
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.12
+EXTRA_GTK2_VERSION=.13
 
 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 46452d9519b921db18745618689411272871825c..9075f69d018c830051913a52239f1a7d740ce6b1 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1295,6 +1295,10 @@ void compose_reedit(MsgInfo *msginfo)
        g_signal_handlers_block_by_func(G_OBJECT(textbuf),
                                        G_CALLBACK(compose_changed_cb),
                                        compose);
+                                       
+       g_signal_handlers_block_by_func(G_OBJECT(textbuf),
+                                       G_CALLBACK(text_inserted),
+                                       compose);
 
        if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
                g_warning("Can't get text part\n");
@@ -1302,12 +1306,16 @@ void compose_reedit(MsgInfo *msginfo)
                while (fgets(buf, sizeof(buf), fp) != NULL) {
                        strcrchomp(buf);
                        gtk_text_buffer_insert(textbuf, &iter, buf, -1);
+                       gtk_text_buffer_get_iter_at_mark(textbuf, &iter, mark);
                }
                fclose(fp);
        }
        
        compose_attach_parts(compose, msginfo);
 
+       g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
+                                       G_CALLBACK(text_inserted),
+                                       compose);
        g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
                                        G_CALLBACK(compose_changed_cb),
                                        compose);