From 6f75a14a765723233d6c64bf728639b227eba161 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 7 Jul 2012 07:30:57 +0000 Subject: [PATCH] 2012-07-07 [colin] 3.8.1cvs8 * claws-features.h.in * src/codeconv.h * src/imap_gtk.h * src/inc.h * src/jpilot.h * src/messageview.h * src/msgcache.h * src/news_gtk.h * src/partial_download.h * src/pop.h * src/prefs_account.h * src/prefs_common.h * src/printing.h * src/procmime.h * src/procmsg.h * src/stock_pixmap.c * src/textview.h * src/common/defs.h * src/common/log.h * src/common/session.h * src/common/smtp.h * src/common/socket.h * src/common/ssl.h * src/common/ssl_certificate.h * src/common/timing.h * src/common/utils.h * src/gtk/gtkaspell.h * src/gtk/gtkutils.h * src/gtk/pluginwindow.h * src/gtk/spell_entry.h * src/gtk/sslcertwindow.h Don't export config.h in public headers --- ChangeLog | 35 +++++++++++++++++++++++++++++++++++ PATCHSETS | 1 + claws-features.h.in | 3 +++ configure.ac | 2 +- src/codeconv.h | 1 - src/common/defs.h | 1 - src/common/log.h | 1 - src/common/session.h | 1 - src/common/smtp.h | 1 - src/common/socket.h | 1 - src/common/ssl.h | 1 - src/common/ssl_certificate.h | 1 - src/common/timing.h | 1 - src/common/utils.h | 1 - src/gtk/gtkaspell.h | 1 - src/gtk/gtkutils.h | 1 - src/gtk/pluginwindow.h | 1 - src/gtk/spell_entry.h | 1 - src/gtk/sslcertwindow.h | 1 - src/imap_gtk.h | 1 - src/inc.h | 1 - src/jpilot.h | 1 - src/messageview.h | 1 - src/msgcache.h | 1 - src/news_gtk.h | 1 - src/partial_download.h | 1 - src/pop.h | 1 - src/prefs_account.h | 1 - src/prefs_common.h | 1 - src/printing.h | 1 - src/procmime.h | 1 - src/procmsg.h | 1 - src/stock_pixmap.c | 1 + src/textview.h | 1 - 34 files changed, 41 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9245b084..9f1a6d084 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +2012-07-07 [colin] 3.8.1cvs8 + + * claws-features.h.in + * src/codeconv.h + * src/imap_gtk.h + * src/inc.h + * src/jpilot.h + * src/messageview.h + * src/msgcache.h + * src/news_gtk.h + * src/partial_download.h + * src/pop.h + * src/prefs_account.h + * src/prefs_common.h + * src/printing.h + * src/procmime.h + * src/procmsg.h + * src/stock_pixmap.c + * src/textview.h + * src/common/defs.h + * src/common/log.h + * src/common/session.h + * src/common/smtp.h + * src/common/socket.h + * src/common/ssl.h + * src/common/ssl_certificate.h + * src/common/timing.h + * src/common/utils.h + * src/gtk/gtkaspell.h + * src/gtk/gtkutils.h + * src/gtk/pluginwindow.h + * src/gtk/spell_entry.h + * src/gtk/sslcertwindow.h + Don't export config.h in public headers + 2012-07-07 [colin] 3.8.1cvs7 * claws-features.h.in diff --git a/PATCHSETS b/PATCHSETS index 11e7428b6..ae296abfc 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4382,3 +4382,4 @@ ( cvs diff -u -r 1.49.2.144 -r 1.49.2.145 src/procmime.c; ) > 3.8.1cvs5.patchset ( cvs diff -u -r 1.115.2.250 -r 1.115.2.251 src/main.c; cvs diff -u -r 1.4.2.84 -r 1.4.2.85 src/gtk/about.c; ) > 3.8.1cvs6.patchset ( diff -u /dev/null claws-features.h.in; cvs diff -u -r 1.654.2.4459 -r 1.654.2.4460 configure.ac; cvs diff -u -r 1.24.2.30 -r 1.24.2.31 Makefile.am; cvs diff -u -r 1.61.2.105 -r 1.61.2.106 src/account.c; cvs diff -u -r 1.12.2.71 -r 1.12.2.72 src/action.c; cvs diff -u -r 1.27.2.62 -r 1.27.2.63 src/addr_compl.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/addrcustomattr.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/addrduplicates.c; cvs diff -u -r 1.9.2.36 -r 1.9.2.37 src/addressadd.c; cvs diff -u -r 1.60.2.148 -r 1.60.2.149 src/addressbook.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/addressbook_foldersel.c; cvs diff -u -r 1.5.10.38 -r 1.5.10.39 src/addrgather.c; cvs diff -u -r 1.28.2.48 -r 1.28.2.49 src/addrindex.c; cvs diff -u -r 1.17.2.47 -r 1.17.2.48 src/alertpanel.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/autofaces.c; cvs diff -u -r 1.2.4.28 -r 1.2.4.29 src/browseldap.c; cvs diff -u -r 1.65.2.75 -r 1.65.2.76 src/codeconv.c; cvs diff -u -r 1.15.2.27 -r 1.15.2.28 src/codeconv.h; cvs diff -u -r 1.382.2.603 -r 1.382.2.604 src/compose.c; cvs diff -u -r 1.23.2.37 -r 1.23.2.38 src/crash.c; cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/customheader.c; cvs diff -u -r 1.2.16.8 -r 1.2.16.9 src/displayheader.c; cvs diff -u -r 1.14.2.62 -r 1.14.2.63 src/editaddress.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/editaddress_other_attributes_ldap.c; cvs diff -u -r 1.5.12.18 -r 1.5.12.19 src/editbook.c; cvs diff -u -r 1.11.2.29 -r 1.11.2.30 src/editgroup.c; cvs diff -u -r 1.5.12.20 -r 1.5.12.21 src/editjpilot.c; cvs diff -u -r 1.8.2.45 -r 1.8.2.46 src/editldap.c; cvs diff -u -r 1.10.2.20 -r 1.10.2.21 src/editldap_basedn.c; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/edittags.c; cvs diff -u -r 1.5.12.19 -r 1.5.12.20 src/editvcard.c; cvs diff -u -r 1.3.2.30 -r 1.3.2.31 src/exphtmldlg.c; cvs diff -u -r 1.1.4.36 -r 1.1.4.37 src/expldifdlg.c; cvs diff -u -r 1.8.2.33 -r 1.8.2.34 src/export.c; cvs diff -u -r 1.5.2.31 -r 1.5.2.32 src/exporthtml.c; cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/exportldif.c; cvs diff -u -r 1.213.2.208 -r 1.213.2.209 src/folder.c; cvs diff -u -r 1.2.2.39 -r 1.2.2.40 src/folder_item_prefs.c; cvs diff -u -r 1.14.2.33 -r 1.14.2.34 src/grouplistdialog.c; cvs diff -u -r 1.8.2.36 -r 1.8.2.37 src/headerview.c; cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/image_viewer.c; cvs diff -u -r 1.179.2.257 -r 1.179.2.258 src/imap.c; cvs diff -u -r 1.1.2.70 -r 1.1.2.71 src/imap_gtk.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/imap_gtk.h; cvs diff -u -r 1.13.2.32 -r 1.13.2.33 src/import.c; cvs diff -u -r 1.14.2.29 -r 1.14.2.30 src/importldif.c; cvs diff -u -r 1.4.12.24 -r 1.4.12.25 src/importmutt.c; cvs diff -u -r 1.1.14.24 -r 1.1.14.25 src/importpine.c; cvs diff -u -r 1.149.2.107 -r 1.149.2.108 src/inc.c; cvs diff -u -r 1.29.2.17 -r 1.29.2.18 src/inc.h; cvs diff -u -r 1.18.2.35 -r 1.18.2.36 src/jpilot.c; cvs diff -u -r 1.10.2.9 -r 1.10.2.10 src/jpilot.h; cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/ldapctrl.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/ldaplocate.c; cvs diff -u -r 1.3.2.39 -r 1.3.2.40 src/ldapquery.c; cvs diff -u -r 1.4.2.24 -r 1.4.2.25 src/ldapserver.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/ldapupdate.c; cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/ldaputil.c; cvs diff -u -r 1.115.2.251 -r 1.115.2.252 src/main.c; cvs diff -u -r 1.11.2.17 -r 1.11.2.18 src/manual.c; cvs diff -u -r 1.75.2.71 -r 1.75.2.72 src/matcher.c; cvs diff -u -r 1.28.2.51 -r 1.28.2.52 src/mbox.c; cvs diff -u -r 1.3.12.42 -r 1.3.12.43 src/message_search.c; cvs diff -u -r 1.19.2.30 -r 1.19.2.31 src/messageview.h; cvs diff -u -r 1.79.2.73 -r 1.79.2.74 src/mh.c; cvs diff -u -r 1.2.2.42 -r 1.2.2.43 src/mh_gtk.c; cvs diff -u -r 1.83.2.190 -r 1.83.2.191 src/mimeview.c; cvs diff -u -r 1.16.2.71 -r 1.16.2.72 src/msgcache.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/msgcache.h; cvs diff -u -r 1.101.2.69 -r 1.101.2.70 src/news.c; cvs diff -u -r 1.2.2.35 -r 1.2.2.36 src/news_gtk.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/news_gtk.h; cvs diff -u -r 1.5.2.28 -r 1.5.2.29 src/noticeview.c; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/partial_download.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/partial_download.h; cvs diff -u -r 1.56.2.69 -r 1.56.2.70 src/pop.c; cvs diff -u -r 1.17.2.25 -r 1.17.2.26 src/pop.h; cvs diff -u -r 1.105.2.173 -r 1.105.2.174 src/prefs_account.c; cvs diff -u -r 1.49.2.47 -r 1.49.2.48 src/prefs_account.h; cvs diff -u -r 1.60.2.81 -r 1.60.2.82 src/prefs_actions.c; cvs diff -u -r 1.204.2.211 -r 1.204.2.212 src/prefs_common.c; cvs diff -u -r 1.103.2.139 -r 1.103.2.140 src/prefs_common.h; cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/prefs_compose_writing.c; cvs diff -u -r 1.16.2.43 -r 1.16.2.44 src/prefs_customheader.c; cvs diff -u -r 1.16.2.45 -r 1.16.2.46 src/prefs_display_header.c; cvs diff -u -r 1.3.2.28 -r 1.3.2.29 src/prefs_ext_prog.c; cvs diff -u -r 1.59.2.89 -r 1.59.2.90 src/prefs_filtering.c; cvs diff -u -r 1.1.4.76 -r 1.1.4.77 src/prefs_filtering_action.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_folder_column.c; cvs diff -u -r 1.52.2.87 -r 1.52.2.88 src/prefs_folder_item.c; cvs diff -u -r 1.4.2.28 -r 1.4.2.29 src/prefs_fonts.c; cvs diff -u -r 1.10.2.43 -r 1.10.2.44 src/prefs_gtk.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_image_viewer.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/prefs_logging.c; cvs diff -u -r 1.43.2.93 -r 1.43.2.94 src/prefs_matcher.c; cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/prefs_message.c; cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/prefs_other.c; cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/prefs_quote.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_receive.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_send.c; cvs diff -u -r 1.5.2.44 -r 1.5.2.45 src/prefs_spelling.c; cvs diff -u -r 1.1.2.70 -r 1.1.2.71 src/prefs_summaries.c; cvs diff -u -r 1.10.2.30 -r 1.10.2.31 src/prefs_summary_column.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/prefs_summary_open.c; cvs diff -u -r 1.30.2.71 -r 1.30.2.72 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_wrapping.c; cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/printing.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/printing.h; cvs diff -u -r 1.47.2.57 -r 1.47.2.58 src/procheader.c; cvs diff -u -r 1.49.2.145 -r 1.49.2.146 src/procmime.c; cvs diff -u -r 1.17.2.27 -r 1.17.2.28 src/procmime.h; cvs diff -u -r 1.60.2.61 -r 1.60.2.62 src/procmsg.h; cvs diff -u -r 1.8.2.46 -r 1.8.2.47 src/quote_fmt.c; cvs diff -u -r 1.17.2.17 -r 1.17.2.18 src/recv.c; cvs diff -u -r 1.17.2.63 -r 1.17.2.64 src/send_message.c; cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/setup.c; cvs diff -u -r 1.3.2.38 -r 1.3.2.39 src/ssl_manager.c; cvs diff -u -r 1.5.2.32 -r 1.5.2.33 src/statusbar.c; cvs diff -u -r 1.15.2.69 -r 1.15.2.70 src/summary_search.c; cvs diff -u -r 1.96.2.242 -r 1.96.2.243 src/textview.c; cvs diff -u -r 1.12.2.32 -r 1.12.2.33 src/textview.h; cvs diff -u -r 1.43.2.128 -r 1.43.2.129 src/toolbar.c; cvs diff -u -r 1.13.2.24 -r 1.13.2.25 src/undo.c; cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/unmime.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/uri_opener.c; cvs diff -u -r 1.1.2.87 -r 1.1.2.88 src/wizard.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/common/claws.c; cvs diff -u -r 1.9.2.55 -r 1.9.2.56 src/common/defs.h; cvs diff -u -r 1.10.2.11 -r 1.10.2.12 src/common/hooks.c; cvs diff -u -r 1.6.2.23 -r 1.6.2.24 src/common/log.c; cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/common/log.h; cvs diff -u -r 1.13.2.45 -r 1.13.2.46 src/common/plugin.c; cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/common/prefs.c; cvs diff -u -r 1.23.2.27 -r 1.23.2.28 src/common/session.c; cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/common/session.h; cvs diff -u -r 1.11.2.31 -r 1.11.2.32 src/common/smtp.c; cvs diff -u -r 1.6.2.19 -r 1.6.2.20 src/common/smtp.h; cvs diff -u -r 1.13.2.48 -r 1.13.2.49 src/common/socket.c; cvs diff -u -r 1.13.2.25 -r 1.13.2.26 src/common/socket.h; cvs diff -u -r 1.9.2.52 -r 1.9.2.53 src/common/ssl.c; cvs diff -u -r 1.2.2.15 -r 1.2.2.16 src/common/ssl.h; cvs diff -u -r 1.4.2.42 -r 1.4.2.43 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/common/ssl_certificate.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/string_match.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/common/tags.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/common/timing.h; cvs diff -u -r 1.36.2.199 -r 1.36.2.200 src/common/utils.c; cvs diff -u -r 1.20.2.78 -r 1.20.2.79 src/common/utils.h; cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/etpan/etpan-thread-manager.c; cvs diff -u -r 1.1.4.118 -r 1.1.4.119 src/etpan/imap-thread.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/etpan/nntp-thread.c; cvs diff -u -r 1.4.2.85 -r 1.4.2.86 src/gtk/about.c; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/gtk/combobox.c; cvs diff -u -r 1.5.2.34 -r 1.5.2.35 src/gtk/description_window.c; cvs diff -u -r 1.2.2.45 -r 1.2.2.46 src/gtk/filesel.c; cvs diff -u -r 1.9.2.77 -r 1.9.2.78 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/gtkaspell.h; cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/gtk/gtkshruler.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkunit.c; cvs diff -u -r 1.5.2.103 -r 1.5.2.104 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.65 -r 1.4.2.66 src/gtk/gtkutils.h; cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/gtk/icon_legend.c; cvs diff -u -r 1.2.2.46 -r 1.2.2.47 src/gtk/inputdialog.c; cvs diff -u -r 1.1.4.41 -r 1.1.4.42 src/gtk/logwindow.c; cvs diff -u -r 1.5.2.45 -r 1.5.2.46 src/gtk/menu.c; cvs diff -u -r 1.5.2.62 -r 1.5.2.63 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/pluginwindow.h; cvs diff -u -r 1.12.2.59 -r 1.12.2.60 src/gtk/prefswindow.c; cvs diff -u -r 1.1.4.32 -r 1.1.4.33 src/gtk/progressdialog.c; cvs diff -u -r 1.1.2.109 -r 1.1.2.110 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/spell_entry.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/spell_entry.h; cvs diff -u -r 1.9.2.34 -r 1.9.2.35 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.13 -r 1.6.2.14 src/gtk/sslcertwindow.h; cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.5.2.29 -r 1.5.2.30 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.12.2.31 -r 1.12.2.32 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpcore/pgp_viewer.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpcore/plugin.c; cvs diff -u -r 1.1.2.69 -r 1.1.2.70 src/plugins/pgpcore/sgpgme.c; cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/pgpinline/plugin.c; cvs diff -u -r 1.1.2.60 -r 1.1.2.61 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/smime/plugin.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/smime/smime.c; cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/plugins/spamassassin/libspamc.c; cvs diff -u -r 1.18.2.66 -r 1.18.2.67 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.23.2.59 -r 1.23.2.60 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.81 -r 1.14.2.82 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/trayicon/trayicon_prefs.c; ) > 3.8.1cvs7.patchset +( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 claws-features.h.in; cvs diff -u -r 1.15.2.28 -r 1.15.2.29 src/codeconv.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/imap_gtk.h; cvs diff -u -r 1.29.2.18 -r 1.29.2.19 src/inc.h; cvs diff -u -r 1.10.2.10 -r 1.10.2.11 src/jpilot.h; cvs diff -u -r 1.19.2.31 -r 1.19.2.32 src/messageview.h; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/msgcache.h; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/news_gtk.h; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/partial_download.h; cvs diff -u -r 1.17.2.26 -r 1.17.2.27 src/pop.h; cvs diff -u -r 1.49.2.48 -r 1.49.2.49 src/prefs_account.h; cvs diff -u -r 1.103.2.140 -r 1.103.2.141 src/prefs_common.h; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/printing.h; cvs diff -u -r 1.17.2.28 -r 1.17.2.29 src/procmime.h; cvs diff -u -r 1.60.2.62 -r 1.60.2.63 src/procmsg.h; cvs diff -u -r 1.25.2.74 -r 1.25.2.75 src/stock_pixmap.c; cvs diff -u -r 1.12.2.33 -r 1.12.2.34 src/textview.h; cvs diff -u -r 1.9.2.56 -r 1.9.2.57 src/common/defs.h; cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/common/log.h; cvs diff -u -r 1.8.2.20 -r 1.8.2.21 src/common/session.h; cvs diff -u -r 1.6.2.20 -r 1.6.2.21 src/common/smtp.h; cvs diff -u -r 1.13.2.26 -r 1.13.2.27 src/common/socket.h; cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/common/ssl.h; cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/common/ssl_certificate.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/common/timing.h; cvs diff -u -r 1.20.2.79 -r 1.20.2.80 src/common/utils.h; cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/gtkaspell.h; cvs diff -u -r 1.4.2.66 -r 1.4.2.67 src/gtk/gtkutils.h; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/pluginwindow.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/spell_entry.h; cvs diff -u -r 1.6.2.14 -r 1.6.2.15 src/gtk/sslcertwindow.h; ) > 3.8.1cvs8.patchset diff --git a/claws-features.h.in b/claws-features.h.in index 9bb6e33fa..81ff37fb1 100644 --- a/claws-features.h.in +++ b/claws-features.h.in @@ -18,3 +18,6 @@ #undef USE_NEW_ADDRBOOK #undef USE_PTHREAD #undef USE_SPAMASSASSIN_PLUGIN +#undef MAEMO +#undef CHINOOK +#undef __CYGWIN__ diff --git a/configure.ac b/configure.ac index 30d64cc72..5e1566dde 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=7 +EXTRA_VERSION=8 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/codeconv.h b/src/codeconv.h index 45b5bfc84..de193d168 100644 --- a/src/codeconv.h +++ b/src/codeconv.h @@ -21,7 +21,6 @@ #define __CODECONV_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/common/defs.h b/src/common/defs.h index 68bb0efb5..e006a1436 100644 --- a/src/common/defs.h +++ b/src/common/defs.h @@ -21,7 +21,6 @@ #define __DEFS_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/common/log.h b/src/common/log.h index 37d22fa30..f6819f908 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -21,7 +21,6 @@ #define LOG_H #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/common/session.h b/src/common/session.h index 95c782c27..824471161 100644 --- a/src/common/session.h +++ b/src/common/session.h @@ -21,7 +21,6 @@ #define __SESSION_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/common/smtp.h b/src/common/smtp.h index f0fafcdf9..9a34cadc4 100644 --- a/src/common/smtp.h +++ b/src/common/smtp.h @@ -21,7 +21,6 @@ #define __SMTP_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/common/socket.h b/src/common/socket.h index 266cfc71b..37847d816 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -21,7 +21,6 @@ #define __SOCKET_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/common/ssl.h b/src/common/ssl.h index 004a94429..f180d55ed 100644 --- a/src/common/ssl.h +++ b/src/common/ssl.h @@ -21,7 +21,6 @@ #define __SSL_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/common/ssl_certificate.h b/src/common/ssl_certificate.h index 5717550e7..f5380ed46 100644 --- a/src/common/ssl_certificate.h +++ b/src/common/ssl_certificate.h @@ -22,7 +22,6 @@ #define __SSL_CERTIFICATE_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/common/timing.h b/src/common/timing.h index 282d9cad3..73d0a00df 100644 --- a/src/common/timing.h +++ b/src/common/timing.h @@ -32,7 +32,6 @@ #include #include #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/common/utils.h b/src/common/utils.h index bf1d14ecf..d78219996 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -21,7 +21,6 @@ #define __UTILS_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/gtk/gtkaspell.h b/src/gtk/gtkaspell.h index fa1a5ab2c..53599f932 100644 --- a/src/gtk/gtkaspell.h +++ b/src/gtk/gtkaspell.h @@ -32,7 +32,6 @@ #define __GTKENCHANT_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h index bb1ae98b9..69863a432 100644 --- a/src/gtk/gtkutils.h +++ b/src/gtk/gtkutils.h @@ -21,7 +21,6 @@ #define __GTKUTILS_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/gtk/pluginwindow.h b/src/gtk/pluginwindow.h index 6877dce40..66cc2571c 100644 --- a/src/gtk/pluginwindow.h +++ b/src/gtk/pluginwindow.h @@ -21,7 +21,6 @@ #define PLUGINWINDOW_H 1 #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/gtk/spell_entry.h b/src/gtk/spell_entry.h index 5a2de7198..aaa49da28 100644 --- a/src/gtk/spell_entry.h +++ b/src/gtk/spell_entry.h @@ -24,7 +24,6 @@ #define __SPELL_ENTRY_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/gtk/sslcertwindow.h b/src/gtk/sslcertwindow.h index da6bc502a..772e7f73b 100644 --- a/src/gtk/sslcertwindow.h +++ b/src/gtk/sslcertwindow.h @@ -22,7 +22,6 @@ #define __SSL_CERTWINDOW_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/imap_gtk.h b/src/imap_gtk.h index 13d7b07e7..59f00def7 100644 --- a/src/imap_gtk.h +++ b/src/imap_gtk.h @@ -21,7 +21,6 @@ #define IMAP_GTK_H #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/inc.h b/src/inc.h index c70a81ff0..9073f9000 100644 --- a/src/inc.h +++ b/src/inc.h @@ -21,7 +21,6 @@ #define __INC_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/jpilot.h b/src/jpilot.h index a7217eb1b..3787d0cf0 100644 --- a/src/jpilot.h +++ b/src/jpilot.h @@ -27,7 +27,6 @@ #define __JPILOT_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/messageview.h b/src/messageview.h index b6a0e39ad..24e2f7c81 100644 --- a/src/messageview.h +++ b/src/messageview.h @@ -21,7 +21,6 @@ #define __MESSAGEVIEW_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/msgcache.h b/src/msgcache.h index 03d65d06e..fbe1cc1f3 100644 --- a/src/msgcache.h +++ b/src/msgcache.h @@ -21,7 +21,6 @@ #define __MSGCACHE_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/news_gtk.h b/src/news_gtk.h index ca0b7880a..4e34ff1f2 100644 --- a/src/news_gtk.h +++ b/src/news_gtk.h @@ -21,7 +21,6 @@ #define NEWS_GTK_H #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/partial_download.h b/src/partial_download.h index f3379084a..35a727786 100644 --- a/src/partial_download.h +++ b/src/partial_download.h @@ -21,7 +21,6 @@ #define __PARTIAL_DOWNLOAD_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/pop.h b/src/pop.h index 9484f5593..ba13e86e3 100644 --- a/src/pop.h +++ b/src/pop.h @@ -21,7 +21,6 @@ #define __POP_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/prefs_account.h b/src/prefs_account.h index c041c2003..eec76b976 100644 --- a/src/prefs_account.h +++ b/src/prefs_account.h @@ -21,7 +21,6 @@ #define PREFS_ACCOUNT_H #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif #include "ssl.h" diff --git a/src/prefs_common.h b/src/prefs_common.h index bc53395de..b144a1603 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -21,7 +21,6 @@ #define __PREFS_COMMON_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/printing.h b/src/printing.h index b91cd395b..58655631c 100644 --- a/src/printing.h +++ b/src/printing.h @@ -23,7 +23,6 @@ #include #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/procmime.h b/src/procmime.h index f9701dfc8..e5723e2cf 100644 --- a/src/procmime.h +++ b/src/procmime.h @@ -21,7 +21,6 @@ #define __PROCMIME_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/procmsg.h b/src/procmsg.h index 2f6712a83..21a00be49 100644 --- a/src/procmsg.h +++ b/src/procmsg.h @@ -21,7 +21,6 @@ #define __PROCMSG_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c index ebd607cde..1ce0d7eab 100644 --- a/src/stock_pixmap.c +++ b/src/stock_pixmap.c @@ -23,6 +23,7 @@ #include #include +#include "config.h" #include "stock_pixmap.h" #include "gtkutils.h" #include "utils.h" diff --git a/src/textview.h b/src/textview.h index b5b0f1a5b..39d60660d 100644 --- a/src/textview.h +++ b/src/textview.h @@ -21,7 +21,6 @@ #define __TEXTVIEW_H__ #ifdef HAVE_CONFIG_H -# include "config.h" #include "claws-features.h" #endif -- 2.25.1