2005-02-05 [paul] 1.0.0cvs28.1
authorPaul Mangan <paul@claws-mail.org>
Sat, 5 Feb 2005 10:34:31 +0000 (10:34 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sat, 5 Feb 2005 10:34:31 +0000 (10:34 +0000)
* ChangeLog
* ChangeLog.claws
* ChangeLog.jp
* configure.ac
* src/compose.c
sync with HEAD
(fix bug 682 'redirect is broken'

ChangeLog
ChangeLog-gtk2.claws
ChangeLog.claws
ChangeLog.jp
PATCHSETS
configure.ac
src/compose.c

index 0baccf0..3f64918 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2005-01-25
+
+       * src/template.c: template_write_config(): fixed a memory leak.
+
+2005-01-25
+
+       * src/inc.c: inc_finished(): removed warning when updating a
+         folder item while no folder is selected.
+
+2005-01-19
+
+       * src/mh.c
+         src/utils.c
+         src/procmsg.c: ignore 0-numbered message file. Don't use symbol
+         'fileno' used in stdio.h.
+       * src/messageview.c: messageview_show(): check if
+         procmsg_msginfo_get_full_info() succeeds (fixes crash when
+         opening 0-numbered message) (thanks to WAKAI Kazunao).
+
 2005-01-11
 
        * src/template.c: template_write_config(): fixed potential memory
index fd7f80f..2b96fbd 100644 (file)
@@ -1,3 +1,13 @@
+2005-02-05 [paul]      1.0.0cvs28.1
+
+       * ChangeLog
+       * ChangeLog.claws
+       * ChangeLog.jp
+       * configure.ac
+       * src/compose.c
+               sync with HEAD
+               (fix bug 682 'redirect is broken'
+
 2005-02-05 [torte]     1.0.0cvs27.1
 
        * ChangeLog.claws
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 f7c6b1e..19e9143 100644 (file)
@@ -1,3 +1,23 @@
+2005-01-25
+
+       * src/template.c: template_write_config(): ¥á¥â¥ê¥ê¡¼¥¯¤ò½¤Àµ¡£
+
+2005-01-25
+
+       * src/inc.c: inc_finished(): ¥Õ¥©¥ë¥À¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ë
+         ¥Õ¥©¥ë¥À¥¢¥¤¥Æ¥à¤ò¹¹¿·¤·¤è¤¦¤È¤·¤¿¤È¤­¤Î·Ù¹ð¤ò½üµî¡£
+
+2005-01-19
+
+       * src/mh.c
+         src/utils.c
+         src/procmsg.c: 0È֤Υá¥Ã¥»¡¼¥¸¥Õ¥¡¥¤¥ë¤ò̵»ë¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+         stdio.h ¤Ç»ÈÍѤµ¤ì¤Æ¤¤¤ë¥·¥ó¥Ü¥ë 'fileno' ¤ò»ÈÍѤ·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+       * src/messageview.c: messageview_show():
+         procmsg_msginfo_get_full_info() ¤¬À®¸ù¤·¤¿¤«¤É¤¦¤«³Îǧ¤¹¤ë¤è¤¦¤Ë
+         ¤·¤¿(0È֤Υá¥Ã¥»¡¼¥¸¤ò³«¤³¤¦¤È¤·¤¿¤È¤­¤Ë¥¯¥é¥Ã¥·¥å¤¹¤ë¤Î¤ò½¤Àµ)
+         (¼ãµï¤µ¤ó thanks)¡£
+
 2005-01-11
 
        * src/template.c: template_write_config(): ÀøºßŪ¤Ê¥á¥â¥êÇ˲õ¥Ð¥°
index 3f844cd..024bfa0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.207.2.28 -r 1.207.2.29 src/folderview.c; cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/headerview.c; cvs diff -u -r 1.395.2.50 -r 1.395.2.51 src/summaryview.c; cvs diff -u -r 1.96.2.41 -r 1.96.2.42 src/textview.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/gtk/colorlabel.c; ) > 1.0.0cvs25.3.patchset
 ( cvs diff -u -r 1.13.2.1 -r 1.13.2.2 src/common/plugin.c; ) > 1.0.0cvs26.1.patchset
 ( cvs diff -u -r 1.2504.2.44 -r 1.2504.2.45 ChangeLog.claws; cvs diff -u -r 1.654.2.392 -r 1.654.2.393 configure.ac; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/partial_download.c; ) > 1.0.0cvs27.1.patchset
+( cvs diff -u -r 1.396.2.20 -r 1.396.2.21 ChangeLog; cvs diff -u -r 1.2504.2.45 -r 1.2504.2.46 ChangeLog.claws; cvs diff -u -r 1.391.2.20 -r 1.391.2.21 ChangeLog.jp; cvs diff -u -r 1.654.2.393 -r 1.654.2.394 configure.ac; cvs diff -u -r 1.382.2.93 -r 1.382.2.94 src/compose.c; ) > 1.0.0cvs28.1.patchset
index 5dddaad..a5d8488 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=
 EXTRA_GTK2_VERSION=.1
 
index d6ed44c..ab73eb8 100644 (file)
@@ -1386,7 +1386,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;
 
@@ -1411,7 +1411,7 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
        gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
 
        compose_quote_fmt(compose, msginfo, "%M", NULL, NULL);
-       gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), TRUE);
+       gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
 
        ifactory = gtk_item_factory_from_widget(compose->popupmenu);
        menu_set_sensitive(ifactory, "/Add...", FALSE);
@@ -1424,10 +1424,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);
        
@@ -3244,11 +3241,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);