2008-11-15 [colin] 3.6.1cvs30

	* src/compose.c
		Auto-save draft after external editor quits

diff --git a/ChangeLog b/ChangeLog
index 00465071518770a9da2bc18b99998200781e0da6..56bdf11d90ae7ebdc81a8264387361343831c081 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-15 [colin]     3.6.1cvs30
+
+       * src/compose.c
+               Auto-save draft after external editor quits
+

 2008-11-15 [colin]     3.6.1cvs29
 
        * src/plugins/pgpcore/sgpgme.c
 2008-11-15 [colin]     3.6.1cvs29
 
        * src/plugins/pgpcore/sgpgme.c

diff --git a/PATCHSETS b/PATCHSETS
index e87c58eb93e9e8d460fc35a878c99fd9a38c28a4..69090c972537871d232dd473664e1e85477be8c5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3611,3 +3611,4 @@
 ( cvs diff -u -r 1.274.2.290 -r 1.274.2.291 src/mainwindow.c;  cvs diff -u -r 1.395.2.399 -r 1.395.2.400 src/summaryview.c;  cvs diff -u -r 1.68.2.49 -r 1.68.2.50 src/summaryview.h;  cvs diff -u -r 1.5.2.37 -r 1.5.2.38 src/gtk/menu.c;  cvs diff -u -r 1.4.2.20 -r 1.4.2.21 src/gtk/menu.h;  ) > 3.6.1cvs27.patchset
 ( cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/prefs_actions.c;  ) > 3.6.1cvs28.patchset
 ( cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs29.patchset
 ( cvs diff -u -r 1.274.2.290 -r 1.274.2.291 src/mainwindow.c;  cvs diff -u -r 1.395.2.399 -r 1.395.2.400 src/summaryview.c;  cvs diff -u -r 1.68.2.49 -r 1.68.2.50 src/summaryview.h;  cvs diff -u -r 1.5.2.37 -r 1.5.2.38 src/gtk/menu.c;  cvs diff -u -r 1.4.2.20 -r 1.4.2.21 src/gtk/menu.h;  ) > 3.6.1cvs27.patchset
 ( cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/prefs_actions.c;  ) > 3.6.1cvs28.patchset
 ( cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs29.patchset

+( cvs diff -u -r 1.382.2.482 -r 1.382.2.483 src/compose.c;  ) > 3.6.1cvs30.patchset

diff --git a/configure.ac b/configure.ac
index c4c75359e0c9aeeaa54a046ce12d11cd3cc093c5..dbbc7fcf3995aa2c9cd77e493cce0097dd04f7d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=29
+EXTRA_VERSION=30

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 4ced668220cf1c64f4274e784f8c05204973ac20..16468a0b4c0b7a148a8b48322d377fc21d9f735b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -8557,6 +8557,7 @@ static gboolean compose_input_cb(GIOChannel *source, GIOCondition condition,
                gtk_text_buffer_set_text(buffer, "", -1);
                compose_insert_file(compose, compose->exteditor_file);
                compose_changed_cb(NULL, compose);
                gtk_text_buffer_set_text(buffer, "", -1);
                compose_insert_file(compose, compose->exteditor_file);
                compose_changed_cb(NULL, compose);

+               compose_draft((gpointer)compose, COMPOSE_AUTO_SAVE);

 
                if (claws_unlink(compose->exteditor_file) < 0)
                        FILE_OP_ERROR(compose->exteditor_file, "unlink");
 
                if (claws_unlink(compose->exteditor_file) < 0)
                        FILE_OP_ERROR(compose->exteditor_file, "unlink");