2005-02-05 [paul] 1.0.0cvs28
authorPaul Mangan <paul@claws-mail.org>
Sat, 5 Feb 2005 10:27:53 +0000 (10:27 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sat, 5 Feb 2005 10:27:53 +0000 (10:27 +0000)
* src/compose.c
fix Bug 682 'redirect is broken'

ChangeLog.claws
PATCHSETS
configure.ac
src/compose.c

index dec24a0..533a8a6 100644 (file)
@@ -1,3 +1,9 @@
+2005-02-05 [paul]      1.0.0cvs28
+
+       * src/compose.c
+               fix Bug 682 'redirect is broken'
+
+
 2005-02-05 [thorsten]  1.0.0cvs27
 
        * src/partial_download.c
index 3ec9b12..aa933c5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.130 -r 1.131 src/messageview.c; ) > 1.0.0cvs25.patchset
 ( cvs diff -u -r 1.14 -r 1.15 src/common/plugin.c; ) > 1.0.0cvs26.patchset
 ( cvs diff -u -r 1.2 -r 1.3 src/partial_download.c; ) > 1.0.0cvs27.patchset
+( cvs diff -u -r 1.472 -r 1.473 src/compose.c; ) > 1.0.0cvs28.patchset
index 917caed..e9f63c5 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
index 23f2031..0321454 100644 (file)
@@ -1358,7 +1358,7 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
 
        gtk_widget_grab_focus(compose->header_last->entry);
 
-       filename = procmsg_get_message_file(msginfo);
+       filename = procmsg_get_message_file_path(msginfo);
        if (filename == NULL)
                return NULL;
 
@@ -1398,10 +1398,7 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
        menu_set_sensitive(ifactory, "/Message/Attach file", FALSE);
        menu_set_sensitive(ifactory, "/Message/Insert signature", FALSE);
        menu_set_sensitive(ifactory, "/Edit", FALSE);
-       menu_set_sensitive(ifactory, "/Options/Sign", FALSE);
-       menu_set_sensitive(ifactory, "/Options/Encrypt", FALSE);
-       menu_set_sensitive(ifactory, "/Options/Priority", FALSE);
-       menu_set_sensitive(ifactory, "/Options/Request Return Receipt", FALSE);
+       menu_set_sensitive(ifactory, "/Options", FALSE);
        menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
        menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
        
@@ -3035,11 +3032,11 @@ static void compose_select_account(Compose *compose, PrefsAccount *account,
 
 #endif
 
-       if (account->default_sign)
+       if (account->default_sign && compose->mode != COMPOSE_REDIRECT)
                menu_set_active(ifactory, "/Options/Sign", TRUE);
        else
                menu_set_active(ifactory, "/Options/Sign", FALSE);
-       if (account->default_encrypt)
+       if (account->default_encrypt && compose->mode != COMPOSE_REDIRECT)
                menu_set_active(ifactory, "/Options/Encrypt", TRUE);
        else
                menu_set_active(ifactory, "/Options/Encrypt", FALSE);