From 07670f0dde4230956a4c575e0da5ab255853c4f2 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Wed, 3 Jan 2007 06:58:58 +0000 Subject: [PATCH] 2007-01-03 [paul] 2.6.1cvs98 * tools/maildir2claws-mail.pl only substitute 'sent-mail' if it's the full directory name --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- tools/maildir2claws-mail.pl | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41fd97466..e798cd833 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-03 [paul] 2.6.1cvs98 + + * tools/maildir2claws-mail.pl + only substitute 'sent-mail' if it's + the full directory name + 2007-01-03 [paul] 2.6.1cvs97 * ChangeLog diff --git a/PATCHSETS b/PATCHSETS index 999400fdd..1b8bec50a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2205,3 +2205,4 @@ ( cvs diff -u -r 1.4.2.46 -r 1.4.2.47 src/gtk/about.c; ) > 2.6.1cvs95.patchset ( cvs diff -u -r 1.61.2.55 -r 1.61.2.56 src/account.c; cvs diff -u -r 1.11.2.6 -r 1.11.2.7 src/account.h; cvs diff -u -r 1.12.2.40 -r 1.12.2.41 src/action.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/action.h; cvs diff -u -r 1.1.14.3 -r 1.1.14.4 src/adbookbase.h; cvs diff -u -r 1.27.2.26 -r 1.27.2.27 src/addr_compl.c; cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/addr_compl.h; cvs diff -u -r 1.22.2.11 -r 1.22.2.12 src/addrbook.c; cvs diff -u -r 1.15.2.8 -r 1.15.2.9 src/addrcache.c; cvs diff -u -r 1.9.2.4 -r 1.9.2.5 src/addrcache.h; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/addrcindex.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/addrcindex.h; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/addrclip.c; cvs diff -u -r 1.1.14.3 -r 1.1.14.4 src/addrclip.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/addrdefs.h; cvs diff -u -r 1.9.2.10 -r 1.9.2.11 src/addressadd.c; cvs diff -u -r 1.2.16.3 -r 1.2.16.4 src/addressadd.h; cvs diff -u -r 1.60.2.73 -r 1.60.2.74 src/addressbook.c; cvs diff -u -r 1.18.2.5 -r 1.18.2.6 src/addressbook.h; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/addressbook_foldersel.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/addressbook_foldersel.h; cvs diff -u -r 1.5.10.14 -r 1.5.10.15 src/addrgather.c; cvs diff -u -r 1.3.12.3 -r 1.3.12.4 src/addrgather.h; cvs diff -u -r 1.6.10.13 -r 1.6.10.14 src/addrharvest.c; cvs diff -u -r 1.4.12.3 -r 1.4.12.4 src/addrharvest.h; cvs diff -u -r 1.28.2.20 -r 1.28.2.21 src/addrindex.c; cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/addrindex.h; cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/addritem.c; cvs diff -u -r 1.12.2.5 -r 1.12.2.6 src/addritem.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/addrquery.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/addrquery.h; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/addrselect.c; cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/addrselect.h; cvs diff -u -r 1.17.2.29 -r 1.17.2.30 src/alertpanel.c; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/alertpanel.h; cvs diff -u -r 1.2.4.14 -r 1.2.4.15 src/browseldap.c; cvs diff -u -r 1.2.4.4 -r 1.2.4.5 src/browseldap.h; cvs diff -u -r 1.65.2.52 -r 1.65.2.53 src/codeconv.c; cvs diff -u -r 1.15.2.16 -r 1.15.2.17 src/codeconv.h; cvs diff -u -r 1.382.2.347 -r 1.382.2.348 src/compose.c; cvs diff -u -r 1.50.2.29 -r 1.50.2.30 src/compose.h; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/customheader.c; cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/customheader.h; cvs diff -u -r 1.2.16.3 -r 1.2.16.4 src/displayheader.c; cvs diff -u -r 1.2.16.3 -r 1.2.16.4 src/displayheader.h; cvs diff -u -r 1.14.2.19 -r 1.14.2.20 src/editaddress.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/editaddress.h; cvs diff -u -r 1.5.12.7 -r 1.5.12.8 src/editbook.c; cvs diff -u -r 1.2.16.3 -r 1.2.16.4 src/editbook.h; cvs diff -u -r 1.11.2.14 -r 1.11.2.15 src/editgroup.c; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/editgroup.h; cvs diff -u -r 1.5.12.10 -r 1.5.12.11 src/editjpilot.c; cvs diff -u -r 1.3.16.3 -r 1.3.16.4 src/editjpilot.h; cvs diff -u -r 1.8.2.16 -r 1.8.2.17 src/editldap.c; cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/editldap.h; cvs diff -u -r 1.10.2.8 -r 1.10.2.9 src/editldap_basedn.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/editldap_basedn.h; cvs diff -u -r 1.5.12.9 -r 1.5.12.10 src/editvcard.c; cvs diff -u -r 1.3.16.3 -r 1.3.16.4 src/editvcard.h; cvs diff -u -r 1.3.2.19 -r 1.3.2.20 src/exphtmldlg.c; cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/exphtmldlg.h; cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/expldifdlg.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/expldifdlg.h; cvs diff -u -r 1.8.2.22 -r 1.8.2.23 src/export.c; cvs diff -u -r 1.1.16.2 -r 1.1.16.3 src/export.h; cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/exporthtml.c; cvs diff -u -r 1.1.14.3 -r 1.1.14.4 src/exporthtml.h; cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/exportldif.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/exportldif.h; cvs diff -u -r 1.60.2.23 -r 1.60.2.24 src/filtering.c; cvs diff -u -r 1.21.2.10 -r 1.21.2.11 src/filtering.h; cvs diff -u -r 1.213.2.129 -r 1.213.2.130 src/folder.c; cvs diff -u -r 1.87.2.34 -r 1.87.2.35 src/folder.h; cvs diff -u -r 1.2.2.17 -r 1.2.2.18 src/folder_item_prefs.c; cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/folder_item_prefs.h; cvs diff -u -r 1.26.2.29 -r 1.26.2.30 src/foldersel.c; cvs diff -u -r 1.4.12.3 -r 1.4.12.4 src/foldersel.h; cvs diff -u -r 1.3.2.14 -r 1.3.2.15 src/folderutils.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/folderutils.h; cvs diff -u -r 1.207.2.140 -r 1.207.2.141 src/folderview.c; cvs diff -u -r 1.20.2.15 -r 1.20.2.16 src/folderview.h; cvs diff -u -r 1.14.2.16 -r 1.14.2.17 src/grouplistdialog.c; cvs diff -u -r 1.3.14.3 -r 1.3.14.4 src/grouplistdialog.h; cvs diff -u -r 1.8.2.18 -r 1.8.2.19 src/headerview.c; cvs diff -u -r 1.12.2.17 -r 1.12.2.18 src/html.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/html.h; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/image_viewer.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/image_viewer.h; cvs diff -u -r 1.179.2.144 -r 1.179.2.145 src/imap.c; cvs diff -u -r 1.34.2.9 -r 1.34.2.10 src/imap.h; cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/imap_gtk.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/imap_gtk.h; cvs diff -u -r 1.13.2.20 -r 1.13.2.21 src/import.c; cvs diff -u -r 1.2.16.3 -r 1.2.16.4 src/import.h; cvs diff -u -r 1.14.2.11 -r 1.14.2.12 src/importldif.c; cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/importldif.h; cvs diff -u -r 1.4.12.13 -r 1.4.12.14 src/importmutt.c; cvs diff -u -r 1.2.12.3 -r 1.2.12.4 src/importmutt.h; cvs diff -u -r 1.1.14.13 -r 1.1.14.14 src/importpine.c; cvs diff -u -r 1.1.14.3 -r 1.1.14.4 src/importpine.h; cvs diff -u -r 1.149.2.63 -r 1.149.2.64 src/inc.c; cvs diff -u -r 1.29.2.10 -r 1.29.2.11 src/inc.h; cvs diff -u -r 1.18.2.21 -r 1.18.2.22 src/jpilot.c; cvs diff -u -r 1.10.2.3 -r 1.10.2.4 src/jpilot.h; cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/ldapctrl.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/ldapctrl.h; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/ldaplocate.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/ldaplocate.h; cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/ldapquery.c; cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/ldapquery.h; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/ldapserver.c; cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/ldapserver.h; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/ldaputil.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/ldaputil.h; cvs diff -u -r 1.12.2.10 -r 1.12.2.11 src/ldif.c; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/ldif.h; cvs diff -u -r 1.115.2.121 -r 1.115.2.122 src/main.c; cvs diff -u -r 1.7.2.7 -r 1.7.2.8 src/main.h; cvs diff -u -r 1.274.2.158 -r 1.274.2.159 src/mainwindow.c; cvs diff -u -r 1.39.2.27 -r 1.39.2.28 src/mainwindow.h; cvs diff -u -r 1.11.2.10 -r 1.11.2.11 src/manual.c; cvs diff -u -r 1.8.2.5 -r 1.8.2.6 src/manual.h; cvs diff -u -r 1.28.2.31 -r 1.28.2.32 src/mbox.c; cvs diff -u -r 1.3.12.21 -r 1.3.12.22 src/message_search.c; cvs diff -u -r 1.1.16.4 -r 1.1.16.5 src/message_search.h; cvs diff -u -r 1.94.2.112 -r 1.94.2.113 src/messageview.c; cvs diff -u -r 1.19.2.12 -r 1.19.2.13 src/messageview.h; cvs diff -u -r 1.79.2.50 -r 1.79.2.51 src/mh.c; cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/mh.h; cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/mh_gtk.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/mh_gtk.h; cvs diff -u -r 1.83.2.95 -r 1.83.2.96 src/mimeview.c; cvs diff -u -r 1.20.2.17 -r 1.20.2.18 src/mimeview.h; cvs diff -u -r 1.16.2.47 -r 1.16.2.48 src/msgcache.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/msgcache.h; cvs diff -u -r 1.6.10.9 -r 1.6.10.10 src/mutt.c; cvs diff -u -r 1.3.12.3 -r 1.3.12.4 src/mutt.h; cvs diff -u -r 1.101.2.34 -r 1.101.2.35 src/news.c; cvs diff -u -r 1.21.2.5 -r 1.21.2.6 src/news.h; cvs diff -u -r 1.2.2.19 -r 1.2.2.20 src/news_gtk.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/news_gtk.h; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/partial_download.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/partial_download.h; cvs diff -u -r 1.6.2.8 -r 1.6.2.9 src/pine.c; cvs diff -u -r 1.1.14.3 -r 1.1.14.4 src/pine.h; cvs diff -u -r 1.56.2.46 -r 1.56.2.47 src/pop.c; cvs diff -u -r 1.17.2.17 -r 1.17.2.18 src/pop.h; cvs diff -u -r 1.105.2.75 -r 1.105.2.76 src/prefs_account.c; cvs diff -u -r 1.49.2.22 -r 1.49.2.23 src/prefs_account.h; cvs diff -u -r 1.60.2.43 -r 1.60.2.44 src/prefs_actions.c; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/prefs_actions.h; cvs diff -u -r 1.204.2.116 -r 1.204.2.117 src/prefs_common.c; cvs diff -u -r 1.103.2.73 -r 1.103.2.74 src/prefs_common.h; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_compose_writing.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_compose_writing.h; cvs diff -u -r 1.16.2.24 -r 1.16.2.25 src/prefs_customheader.c; cvs diff -u -r 1.2.16.3 -r 1.2.16.4 src/prefs_customheader.h; cvs diff -u -r 1.16.2.22 -r 1.16.2.23 src/prefs_display_header.c; cvs diff -u -r 1.1.16.3 -r 1.1.16.4 src/prefs_display_header.h; cvs diff -u -r 1.59.2.51 -r 1.59.2.52 src/prefs_filtering.c; cvs diff -u -r 1.6.2.5 -r 1.6.2.6 src/prefs_filtering.h; cvs diff -u -r 1.1.4.31 -r 1.1.4.32 src/prefs_filtering_action.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/prefs_filtering_action.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_folder_column.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_folder_column.h; cvs diff -u -r 1.52.2.32 -r 1.52.2.33 src/prefs_folder_item.c; cvs diff -u -r 1.17.2.3 -r 1.17.2.4 src/prefs_folder_item.h; cvs diff -u -r 1.4.2.17 -r 1.4.2.18 src/prefs_fonts.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/prefs_fonts.h; cvs diff -u -r 1.10.2.27 -r 1.10.2.28 src/prefs_gtk.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/prefs_gtk.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_image_viewer.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_image_viewer.h; cvs diff -u -r 1.43.2.49 -r 1.43.2.50 src/prefs_matcher.c; cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/prefs_matcher.h; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_message.c; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_msg_colors.h; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/prefs_other.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_quote.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_receive.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/prefs_send.c; cvs diff -u -r 1.5.2.29 -r 1.5.2.30 src/prefs_spelling.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/prefs_spelling.h; cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/prefs_summaries.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_summaries.h; cvs diff -u -r 1.10.2.15 -r 1.10.2.16 src/prefs_summary_column.c; cvs diff -u -r 1.1.16.3 -r 1.1.16.4 src/prefs_summary_column.h; cvs diff -u -r 1.12.2.38 -r 1.12.2.39 src/prefs_template.c; cvs diff -u -r 1.1.16.4 -r 1.1.16.5 src/prefs_template.h; cvs diff -u -r 1.3.2.45 -r 1.3.2.46 src/prefs_themes.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/prefs_themes.h; cvs diff -u -r 1.30.2.30 -r 1.30.2.31 src/prefs_toolbar.c; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/prefs_toolbar.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_wrapping.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_wrapping.h; cvs diff -u -r 1.10.2.11 -r 1.10.2.12 src/privacy.c; cvs diff -u -r 1.10.2.10 -r 1.10.2.11 src/privacy.h; cvs diff -u -r 1.47.2.37 -r 1.47.2.38 src/procheader.c; cvs diff -u -r 1.11.2.7 -r 1.11.2.8 src/procheader.h; cvs diff -u -r 1.49.2.84 -r 1.49.2.85 src/procmime.c; cvs diff -u -r 1.17.2.16 -r 1.17.2.17 src/procmime.h; cvs diff -u -r 1.150.2.85 -r 1.150.2.86 src/procmsg.c; cvs diff -u -r 1.60.2.36 -r 1.60.2.37 src/procmsg.h; cvs diff -u -r 1.8.2.13 -r 1.8.2.14 src/quote_fmt.c; cvs diff -u -r 1.22.2.26 -r 1.22.2.27 src/quote_fmt_parse.y; cvs diff -u -r 1.17.2.8 -r 1.17.2.9 src/recv.c; cvs diff -u -r 1.6.12.3 -r 1.6.12.4 src/recv.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/remotefolder.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/remotefolder.h; cvs diff -u -r 1.17.2.36 -r 1.17.2.37 src/send_message.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/send_message.h; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/setup.c; cvs diff -u -r 1.1.1.1.16.4 -r 1.1.1.1.16.5 src/setup.h; cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/sourcewindow.c; cvs diff -u -r 1.1.1.1.16.4 -r 1.1.1.1.16.5 src/sourcewindow.h; cvs diff -u -r 1.3.2.24 -r 1.3.2.25 src/ssl_manager.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/ssl_manager.h; cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/statusbar.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/statusbar.h; cvs diff -u -r 1.25.2.30 -r 1.25.2.31 src/stock_pixmap.c; cvs diff -u -r 1.18.2.21 -r 1.18.2.22 src/stock_pixmap.h; cvs diff -u -r 1.15.2.41 -r 1.15.2.42 src/summary_search.c; cvs diff -u -r 1.3.16.3 -r 1.3.16.4 src/summary_search.h; cvs diff -u -r 1.395.2.272 -r 1.395.2.273 src/summaryview.c; cvs diff -u -r 1.68.2.30 -r 1.68.2.31 src/summaryview.h; cvs diff -u -r 1.96.2.163 -r 1.96.2.164 src/textview.c; cvs diff -u -r 1.12.2.16 -r 1.12.2.17 src/textview.h; cvs diff -u -r 1.43.2.58 -r 1.43.2.59 src/toolbar.c; cvs diff -u -r 1.19.2.14 -r 1.19.2.15 src/toolbar.h; cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/undo.c; cvs diff -u -r 1.5.14.7 -r 1.5.14.8 src/undo.h; cvs diff -u -r 1.8.2.11 -r 1.8.2.12 src/unmime.c; cvs diff -u -r 1.2.10.4 -r 1.2.10.5 src/unmime.h; cvs diff -u -r 1.14.2.7 -r 1.14.2.8 src/vcard.c; cvs diff -u -r 1.5.12.3 -r 1.5.12.4 src/vcard.h; cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/wizard.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/wizard.h; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/base64.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/base64.h; cvs diff -u -r 1.9.2.32 -r 1.9.2.33 src/common/defs.h; cvs diff -u -r 1.10.2.4 -r 1.10.2.5 src/common/hooks.c; cvs diff -u -r 1.6.2.3 -r 1.6.2.4 src/common/hooks.h; cvs diff -u -r 1.6.2.7 -r 1.6.2.8 src/common/log.c; cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/common/log.h; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/mgutils.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/mgutils.h; cvs diff -u -r 1.6.2.11 -r 1.6.2.12 src/common/nntp.c; cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/common/nntp.h; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/common/passcrypt.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/passcrypt.h.in; cvs diff -u -r 1.13.2.24 -r 1.13.2.25 src/common/plugin.c; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/common/plugin.h; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/common/prefs.c; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/common/prefs.h; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/progressindicator.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/progressindicator.h; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/common/quoted-printable.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/common/quoted-printable.h; cvs diff -u -r 1.23.2.12 -r 1.23.2.13 src/common/session.c; cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/common/session.h; cvs diff -u -r 1.11.2.19 -r 1.11.2.20 src/common/smtp.c; cvs diff -u -r 1.6.2.10 -r 1.6.2.11 src/common/smtp.h; cvs diff -u -r 1.13.2.23 -r 1.13.2.24 src/common/socket.c; cvs diff -u -r 1.13.2.9 -r 1.13.2.10 src/common/socket.h; cvs diff -u -r 1.9.2.17 -r 1.9.2.18 src/common/ssl.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/common/ssl.h; cvs diff -u -r 1.4.2.15 -r 1.4.2.16 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/ssl_certificate.h; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/common/stringtable.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/stringtable.h; cvs diff -u -r 1.2.4.16 -r 1.2.4.17 src/common/template.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/template.h; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/common/timing.h; cvs diff -u -r 1.36.2.93 -r 1.36.2.94 src/common/utils.c; cvs diff -u -r 1.20.2.42 -r 1.20.2.43 src/common/utils.h; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/common/version.h.in; cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/common/xml.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/xml.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/xmlprops.c; cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/common/xmlprops.h; cvs diff -u -r 1.4.2.47 -r 1.4.2.48 src/gtk/about.c; cvs diff -u -r 1.2.2.14 -r 1.2.2.15 src/gtk/colorlabel.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/colorsel.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/colorsel.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/combobox.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/combobox.h; cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/description_window.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/description_window.h; cvs diff -u -r 1.2.2.28 -r 1.2.2.29 src/gtk/filesel.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/filesel.h; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/foldersort.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/foldersort.h; cvs diff -u -r 1.1.4.36 -r 1.1.4.37 src/gtk/gtksctree.c; cvs diff -u -r 1.5.2.47 -r 1.5.2.48 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.28 -r 1.4.2.29 src/gtk/gtkutils.h; cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/inputdialog.h; cvs diff -u -r 1.1.4.24 -r 1.1.4.25 src/gtk/logwindow.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/logwindow.h; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/manage_window.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/manage_window.h; cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/menu.c; cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/gtk/menu.h; cvs diff -u -r 1.5.2.39 -r 1.5.2.40 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/pluginwindow.h; cvs diff -u -r 1.12.2.30 -r 1.12.2.31 src/gtk/prefswindow.c; cvs diff -u -r 1.7.2.7 -r 1.7.2.8 src/gtk/prefswindow.h; cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/gtk/progressdialog.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/progressdialog.h; cvs diff -u -r 1.9.2.12 -r 1.9.2.13 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.3 -r 1.6.2.4 src/gtk/sslcertwindow.h; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/bogofilter/bogofilter.h; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.13.2.28 -r 1.13.2.29 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/plugins/clamav/clamav_plugin.h; cvs diff -u -r 1.9.2.22 -r 1.9.2.23 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/plugins/demo/demo.c; cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.2.4.3 -r 1.2.4.4 src/plugins/dillo_viewer/dillo_prefs.h; cvs diff -u -r 1.12.2.18 -r 1.12.2.19 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/pgpcore/passphrase.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/passphrase.h; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpcore/pgp_viewer.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/pgp_viewer.h; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpcore/plugin.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpcore/select-keys.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpcore/select-keys.h; cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/plugins/pgpcore/sgpgme.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpcore/sgpgme.h; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpinline/pgpinline.h; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpinline/plugin.c; cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/pgpmime.h; cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.18.2.45 -r 1.18.2.46 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.4.2.12 -r 1.4.2.13 src/plugins/spamassassin/spamassassin.h; cvs diff -u -r 1.23.2.32 -r 1.23.2.33 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.46 -r 1.14.2.47 src/plugins/trayicon/trayicon.c; ) > 2.6.1cvs96.patchset ( cvs diff -u -r 1.396.2.1318 -r 1.396.2.1319 ChangeLog; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 ChangeLog.gtk1; diff -u /dev/null ChangeLog.pre2.0.0; cvs diff -u -r 1.24.2.20 -r 1.24.2.21 Makefile.am; cvs diff -u -r -1.2.4.2 -r -1.2.4.3 doc/src/ChangeLog.claws-pre0.8.0; ) > 2.6.1cvs97.patchset +( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/maildir2claws-mail.pl; ) > 2.6.1cvs98.patchset diff --git a/configure.ac b/configure.ac index 50d5c581b..2eb0fe826 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=97 +EXTRA_VERSION=98 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/tools/maildir2claws-mail.pl b/tools/maildir2claws-mail.pl index 8d396f51e..eecdb9d52 100644 --- a/tools/maildir2claws-mail.pl +++ b/tools/maildir2claws-mail.pl @@ -107,7 +107,7 @@ sub process_dir() { $direc !~ m/^inbox$/) { my $tmpdir = $direc; $tmpdir =~ s/^$MAIL_dir//; - $tmpdir =~ s/sent-mail/sent/; + $tmpdir =~ s/^sent-mail$/sent/; $tmpdir =~ s/\/cur$//; $tmpdir =~ s/\/new$//; $tmpdir =~ s/^\///; @@ -141,7 +141,7 @@ sub process_file { foreach my $spl_str (@spl_str) { $spl_str =~ s/^\.//; $spl_str =~ s/\.directory$//; - $spl_str =~ s/sent-mail/sent/; + $spl_str =~ s/^sent-mail$/sent/; } $nfile = join("/", @spl_str); -- 2.25.1