make 'Bounce' sensitive

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2b187c81e9fce495c1072b3952b1b99e2fec22e1..651dd7cbbc9608a6e338860950ce51af0ea4cbfe 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2001-11-30 [paul]      0.6.5claws46
+       
+        * src/compose.c
+               remove conflicts introduced by Hoa's last commit
+         
+        * src/mainwindow.c
+               make 'Message/Bounce' sensitive
+

 2001-11-30 [hoa]       0.6.5claws45
 
        * src/compose.c
 2001-11-30 [hoa]       0.6.5claws45
 
        * src/compose.c

diff --git a/configure.in b/configure.in
index c6273a33bd6ed8c8671f853a84c2c1f8dd58094e..2bfcb69f5c8458a1ff822f61f94fa8f8e81a689c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws45
+EXTRA_VERSION=claws46

 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 03cc613066df2024582adbab358caebdb92f7890..d82d456364651c45968ed7666872398828624053 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1379,6 +1379,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
                {"/Message/Forward"               , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Forward as attachment" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
                {"/Message/Forward"               , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Forward as attachment" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},

+                {"/Message/Bounce"               , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},

                {"/Message/Open in new window"    , M_SINGLE_TARGET_EXIST},
                {"/Message/Re-edit", M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
                {"/Message/Move...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
                {"/Message/Open in new window"    , M_SINGLE_TARGET_EXIST},
                {"/Message/Re-edit", M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
                {"/Message/Move...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},