code cleanup; bug fixes

diff --git a/ChangeLog b/ChangeLog
index 6e8f933..af29fc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2003-11-14
+
+       * src/folder.h: added 'updated' flag to FolderItem.
+       * src/folderview.[ch]: folderview_update_all_updated(): new. It
+         updates all updated folders.
+       * src/imap.c: set FolderView::update flag on changes of contents.
+       * src/main.c: send_queue()
+         src/mainwindow.c: send_queue_cb(): code cleanup.
+       * src/mh.c: code cleanup.
+         mh_scan_folder(): correctly count new messages.
+       * src/procmsg.[ch]: code cleanup.
+         procmsg_open_cache_file(): new.
+         procmsg_open_mark_file(): enable read/write/append.
+         procmsg_send_queue(): correctly choose outbox for accounts.
+       * src/send_message.[ch]: send_get_queue_info(): get a queue
+         information from queued messages.
+         send_queue_info_free(): free QueueInfo.
+         send_message_queue(): take QueueInfo as an argument instead of file.  
+       * src/summaryview.c: summary_write_cache(): code cleanup.
+
+2003-11-10
+
+       * src/compose.c: compose_redirect_write_headers(): correctly add
+         Resent-Cc: header.
+
+2003-11-05
+
+       * src/imap.c: imap_get_msg_list(): fallback to FETCH command if SEARCH
+         command to get flags failed.
+         imap_search_flags(): returns UID array and flags hash table using
+         SEARCH command.
+         imap_fetch_flags(): returns UID array and flags hash table using
+         FETCH command.
+
 2003-10-28
 
        * src/summary_search.c: summary_search_execute(): fixed 'Select all

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1ed7109..80a8867 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,16 @@
+2003-11-19 [paul]      0.9.6claws81
+
+       * src/compose.c
+               compose_redirect_write_headers_from_headerlist(): 
+               add Resent-Cc: header (bug fix inherited from 0.9.7cvs3)
+               
+       * src/main.c
+               code cleanup (inherited from 0.9.7cvs4)
+               
+       * tools/tb2sylpheed
+               bugfix: added missing attribute-list start. submitted by
+               Urke MMI
+
 2003-11-19 [luke]      0.9.6claws80
        * src/textview.c
                revert my last commit until I get time to fix it

diff --git a/ChangeLog.jp b/ChangeLog.jp
index ac9216c..571f33e 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,40 @@
+2003-11-14
+
+       * src/folder.h: FolderItem ¤Ë 'updated' ¥Õ¥é¥°¤òÄɲá£
+       * src/folderview.[ch]: folderview_update_all_updated(): ¿·µ¬¡£Á´¤Æ¤Î
+         ¹¹¿·¤µ¤ì¤¿¥Õ¥©¥ë¥À¤ò¹¹¿·¤¹¤ë¡£
+       * src/imap.c: ÆâÍƤÎÊѹ¹»þ¤Ë FolderView::update ¥Õ¥é¥°¤ò¥»¥Ã¥È¡£
+       * src/main.c: send_queue()
+         src/mainwindow.c: send_queue_cb(): ¥³¡¼¥É¤ÎÀ°Íý¡£
+       * src/mh.c: ¥³¡¼¥É¤ÎÀ°Íý¡£
+         mh_scan_folder(): ¿·Ãå¥á¥Ã¥»¡¼¥¸¤òÀµ¤·¤¯¥«¥¦¥ó¥È¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * src/procmsg.[ch]: ¥³¡¼¥É¤ÎÀ°Íý¡£
+         procmsg_open_cache_file(): ¿·µ¬¡£
+         procmsg_open_mark_file(): Æɤ߹þ¤ß/½ñ¤­¹þ¤ß/Äɲýñ¤­¹þ¤ß¤¬¤Ç¤­¤ë
+         ¤è¤¦¤Ë¤·¤¿¡£
+         procmsg_send_queue(): ¥¢¥«¥¦¥ó¥È¤ËÂбþ¤¹¤ëÁ÷¿®¹µ¤òÀµ¤·¤¯ÁªÂò¤¹¤ë
+         ¤è¤¦¤Ë¤·¤¿¡£
+       * src/send_message.[ch]: send_get_queue_info(): Á÷¿®ÂÔ¤Á¥á¥Ã¥»¡¼¥¸
+         ¤«¤é¥­¥å¡¼¾ðÊó¤ò¼èÆÀ¡£
+         send_queue_info_free(): QueueInfo ¤ò³«Êü¡£
+         send_message_queue(): ¥Õ¥¡¥¤¥ë¤ÎÂå¤ï¤ê¤Ë QueueInfo ¤ò°ú¿ô¤Ë¤È¤ë
+         ¤è¤¦¤Ë¤·¤¿¡£
+       * src/summaryview.c: summary_write_cache(): ¥³¡¼¥É¤ÎÀ°Íý¡£
+
+2003-11-10
+
+       * src/compose.c: compose_redirect_write_headers(): Resent-Cc: ¥Ø¥Ã¥À
+         ¤òÀµ¤·¤¯Éղ乤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2003-11-05
+
+       * src/imap.c: imap_get_msg_list(): ¥Õ¥é¥°¤òÆÀ¤ë¤¿¤á¤Î SEARCH ¥³¥Þ¥ó¥É
+         ¤Ë¼ºÇÔ¤·¤¿¾ì¹ç FETCH ¥³¥Þ¥ó¥É¤Ë fallback ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+         imap_search_flags(): SEARCH ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ UID ¤ÎÇÛÎó¤È¥Õ¥é¥°¤Î
+         ¥Ï¥Ã¥·¥å¥Æ¡¼¥Ö¥ë¤òÊÖ¤¹¡£
+         imap_fetch_flags(): FETCH ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ UID ¤ÎÇÛÎó¤È¥Õ¥é¥°¤Î
+         ¥Ï¥Ã¥·¥å¥Æ¡¼¥Ö¥ë¤òÊÖ¤¹¡£
+
 2003-10-28
 
        * src/summary_search.c: summary_search_execute(): ¸åÊý¸¡º÷¤¬Í­¸ú¤Ê

diff --git a/configure.ac b/configure.ac
index a36a936..7604901 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=80
+EXTRA_VERSION=81
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/compose.c b/src/compose.c
index 4cd00fc..1a27b1a 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3235,7 +3235,8 @@ static gint compose_redirect_write_headers_from_headerlist(Compose *compose,
 {
        gchar buf[BUFFSIZE];
        gchar *str;
-       gboolean first_address;
+       gboolean first_to_address;
+       gboolean first_cc_address;
        GSList *list;
        ComposeHeaderEntry *headerentry;
        gchar *headerentryname;
@@ -3247,7 +3248,8 @@ static gint compose_redirect_write_headers_from_headerlist(Compose *compose,
        cc_hdr = prefs_common.trans_hdr ? _("Cc:") : "Cc:";
        to_hdr = prefs_common.trans_hdr ? _("To:") : "To:";
 
-       first_address = TRUE;
+       first_to_address = TRUE;
+       first_cc_address = TRUE;
        for (list = compose->header_list; list; list = list->next) {
                headerentry = ((ComposeHeaderEntry *)list->data);
                headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
@@ -3261,12 +3263,24 @@ static gint compose_redirect_write_headers_from_headerlist(Compose *compose,
                                compose_convert_header
                                        (buf, sizeof(buf), str,
                                        strlen("Resent-To") + 2, TRUE);
-                               if (first_address) {
-                                       fprintf(fp, "Resent-To: ");
-                                       first_address = FALSE;
-                               } else {
-                                       fprintf(fp, ",");
+                               if (g_strcasecmp(headerentryname, to_hdr) == 0) {
+                                       if (first_to_address) {
+                                               fprintf(fp, "Resent-To: ");
+                                               first_to_address = FALSE;
+                                       } else {
+                                               fprintf(fp, ",");
+                                       }
+                               }
+                               if (g_strcasecmp(headerentryname, cc_hdr) == 0) {
+                                       if (first_cc_address) {
+                                               fprintf(fp, "\n");
+                                               fprintf(fp, "Resent-Cc: ");
+                                               first_cc_address = FALSE;
+                                       } else {
+                                               fprintf(fp, ",");
+                                       }
                                }
+                               
                                fprintf(fp, "%s", buf);
                        }
                }

diff --git a/src/main.c b/src/main.c
index 123e210..13bc4f8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -877,9 +877,6 @@ static void open_compose_new(const gchar *address, GPtrArray *attach_files)
 static void send_queue(void)
 {
        GList *list;
-       FolderItem *def_outbox;
-
-       def_outbox = folder_get_default_outbox();
 
        for (list = folder_get_list(); list != NULL; list = list->next) {
                Folder *folder = list->data;
@@ -892,10 +889,6 @@ static void send_queue(void)
                                alertpanel_error(_("Some errors occurred while sending queued messages."));
                        if (res)        
                                folder_item_scan(folder->queue);
-                       if (prefs_common.savemsg && folder->outbox) {
-                               if (folder->outbox == def_outbox)
-                                       def_outbox = NULL;
-                       }
                }
        }
 }

diff --git a/tools/tb2sylpheed b/tools/tb2sylpheed
index 05082eb..06d7128 100644 (file)
--- a/tools/tb2sylpheed
+++ b/tools/tb2sylpheed
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # Script name : tb2sylpheed
-# Script version: 1.0.1
+# Script version: 1.0.2
 # Script based on : script kmail2sylpheed.pl
 # Script purpose : convert The Bat! addressbook into Sylpheed addressbook
 # Author : Aleksandar Urosevic aka Urke MMI <urke@gmx.net>
@@ -15,6 +15,9 @@
 #
 # Change Log:
 #
+# 18-12-2003 v 1.0.2
+#      - bugfix: added missing attribute-list start
+#
 # 01-01-2003 v 1.0.1
 #      - bugfix: no more empty Business Homepage entry
 #      - bugfix: no more \0D\0A´s in Notes entry
@@ -110,6 +113,7 @@ foreach $tbline (@tblines) {
     }
 
     if ($check > 0) {
+    $sylph_addr .= "    <attribute-list>\n";
        if ($tbdata[1] ne "" || $tbdata[2] ne "") {
            $time++;
            if($tbdata[29] ne "" && $tbdata[1] ne "") { $full_name = "$tbdata[29] $tbdata[1]"; } else { $full_name = "$tbdata[1]"; }
@@ -237,6 +241,10 @@ foreach $tbline (@tblines) {
        }
        $sylph_addr .= "    </attribute-list>\n";
     }
+#    if ( $check > 0 ) {
+#        $sylph_addr .= "</attribute-list>\n";
+#    }
+
     $sylph_addr .=  "  </person>\n";
     $time++;
 }