sync with 0.8.5cvs19
authorPaul Mangan <paul@claws-mail.org>
Wed, 6 Nov 2002 09:46:42 +0000 (09:46 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 6 Nov 2002 09:46:42 +0000 (09:46 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/account.c

index a435580947fc01e1066731db8d0b137aef64c6c1..8f7809d5b66b275f2e058c6990a86951ff8faf31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2002-11-06
+
+       * src/account.c: account_get_special_folder(): support F_INBOX, and
+         made code cleanup.
+
+2002-11-06
+
+       * src/compose.[ch]: ComposeEntryType: changed COMPOSE_* to
+         COMPOSE_ENTRY_*, and added
+         COMPOSE_ENTRY_{REPLY_TO,SUBJECT,FOLLOWUP_TO}.
+         compose_reply()
+         compose_forward()
+         compose_redirect(): added FolderItem to the arguments, and reflect
+         settings in the item.
+         compose_entry_set(): new.
+         compose_entry_append(): code cleanup.
+         compose_entries_set_from_item(): take ComposeMode in its arguments,
+         and enabled FolderItem::use_auto_to_on_reply.
+       * src/summaryview.c: summary_reply(): pass folder_item to
+         compose_{reply,forward,redirect}().
+
 2002-11-05
 
        * src/gtkutils.[ch]:
index 7f2e288011649c983942e1be36e0274d142b32f6..7e4ae1e7b08eee1134b8f37f72c6bf354d5cc455 100644 (file)
@@ -1,3 +1,9 @@
+2002-11-06 [paul]      0.8.5claws78
+
+       * sync with 0.8.5cvs19
+               see ChangeLog 2002-11-06 for src/account.c: 
+               account_get_special_folder()
+               
 2002-11-05 [alfons]    0.8.5claws77
 
        * src/crash.c
index cf06005578a80918bed334ab026e2946d3566a06..d7c4bd678f6a9780ab7490d18c35c5b3705fbcfb 100644 (file)
@@ -1,3 +1,23 @@
+2002-11-06
+
+       * src/account.c: account_get_special_folder(): F_INBOX ¤ËÂбþ¤·¡¢
+         ¥³¡¼¥É¤òÀ°Íý¡£
+
+2002-11-06
+
+       * src/compose.[ch]: ComposeEntryType: COMPOSE_* ¤ò COMPOSE_ENTRY_*
+         ¤ËÊѹ¹¤·¡¢ COMPOSE_ENTRY_{REPLY_TO,SUBJECT,FOLLOWUP_TO} ¤òÄɲá£
+         compose_reply()
+         compose_forward()
+         compose_redirect(): FolderItem ¤ò°ú¿ô¤Ë²Ã¤¨¡¢ item ¤ÎÀßÄê¤òÈ¿±Ç
+         ¤µ¤»¤ë¤è¤¦¤Ë¤·¤¿¡£
+         compose_entry_set(): ¿·µ¬¡£
+         compose_entry_append(): ¥³¡¼¥É¤ÎÀ°Íý¡£
+         compose_entries_set_from_item(): ComposeMode ¤ò°ú¿ô¤Ë¤È¤ë¤è¤¦¤Ë¤·¡¢
+         FolderItem::use_auto_to_on_reply ¤¬Í­¸ú¤Ë¤Ê¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * src/summaryview.c: summary_reply(): folder_item ¤ò
+         compose_{reply,forward,redirect}() ¤ËÅϤ¹¤è¤¦¤Ë¤·¤¿¡£
+
 2002-11-05
 
        * src/gtkutils.[ch]:
index 0726741b41748ac6b3054b0a13bc440a11dc3476..c23ce475d15fb4cb210cb46d80ff2eb9b8bf461b 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws77
+EXTRA_VERSION=claws78
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index e8b2a34f1b8a749708a04da41e54eedf009d8af7..83539c70adfec133752eb08c434e9c42bdbf5c1e 100644 (file)
@@ -446,7 +446,14 @@ FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
 
        g_return_val_if_fail(ac_prefs != NULL, NULL);
 
-       if (type == F_OUTBOX) {
+       switch (type) {
+       case F_INBOX:
+               if (ac_prefs->folder)
+                       item = FOLDER(ac_prefs->folder)->inbox;
+               if (!item)
+                       item = folder_get_default_inbox();
+               break;
+       case F_OUTBOX:
                if (ac_prefs->set_sent_folder && ac_prefs->sent_folder) {
                        item = folder_find_item_from_identifier
                                (ac_prefs->sent_folder);
@@ -457,7 +464,8 @@ FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
                        if (!item)
                                item = folder_get_default_outbox();
                }
-       } else if (type == F_DRAFT) {
+               break;
+       case F_DRAFT:
                if (ac_prefs->set_draft_folder && ac_prefs->draft_folder) {
                        item = folder_find_item_from_identifier
                                (ac_prefs->draft_folder);
@@ -468,12 +476,14 @@ FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
                        if (!item)
                                item = folder_get_default_draft();
                }
-       } else if (type == F_QUEUE) {
+               break;
+       case F_QUEUE:
                if (ac_prefs->folder)
                        item = FOLDER(ac_prefs->folder)->queue;
                if (!item)
                        item = folder_get_default_queue();
-       } else if (type == F_TRASH) {
+               break;
+       case F_TRASH:
                if (ac_prefs->set_trash_folder && ac_prefs->trash_folder) {
                        item = folder_find_item_from_identifier
                                (ac_prefs->trash_folder);
@@ -484,6 +494,9 @@ FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
                        if (!item)
                                item = folder_get_default_trash();
                }
+               break;
+       default:
+               break;
        }
 
        return item;