2006-11-14 [paul] 2.6.0cvs48

	* src/compose.c
		Fix Options/Reply mode after draft save

diff --git a/ChangeLog b/ChangeLog
index a39c654ecc115e08b626124421a764a4d57a0719..497e3c9ae7b92932d6919bf3bb63c6d9533fa3fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-14 [paul]      2.6.0cvs48
+
+       * src/compose.c
+               Fix Options/Reply mode after draft save
+

 2006-11-14 [paul]      2.6.0cvs47
 
        * src/Makefile.am
 2006-11-14 [paul]      2.6.0cvs47
 
        * src/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 71aa038b7773680637e6fcd5e64fa7b52ec7bae8..a9398f07700365d391cbf281b3a583e8bea9637a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2072,3 +2072,4 @@
 ( cvs diff -u -r 1.17.2.12 -r 1.17.2.13 po/ru.po;  ) > 2.6.0cvs45.patchset
 ( cvs diff -u -r 1.1.4.4 -r 1.1.4.5 po/Makevars;  cvs diff -u -r 1.155.2.47 -r 1.155.2.48 src/Makefile.am;  cvs diff -u -r 1.25.2.29 -r 1.25.2.30 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.20 -r 1.18.2.21 src/stock_pixmap.h;  cvs diff -u -r 1.4.2.38 -r 1.4.2.39 src/gtk/about.c;  diff -u /dev/null src/pixmaps/active.xpm;  diff -u /dev/null src/pixmaps/inactive.xpm;  ) > 2.6.0cvs46.patchset
 ( cvs diff -u -r 1.155.2.48 -r 1.155.2.49 src/Makefile.am;  cvs diff -u -r 1.28.2.30 -r 1.28.2.31 src/mbox.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/plugins/pgpinline/pgpinline.c;  ) > 2.6.0cvs47.patchset
 ( cvs diff -u -r 1.17.2.12 -r 1.17.2.13 po/ru.po;  ) > 2.6.0cvs45.patchset
 ( cvs diff -u -r 1.1.4.4 -r 1.1.4.5 po/Makevars;  cvs diff -u -r 1.155.2.47 -r 1.155.2.48 src/Makefile.am;  cvs diff -u -r 1.25.2.29 -r 1.25.2.30 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.20 -r 1.18.2.21 src/stock_pixmap.h;  cvs diff -u -r 1.4.2.38 -r 1.4.2.39 src/gtk/about.c;  diff -u /dev/null src/pixmaps/active.xpm;  diff -u /dev/null src/pixmaps/inactive.xpm;  ) > 2.6.0cvs46.patchset
 ( cvs diff -u -r 1.155.2.48 -r 1.155.2.49 src/Makefile.am;  cvs diff -u -r 1.28.2.30 -r 1.28.2.31 src/mbox.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/plugins/pgpinline/pgpinline.c;  ) > 2.6.0cvs47.patchset

+( cvs diff -u -r 1.382.2.330 -r 1.382.2.331 src/compose.c;  ) > 2.6.0cvs48.patchset

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

-EXTRA_VERSION=47
+EXTRA_VERSION=48

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 9e6aee62697791b033284a0b7516200af7bbda5a..33d648ae5871f33fbea8e2da96a68d5a092314ea 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6518,8 +6518,7 @@ static void compose_reply_change_mode(gpointer data,
        gboolean was_modified = compose->modified;
 
        gboolean all = FALSE, ml = FALSE, sender = FALSE, followup = FALSE;
        gboolean was_modified = compose->modified;
 
        gboolean all = FALSE, ml = FALSE, sender = FALSE, followup = FALSE;

-       if (compose->mode != COMPOSE_REPLY)
-               return;
+       

        g_return_if_fail(compose->replyinfo != NULL);
        
        if (action == COMPOSE_REPLY && prefs_common.default_reply_list)
        g_return_if_fail(compose->replyinfo != NULL);
        
        if (action == COMPOSE_REPLY && prefs_common.default_reply_list)