fix Re-edit bug in Message menu

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2de2978739da95d0f6c4bcc76255a2f5da33b605..41e5c15f999f290834f201cfda366569e6e16cbe 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-10-18 [paul]      0.6.3claws22
+
+       * src/summaryview.c
+               remove comment (sync with main branch)
+       * src/mainwindow.c
+               fix 'Re-edit' bug in 'Message' menu
+

 2001-10-17 [christoph] 0.6.3claws21
 
        * src/compose.c
 2001-10-17 [christoph] 0.6.3claws21
 
        * src/compose.c

diff --git a/configure.in b/configure.in
index 0c70d57154db8ddd5cb7e647b534f96093e0b7da..7906fed9c5332089d745bcbdeb54f4f65909f361 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws21
+EXTRA_VERSION=claws22

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 9e6dc7c956beb33e7dac0d17c8b8bf45e97235eb..5f1f6dc20a5e916eefc98c7535bcbb121ec8baf7 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1258,6 +1258,7 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        if (selection == SUMMARY_SELECTED_SINGLE &&
            (mainwin->summaryview->folder_item &&
             (mainwin->summaryview->folder_item->stype == F_DRAFT ||
        if (selection == SUMMARY_SELECTED_SINGLE &&
            (mainwin->summaryview->folder_item &&
             (mainwin->summaryview->folder_item->stype == F_DRAFT ||

+             mainwin->summaryview->folder_item->stype == F_OUTBOX ||

              mainwin->summaryview->folder_item->stype == F_QUEUE)))
                state |= M_ALLOW_REEDIT;
        if (cur_account)
              mainwin->summaryview->folder_item->stype == F_QUEUE)))
                state |= M_ALLOW_REEDIT;
        if (cur_account)