From: Colin Leroy Date: Fri, 9 Jan 2009 18:51:01 +0000 (+0000) Subject: 2009-01-09 [colin] 3.7.0cvs24 X-Git-Tag: rel_3_7_1~57 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d0d370407a1826a099d361cceec276e30176249a 2009-01-09 [colin] 3.7.0cvs24 * src/main.c Win32: Fix bug 1816, 'Attaching files with command-line generates error after attaching' --- diff --git a/ChangeLog b/ChangeLog index 8851b44c8..1226be4a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-01-09 [colin] 3.7.0cvs24 + + * src/main.c + Win32: Fix bug 1816, 'Attaching files with + command-line generates error after attaching' + 2009-01-09 [paul] 3.7.0cvs23 * src/gtk/about.c diff --git a/PATCHSETS b/PATCHSETS index 50bd9b641..0119cafd0 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3685,3 +3685,4 @@ ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 doc/man/claws-mail.1; ) > 3.7.0cvs21.patchset ( cvs diff -u -r 1.61.2.91 -r 1.61.2.92 src/account.c; cvs diff -u -r 1.11.2.13 -r 1.11.2.14 src/account.h; cvs diff -u -r 1.12.2.55 -r 1.12.2.56 src/action.c; cvs diff -u -r 1.3.2.11 -r 1.3.2.12 src/action.h; cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/adbookbase.h; cvs diff -u -r 1.27.2.43 -r 1.27.2.44 src/addr_compl.c; cvs diff -u -r 1.8.2.11 -r 1.8.2.12 src/addr_compl.h; cvs diff -u -r 1.22.2.21 -r 1.22.2.22 src/addrbook.c; cvs diff -u -r 1.15.2.14 -r 1.15.2.15 src/addrcache.c; cvs diff -u -r 1.9.2.8 -r 1.9.2.9 src/addrcache.h; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/addrcindex.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/addrcindex.h; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/addrclip.c; cvs diff -u -r 1.1.14.6 -r 1.1.14.7 src/addrclip.h; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/addrcustomattr.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/addrcustomattr.h; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/addrdefs.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/addrduplicates.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/addrduplicates.h; cvs diff -u -r 1.9.2.27 -r 1.9.2.28 src/addressadd.c; cvs diff -u -r 1.2.16.6 -r 1.2.16.7 src/addressadd.h; cvs diff -u -r 1.60.2.127 -r 1.60.2.128 src/addressbook.c; cvs diff -u -r 1.18.2.14 -r 1.18.2.15 src/addressbook.h; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/addressbook_foldersel.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/addressbook_foldersel.h; cvs diff -u -r 1.5.10.27 -r 1.5.10.28 src/addrgather.c; cvs diff -u -r 1.3.12.5 -r 1.3.12.6 src/addrgather.h; cvs diff -u -r 1.6.10.19 -r 1.6.10.20 src/addrharvest.c; cvs diff -u -r 1.4.12.6 -r 1.4.12.7 src/addrharvest.h; cvs diff -u -r 1.28.2.37 -r 1.28.2.38 src/addrindex.c; cvs diff -u -r 1.9.2.15 -r 1.9.2.16 src/addrindex.h; cvs diff -u -r 1.13.2.17 -r 1.13.2.18 src/addritem.c; cvs diff -u -r 1.12.2.14 -r 1.12.2.15 src/addritem.h; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/addrquery.c; cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/addrquery.h; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/addrselect.c; cvs diff -u -r 1.1.14.7 -r 1.1.14.8 src/addrselect.h; cvs diff -u -r 1.17.2.39 -r 1.17.2.40 src/alertpanel.c; cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/alertpanel.h; cvs diff -u -r 1.2.4.22 -r 1.2.4.23 src/browseldap.c; cvs diff -u -r 1.2.4.6 -r 1.2.4.7 src/browseldap.h; cvs diff -u -r 1.65.2.64 -r 1.65.2.65 src/codeconv.c; cvs diff -u -r 1.15.2.21 -r 1.15.2.22 src/codeconv.h; cvs diff -u -r 1.382.2.492 -r 1.382.2.493 src/compose.c; cvs diff -u -r 1.50.2.52 -r 1.50.2.53 src/compose.h; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/customheader.c; cvs diff -u -r 1.2.16.6 -r 1.2.16.7 src/customheader.h; cvs diff -u -r 1.2.16.5 -r 1.2.16.6 src/displayheader.c; cvs diff -u -r 1.2.16.5 -r 1.2.16.6 src/displayheader.h; cvs diff -u -r 1.14.2.54 -r 1.14.2.55 src/editaddress.c; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/editaddress.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/editaddress_other_attributes_ldap.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/editaddress_other_attributes_ldap.h; cvs diff -u -r 1.5.12.13 -r 1.5.12.14 src/editbook.c; cvs diff -u -r 1.2.16.5 -r 1.2.16.6 src/editbook.h; cvs diff -u -r 1.11.2.20 -r 1.11.2.21 src/editgroup.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/editgroup.h; cvs diff -u -r 1.5.12.15 -r 1.5.12.16 src/editjpilot.c; cvs diff -u -r 1.3.16.5 -r 1.3.16.6 src/editjpilot.h; cvs diff -u -r 1.8.2.33 -r 1.8.2.34 src/editldap.c; cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/editldap.h; cvs diff -u -r 1.10.2.15 -r 1.10.2.16 src/editldap_basedn.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/editldap_basedn.h; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/edittags.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/edittags.h; cvs diff -u -r 1.5.12.14 -r 1.5.12.15 src/editvcard.c; cvs diff -u -r 1.3.16.5 -r 1.3.16.6 src/editvcard.h; cvs diff -u -r 1.3.2.25 -r 1.3.2.26 src/exphtmldlg.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/exphtmldlg.h; cvs diff -u -r 1.1.4.30 -r 1.1.4.31 src/expldifdlg.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/expldifdlg.h; cvs diff -u -r 1.8.2.27 -r 1.8.2.28 src/export.c; cvs diff -u -r 1.1.16.4 -r 1.1.16.5 src/export.h; cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/exporthtml.c; cvs diff -u -r 1.1.14.6 -r 1.1.14.7 src/exporthtml.h; cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/exportldif.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/exportldif.h; cvs diff -u -r 1.60.2.49 -r 1.60.2.50 src/filtering.c; cvs diff -u -r 1.21.2.16 -r 1.21.2.17 src/filtering.h; cvs diff -u -r 1.213.2.185 -r 1.213.2.186 src/folder.c; cvs diff -u -r 1.87.2.57 -r 1.87.2.58 src/folder.h; cvs diff -u -r 1.2.2.32 -r 1.2.2.33 src/folder_item_prefs.c; cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/folder_item_prefs.h; cvs diff -u -r 1.26.2.39 -r 1.26.2.40 src/foldersel.c; cvs diff -u -r 1.4.12.7 -r 1.4.12.8 src/foldersel.h; cvs diff -u -r 1.3.2.17 -r 1.3.2.18 src/folderutils.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/folderutils.h; cvs diff -u -r 1.207.2.209 -r 1.207.2.210 src/folderview.c; cvs diff -u -r 1.20.2.24 -r 1.20.2.25 src/folderview.h; cvs diff -u -r 1.14.2.23 -r 1.14.2.24 src/grouplistdialog.c; cvs diff -u -r 1.3.14.5 -r 1.3.14.6 src/grouplistdialog.h; cvs diff -u -r 1.8.2.28 -r 1.8.2.29 src/headerview.c; cvs diff -u -r 1.12.2.26 -r 1.12.2.27 src/html.c; cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/html.h; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/image_viewer.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/image_viewer.h; cvs diff -u -r 1.179.2.238 -r 1.179.2.239 src/imap.c; cvs diff -u -r 1.34.2.20 -r 1.34.2.21 src/imap.h; cvs diff -u -r 1.1.2.61 -r 1.1.2.62 src/imap_gtk.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/imap_gtk.h; cvs diff -u -r 1.13.2.26 -r 1.13.2.27 src/import.c; cvs diff -u -r 1.2.16.5 -r 1.2.16.6 src/import.h; cvs diff -u -r 1.14.2.21 -r 1.14.2.22 src/importldif.c; cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/importldif.h; cvs diff -u -r 1.4.12.19 -r 1.4.12.20 src/importmutt.c; cvs diff -u -r 1.2.12.5 -r 1.2.12.6 src/importmutt.h; cvs diff -u -r 1.1.14.19 -r 1.1.14.20 src/importpine.c; cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/importpine.h; cvs diff -u -r 1.149.2.97 -r 1.149.2.98 src/inc.c; cvs diff -u -r 1.29.2.14 -r 1.29.2.15 src/inc.h; cvs diff -u -r 1.18.2.27 -r 1.18.2.28 src/jpilot.c; cvs diff -u -r 1.10.2.6 -r 1.10.2.7 src/jpilot.h; cvs diff -u -r 1.2.2.17 -r 1.2.2.18 src/ldapctrl.c; cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/ldapctrl.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/ldaplocate.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/ldaplocate.h; cvs diff -u -r 1.3.2.29 -r 1.3.2.30 src/ldapquery.c; cvs diff -u -r 1.4.2.12 -r 1.4.2.13 src/ldapquery.h; cvs diff -u -r 1.4.2.16 -r 1.4.2.17 src/ldapserver.c; cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/ldapserver.h; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/ldapupdate.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/ldapupdate.h; cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/ldaputil.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/ldaputil.h; cvs diff -u -r 1.12.2.18 -r 1.12.2.19 src/ldif.c; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/ldif.h; cvs diff -u -r 1.115.2.216 -r 1.115.2.217 src/main.c; cvs diff -u -r 1.7.2.17 -r 1.7.2.18 src/main.h; cvs diff -u -r 1.274.2.293 -r 1.274.2.294 src/mainwindow.c; cvs diff -u -r 1.39.2.54 -r 1.39.2.55 src/mainwindow.h; cvs diff -u -r 1.11.2.14 -r 1.11.2.15 src/manual.c; cvs diff -u -r 1.8.2.9 -r 1.8.2.10 src/manual.h; cvs diff -u -r 1.28.2.43 -r 1.28.2.44 src/mbox.c; cvs diff -u -r 1.3.12.32 -r 1.3.12.33 src/message_search.c; cvs diff -u -r 1.1.16.6 -r 1.1.16.7 src/message_search.h; cvs diff -u -r 1.94.2.195 -r 1.94.2.196 src/messageview.c; cvs diff -u -r 1.19.2.22 -r 1.19.2.23 src/messageview.h; cvs diff -u -r 1.79.2.67 -r 1.79.2.68 src/mh.c; cvs diff -u -r 1.9.2.8 -r 1.9.2.9 src/mh.h; cvs diff -u -r 1.2.2.34 -r 1.2.2.35 src/mh_gtk.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/mh_gtk.h; cvs diff -u -r 1.83.2.152 -r 1.83.2.153 src/mimeview.c; cvs diff -u -r 1.20.2.28 -r 1.20.2.29 src/mimeview.h; cvs diff -u -r 1.16.2.63 -r 1.16.2.64 src/msgcache.c; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/msgcache.h; cvs diff -u -r 1.6.10.15 -r 1.6.10.16 src/mutt.c; cvs diff -u -r 1.3.12.5 -r 1.3.12.6 src/mutt.h; cvs diff -u -r 1.101.2.58 -r 1.101.2.59 src/news.c; cvs diff -u -r 1.21.2.8 -r 1.21.2.9 src/news.h; cvs diff -u -r 1.2.2.29 -r 1.2.2.30 src/news_gtk.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/news_gtk.h; cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/partial_download.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/partial_download.h; cvs diff -u -r 1.6.2.14 -r 1.6.2.15 src/pine.c; cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/pine.h; cvs diff -u -r 1.56.2.64 -r 1.56.2.65 src/pop.c; cvs diff -u -r 1.17.2.22 -r 1.17.2.23 src/pop.h; cvs diff -u -r 1.105.2.149 -r 1.105.2.150 src/prefs_account.c; cvs diff -u -r 1.49.2.41 -r 1.49.2.42 src/prefs_account.h; cvs diff -u -r 1.60.2.67 -r 1.60.2.68 src/prefs_actions.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/prefs_actions.h; cvs diff -u -r 1.204.2.184 -r 1.204.2.185 src/prefs_common.c; cvs diff -u -r 1.103.2.120 -r 1.103.2.121 src/prefs_common.h; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_compose_writing.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_compose_writing.h; cvs diff -u -r 1.16.2.33 -r 1.16.2.34 src/prefs_customheader.c; cvs diff -u -r 1.2.16.6 -r 1.2.16.7 src/prefs_customheader.h; cvs diff -u -r 1.16.2.35 -r 1.16.2.36 src/prefs_display_header.c; cvs diff -u -r 1.1.16.6 -r 1.1.16.7 src/prefs_display_header.h; cvs diff -u -r 1.59.2.75 -r 1.59.2.76 src/prefs_filtering.c; cvs diff -u -r 1.6.2.8 -r 1.6.2.9 src/prefs_filtering.h; cvs diff -u -r 1.1.4.58 -r 1.1.4.59 src/prefs_filtering_action.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/prefs_filtering_action.h; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_folder_column.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_folder_column.h; cvs diff -u -r 1.52.2.70 -r 1.52.2.71 src/prefs_folder_item.c; cvs diff -u -r 1.17.2.6 -r 1.17.2.7 src/prefs_folder_item.h; cvs diff -u -r 1.4.2.24 -r 1.4.2.25 src/prefs_fonts.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/prefs_fonts.h; cvs diff -u -r 1.10.2.38 -r 1.10.2.39 src/prefs_gtk.c; cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/prefs_gtk.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_image_viewer.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_image_viewer.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_logging.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_logging.h; cvs diff -u -r 1.43.2.78 -r 1.43.2.79 src/prefs_matcher.c; cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/prefs_matcher.h; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_message.c; cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_msg_colors.h; cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/prefs_other.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_quote.c; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_receive.c; cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_send.c; cvs diff -u -r 1.5.2.39 -r 1.5.2.40 src/prefs_spelling.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/prefs_spelling.h; cvs diff -u -r 1.1.2.58 -r 1.1.2.59 src/prefs_summaries.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_summaries.h; cvs diff -u -r 1.10.2.23 -r 1.10.2.24 src/prefs_summary_column.c; cvs diff -u -r 1.1.16.6 -r 1.1.16.7 src/prefs_summary_column.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_summary_open.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_summary_open.h; cvs diff -u -r 1.12.2.67 -r 1.12.2.68 src/prefs_template.c; cvs diff -u -r 1.1.16.9 -r 1.1.16.10 src/prefs_template.h; cvs diff -u -r 1.3.2.62 -r 1.3.2.63 src/prefs_themes.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/prefs_themes.h; cvs diff -u -r 1.30.2.54 -r 1.30.2.55 src/prefs_toolbar.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/prefs_toolbar.h; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_wrapping.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_wrapping.h; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/printing.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/printing.h; cvs diff -u -r 1.10.2.17 -r 1.10.2.18 src/privacy.c; cvs diff -u -r 1.10.2.18 -r 1.10.2.19 src/privacy.h; cvs diff -u -r 1.47.2.49 -r 1.47.2.50 src/procheader.c; cvs diff -u -r 1.11.2.10 -r 1.11.2.11 src/procheader.h; cvs diff -u -r 1.49.2.123 -r 1.49.2.124 src/procmime.c; cvs diff -u -r 1.17.2.22 -r 1.17.2.23 src/procmime.h; cvs diff -u -r 1.150.2.111 -r 1.150.2.112 src/procmsg.c; cvs diff -u -r 1.60.2.54 -r 1.60.2.55 src/procmsg.h; cvs diff -u -r 1.8.2.37 -r 1.8.2.38 src/quote_fmt.c; cvs diff -u -r 1.17.2.14 -r 1.17.2.15 src/recv.c; cvs diff -u -r 1.6.12.8 -r 1.6.12.9 src/recv.h; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/remotefolder.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/remotefolder.h; cvs diff -u -r 1.17.2.52 -r 1.17.2.53 src/send_message.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/send_message.h; cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/setup.c; cvs diff -u -r 1.1.1.1.16.6 -r 1.1.1.1.16.7 src/setup.h; cvs diff -u -r 1.9.2.23 -r 1.9.2.24 src/sourcewindow.c; cvs diff -u -r 1.1.1.1.16.8 -r 1.1.1.1.16.9 src/sourcewindow.h; cvs diff -u -r 1.3.2.32 -r 1.3.2.33 src/ssl_manager.c; cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/ssl_manager.h; cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/statusbar.c; cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/statusbar.h; cvs diff -u -r 1.25.2.63 -r 1.25.2.64 src/stock_pixmap.c; cvs diff -u -r 1.18.2.40 -r 1.18.2.41 src/stock_pixmap.h; cvs diff -u -r 1.15.2.56 -r 1.15.2.57 src/summary_search.c; cvs diff -u -r 1.3.16.5 -r 1.3.16.6 src/summary_search.h; cvs diff -u -r 1.395.2.403 -r 1.395.2.404 src/summaryview.c; cvs diff -u -r 1.68.2.50 -r 1.68.2.51 src/summaryview.h; cvs diff -u -r 1.96.2.214 -r 1.96.2.215 src/textview.c; cvs diff -u -r 1.12.2.25 -r 1.12.2.26 src/textview.h; cvs diff -u -r 1.43.2.105 -r 1.43.2.106 src/toolbar.c; cvs diff -u -r 1.19.2.30 -r 1.19.2.31 src/toolbar.h; cvs diff -u -r 1.13.2.17 -r 1.13.2.18 src/undo.c; cvs diff -u -r 1.5.14.10 -r 1.5.14.11 src/undo.h; cvs diff -u -r 1.8.2.13 -r 1.8.2.14 src/unmime.c; cvs diff -u -r 1.2.10.6 -r 1.2.10.7 src/unmime.h; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/uri_opener.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/uri_opener.h; cvs diff -u -r 1.14.2.16 -r 1.14.2.17 src/vcard.c; cvs diff -u -r 1.5.12.6 -r 1.5.12.7 src/vcard.h; cvs diff -u -r 1.1.2.77 -r 1.1.2.78 src/wizard.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/wizard.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/base64.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/base64.h; cvs diff -u -r 1.9.2.47 -r 1.9.2.48 src/common/defs.h; cvs diff -u -r 1.10.2.7 -r 1.10.2.8 src/common/hooks.c; cvs diff -u -r 1.6.2.5 -r 1.6.2.6 src/common/hooks.h; cvs diff -u -r 1.6.2.20 -r 1.6.2.21 src/common/log.c; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/common/log.h; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/common/mgutils.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/mgutils.h; cvs diff -u -r 1.3.2.11 -r 1.3.2.12 src/common/passcrypt.c; cvs diff -u -r 1.13.2.35 -r 1.13.2.36 src/common/plugin.c; cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/common/plugin.h; cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/common/prefs.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/common/prefs.h; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/progressindicator.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/progressindicator.h; cvs diff -u -r 1.3.2.14 -r 1.3.2.15 src/common/quoted-printable.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/common/quoted-printable.h; cvs diff -u -r 1.23.2.21 -r 1.23.2.22 src/common/session.c; cvs diff -u -r 1.8.2.15 -r 1.8.2.16 src/common/session.h; cvs diff -u -r 1.11.2.26 -r 1.11.2.27 src/common/smtp.c; cvs diff -u -r 1.6.2.16 -r 1.6.2.17 src/common/smtp.h; cvs diff -u -r 1.13.2.42 -r 1.13.2.43 src/common/socket.c; cvs diff -u -r 1.13.2.22 -r 1.13.2.23 src/common/socket.h; cvs diff -u -r 1.9.2.39 -r 1.9.2.40 src/common/ssl.c; cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/common/ssl.h; cvs diff -u -r 1.4.2.34 -r 1.4.2.35 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/common/ssl_certificate.h; cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/common/stringtable.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/stringtable.h; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/common/tags.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/tags.h; cvs diff -u -r 1.2.4.28 -r 1.2.4.29 src/common/template.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/common/template.h; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/common/timing.h; cvs diff -u -r 1.36.2.161 -r 1.36.2.162 src/common/utils.c; cvs diff -u -r 1.20.2.66 -r 1.20.2.67 src/common/utils.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_account.c; cvs diff -u -r 1.1.4.24 -r 1.1.4.25 src/common/xml.c; cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/common/xml.h; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/common/xmlprops.c; cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/common/xmlprops.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/etpan/etpan-errors.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/etpan/etpan-thread-manager-types.h; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/etpan/etpan-thread-manager.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/etpan/etpan-thread-manager.h; cvs diff -u -r 1.1.4.106 -r 1.1.4.107 src/etpan/imap-thread.c; cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/etpan/imap-thread.h; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/etpan/nntp-thread.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/etpan/nntp-thread.h; cvs diff -u -r 1.4.2.71 -r 1.4.2.72 src/gtk/about.c; cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/gtk/colorlabel.c; cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/gtk/colorsel.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/colorsel.h; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/combobox.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/combobox.h; cvs diff -u -r 1.5.2.27 -r 1.5.2.28 src/gtk/description_window.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/description_window.h; cvs diff -u -r 1.2.2.39 -r 1.2.2.40 src/gtk/filesel.c; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/gtk/filesel.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/foldersort.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/foldersort.h; cvs diff -u -r 1.1.4.53 -r 1.1.4.54 src/gtk/gtksctree.c; cvs diff -u -r 1.5.2.86 -r 1.5.2.87 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.47 -r 1.4.2.48 src/gtk/gtkutils.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/icon_legend.c; cvs diff -u -r 1.2.2.35 -r 1.2.2.36 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/inputdialog.h; cvs diff -u -r 1.1.4.33 -r 1.1.4.34 src/gtk/logwindow.c; cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/gtk/logwindow.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/manage_window.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/manage_window.h; cvs diff -u -r 1.5.2.38 -r 1.5.2.39 src/gtk/menu.c; cvs diff -u -r 1.4.2.21 -r 1.4.2.22 src/gtk/menu.h; cvs diff -u -r 1.5.2.56 -r 1.5.2.57 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/pluginwindow.h; cvs diff -u -r 1.12.2.50 -r 1.12.2.51 src/gtk/prefswindow.c; cvs diff -u -r 1.7.2.14 -r 1.7.2.15 src/gtk/prefswindow.h; cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/gtk/progressdialog.c; cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/gtk/progressdialog.h; cvs diff -u -r 1.1.2.85 -r 1.1.2.86 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/quicksearch.h; cvs diff -u -r 1.9.2.27 -r 1.9.2.28 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.10 -r 1.6.2.11 src/gtk/sslcertwindow.h; cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/bogofilter/bogofilter.h; cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.13.2.17 -r 1.13.2.18 src/plugins/demo/demo.c; cvs diff -u -r 1.5.2.24 -r 1.5.2.25 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.2.4.8 -r 1.2.4.9 src/plugins/dillo_viewer/dillo_prefs.h; cvs diff -u -r 1.12.2.27 -r 1.12.2.28 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/pgpcore/passphrase.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpcore/passphrase.h; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpcore/pgp_viewer.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/pgp_viewer.h; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpcore/plugin.c; cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/plugins/pgpcore/prefs_gpg.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/prefs_gpg.h; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/plugins/pgpcore/select-keys.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpcore/select-keys.h; cvs diff -u -r 1.1.2.60 -r 1.1.2.61 src/plugins/pgpcore/sgpgme.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/sgpgme.h; cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpinline/pgpinline.h; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/pgpinline/plugin.c; cvs diff -u -r 1.1.2.52 -r 1.1.2.53 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpmime/pgpmime.h; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/smime/plugin.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/smime/smime.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/smime/smime.h; cvs diff -u -r 1.18.2.61 -r 1.18.2.62 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/plugins/spamassassin/spamassassin.h; cvs diff -u -r 1.23.2.52 -r 1.23.2.53 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.67 -r 1.14.2.68 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/trayicon/trayicon_prefs.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/trayicon/trayicon_prefs.h; ) > 3.7.0cvs22.patchset ( cvs diff -u -r 1.4.2.72 -r 1.4.2.73 src/gtk/about.c; ) > 3.7.0cvs23.patchset +( cvs diff -u -r 1.115.2.217 -r 1.115.2.218 src/main.c; ) > 3.7.0cvs24.patchset diff --git a/configure.ac b/configure.ac index 598e1bc41..cc8d9c90d 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=23 +EXTRA_VERSION=24 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/main.c b/src/main.c index 884b53a79..af1017661 100644 --- a/src/main.c +++ b/src/main.c @@ -2341,10 +2341,9 @@ static void lock_socket_input_cb(gpointer data, mailto = g_strdup(buf + strlen("compose_attach") + 1); files = g_ptr_array_new(); while (fd_gets(sock, buf, sizeof(buf)) > 0) { - if (buf[0] == '.' && buf[1] == '\n') { - break; - } strretchomp(buf); + if (!strcmp2(buf, ".")) + break; g_ptr_array_add(files, g_strdup(buf)); } open_compose_new(mailto, files);