Index: head/mail/claws-mail/Makefile.claws
===================================================================
--- head/mail/claws-mail/Makefile.claws	(revision 456568)
+++ head/mail/claws-mail/Makefile.claws	(revision 456569)
@@ -1,82 +1,82 @@
 # $FreeBSD$
 
-PORTVERSION=	3.15.1
+PORTVERSION=	3.16.0
 CATEGORIES?=	mail
 MASTER_SITES=	http://www.claws-mail.org/download.php?file=releases/
 
 MAINTAINER=	pawel@FreeBSD.org
 
 LICENSE=	GPLv3
 
 USES+=		gettext-runtime gmake iconv libtool pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static
 
 CLAWS_PLUGINS=	acpi_notifier \
 		address_keeper \
 		archive \
 		att_remover \
 		attachwarner \
 		bogofilter \
 		bsfilter \
 		clamd \
 		fancy \
 		fetchinfo \
 		gdata \
 		libravatar \
 		mailmbox \
 		managesieve \
 		newmail \
 		notification \
 		pdf_viewer \
 		perl \
 		python \
 		pgpcore \
 		pgpinline \
 		pgpmime \
 		rssyl \
 		smime \
 		spam_report \
 		spamassassin \
 		tnef_parse \
 		vcalendar
 
 .for p in ${CLAWS_PLUGINS}
 CONFIGURE_ARGS+=	--disable-${p}-plugin
 .endfor
 
 .if defined(CLAWS_PLUGINS_BUILD)
 DISTNAME=	claws-mail-${PORTVERSION}
 PKGNAMEPREFIX=	claws-mail-
 
 BUILD_DEPENDS+=	claws-mail>=${PORTVERSION}:mail/claws-mail
 RUN_DEPENDS+=	claws-mail>=${PORTVERSION}:mail/claws-mail
 
 MASTERDIR=	${.CURDIR}/../../mail/claws-mail
 DESCR=		${.CURDIR}/pkg-descr
 FILESDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
 CONFIGURE_ARGS+=	--disable-nls
 
 .  for p in ${CLAWS_PLUGINS_BUILD}
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S|--disable-${p}-plugin||}
 PLIST_FILES+=	lib/claws-mail/plugins/${p:S|spam_|spam|}.so
 .  endfor
 
 do-build:
 .  for p in ${CLAWS_PLUGINS_BUILD}
 	(cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD})
 .  endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/claws-mail/plugins
 .  for p in ${CLAWS_PLUGINS_BUILD}
 	(cd ${WRKSRC}/src/plugins/${p} && \
 		${INSTALL_LIB} .libs/${p:S|spam_|spam|}.so \
 		${STAGEDIR}${PREFIX}/lib/claws-mail/plugins)
 .  endfor
 
 .endif
Index: head/mail/claws-mail/distinfo
===================================================================
--- head/mail/claws-mail/distinfo	(revision 456568)
+++ head/mail/claws-mail/distinfo	(revision 456569)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504101480
-SHA256 (claws-mail-3.15.1.tar.xz) = 8d093c2f32db863c1141d56e35424c04ee48fe5d6adf4c7f349f647fa3149542
-SIZE (claws-mail-3.15.1.tar.xz) = 5665468
+TIMESTAMP = 1513513432
+SHA256 (claws-mail-3.16.0.tar.xz) = c212133d3d962129d8c7995c1c7d973faef2a8914481c0c74578217bf4c897ab
+SIZE (claws-mail-3.16.0.tar.xz) = 5913948
Index: head/mail/claws-mail/pkg-plist
===================================================================
--- head/mail/claws-mail/pkg-plist	(revision 456568)
+++ head/mail/claws-mail/pkg-plist	(revision 456569)
@@ -1,320 +1,323 @@
 bin/claws-mail
 bin/sylpheed-claws
 include/claws-mail/account.h
 include/claws-mail/action.h
 include/claws-mail/adbookbase.h
 include/claws-mail/addr_compl.h
 include/claws-mail/addrbook.h
 include/claws-mail/addrcache.h
 include/claws-mail/addrclip.h
 include/claws-mail/addrcustomattr.h
 include/claws-mail/addrdefs.h
 include/claws-mail/addrduplicates.h
 include/claws-mail/addressadd.h
 include/claws-mail/addressbook-dbus.h
 include/claws-mail/addressbook.h
 include/claws-mail/addressbook_foldersel.h
 include/claws-mail/addressitem.h
 include/claws-mail/addrgather.h
 include/claws-mail/addrharvest.h
 include/claws-mail/addrindex.h
 include/claws-mail/addritem.h
 include/claws-mail/addrquery.h
 include/claws-mail/addrselect.h
 include/claws-mail/advsearch.h
 include/claws-mail/alertpanel.h
 include/claws-mail/autofaces.h
 include/claws-mail/avatars.h
 include/claws-mail/browseldap.h
 include/claws-mail/claws-features.h
 include/claws-mail/codeconv.h
 include/claws-mail/common/claws.h
 include/claws-mail/common/defs.h
 include/claws-mail/common/hooks.h
 include/claws-mail/common/log.h
 include/claws-mail/common/md5.h
 include/claws-mail/common/mgutils.h
 include/claws-mail/common/passcrypt.h
 include/claws-mail/common/pkcs5_pbkdf2.h
 include/claws-mail/common/plugin.h
 include/claws-mail/common/prefs.h
 include/claws-mail/common/progressindicator.h
 include/claws-mail/common/quoted-printable.h
 include/claws-mail/common/session.h
 include/claws-mail/common/smtp.h
 include/claws-mail/common/socket.h
 include/claws-mail/common/ssl.h
 include/claws-mail/common/ssl_certificate.h
 include/claws-mail/common/string_match.h
 include/claws-mail/common/stringtable.h
 include/claws-mail/common/tags.h
 include/claws-mail/common/template.h
 include/claws-mail/common/timing.h
 include/claws-mail/common/tlds.h
 include/claws-mail/common/utils.h
 include/claws-mail/common/uuencode.h
 include/claws-mail/common/version.h
 include/claws-mail/common/xml.h
 include/claws-mail/common/xmlprops.h
 include/claws-mail/compose.h
 include/claws-mail/crash.h
 include/claws-mail/customheader.h
 include/claws-mail/displayheader.h
 include/claws-mail/editaddress.h
 include/claws-mail/editaddress_other_attributes_ldap.h
 include/claws-mail/editbook.h
 include/claws-mail/editgroup.h
 include/claws-mail/editjpilot.h
 include/claws-mail/editldap.h
 include/claws-mail/editldap_basedn.h
 include/claws-mail/edittags.h
 include/claws-mail/editvcard.h
 include/claws-mail/enriched.h
+include/claws-mail/entity.h
 include/claws-mail/etpan/etpan-errors.h
 include/claws-mail/etpan/etpan-ssl.h
 include/claws-mail/etpan/etpan-thread-manager-types.h
 include/claws-mail/etpan/etpan-thread-manager.h
 include/claws-mail/etpan/imap-thread.h
 include/claws-mail/etpan/nntp-thread.h
 include/claws-mail/exphtmldlg.h
 include/claws-mail/expldifdlg.h
 include/claws-mail/export.h
 include/claws-mail/exporthtml.h
 include/claws-mail/exportldif.h
 include/claws-mail/file_checker.h
 include/claws-mail/filtering.h
 include/claws-mail/folder.h
 include/claws-mail/folder_item_prefs.h
 include/claws-mail/foldersel.h
 include/claws-mail/folderutils.h
 include/claws-mail/folderview.h
 include/claws-mail/grouplistdialog.h
 include/claws-mail/gtk/about.h
 include/claws-mail/gtk/authors.h
 include/claws-mail/gtk/claws-marshal.h
 include/claws-mail/gtk/colorlabel.h
 include/claws-mail/gtk/colorsel.h
 include/claws-mail/gtk/combobox.h
 include/claws-mail/gtk/description_window.h
 include/claws-mail/gtk/filesel.h
 include/claws-mail/gtk/foldersort.h
 include/claws-mail/gtk/gdkkeysyms-new.h
 include/claws-mail/gtk/gtkaspell.h
 include/claws-mail/gtk/gtkcmclist.h
 include/claws-mail/gtk/gtkcmctree.h
 include/claws-mail/gtk/gtkcmoptionmenu.h
 include/claws-mail/gtk/gtksctree.h
 include/claws-mail/gtk/gtkshruler.h
 include/claws-mail/gtk/gtkunit.h
 include/claws-mail/gtk/gtkutils.h
 include/claws-mail/gtk/gtkvscrollbutton.h
 include/claws-mail/gtk/headers.h
 include/claws-mail/gtk/icon_legend.h
 include/claws-mail/gtk/inputdialog.h
 include/claws-mail/gtk/logwindow.h
 include/claws-mail/gtk/manage_window.h
 include/claws-mail/gtk/menu.h
 include/claws-mail/gtk/pluginwindow.h
 include/claws-mail/gtk/prefswindow.h
 include/claws-mail/gtk/progressdialog.h
 include/claws-mail/gtk/quicksearch.h
 include/claws-mail/gtk/spell_entry.h
 include/claws-mail/gtk/sslcertwindow.h
 include/claws-mail/headerview.h
 include/claws-mail/html.h
 include/claws-mail/image_viewer.h
 include/claws-mail/imap.h
 include/claws-mail/imap_gtk.h
 include/claws-mail/import.h
 include/claws-mail/importldif.h
 include/claws-mail/importmutt.h
 include/claws-mail/importpine.h
 include/claws-mail/inc.h
 include/claws-mail/jpilot.h
 include/claws-mail/ldapctrl.h
 include/claws-mail/ldaplocate.h
 include/claws-mail/ldapquery.h
 include/claws-mail/ldapserver.h
 include/claws-mail/ldapupdate.h
 include/claws-mail/ldaputil.h
 include/claws-mail/ldif.h
 include/claws-mail/localfolder.h
 include/claws-mail/main.h
 include/claws-mail/mainwindow.h
 include/claws-mail/manual.h
 include/claws-mail/matcher.h
 include/claws-mail/matcher_parser.h
 include/claws-mail/matcher_parser_lex.h
 include/claws-mail/matcher_parser_parse.h
 include/claws-mail/matchertypes.h
 include/claws-mail/mbox.h
 include/claws-mail/message_search.h
 include/claws-mail/messageview.h
 include/claws-mail/mh.h
 include/claws-mail/mh_gtk.h
 include/claws-mail/mimeview.h
 include/claws-mail/msgcache.h
 include/claws-mail/mutt.h
 include/claws-mail/news.h
 include/claws-mail/news_gtk.h
 include/claws-mail/noticeview.h
 include/claws-mail/partial_download.h
 include/claws-mail/password.h
 include/claws-mail/password_gtk.h
 include/claws-mail/passwordstore.h
 include/claws-mail/pine.h
 include/claws-mail/plugins/claws-mail/archiver.h
 include/claws-mail/plugins/claws-mail/archiver_prefs.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/eggaccelerators.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-error.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-info.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-key-file-registry.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-listener.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-marshal.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-registry.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-utils.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-x11-listener.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/gtkhotkey.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/tomboykeybinder.h
 include/claws-mail/plugins/pgpcore/autocompletion.h
 include/claws-mail/plugins/pgpcore/passphrase.h
 include/claws-mail/plugins/pgpcore/pgp_utils.h
 include/claws-mail/plugins/pgpcore/pgp_viewer.h
 include/claws-mail/plugins/pgpcore/prefs_gpg.h
 include/claws-mail/plugins/pgpcore/select-keys.h
 include/claws-mail/plugins/pgpcore/sgpgme.h
 include/claws-mail/plugins/pgpinline/pgpinline.h
 include/claws-mail/plugins/pgpmime/pgpmime.h
 include/claws-mail/plugins/smime/smime.h
 include/claws-mail/plugins/vcalendar/vcal_interface.h
 include/claws-mail/pop.h
 include/claws-mail/prefs_account.h
 include/claws-mail/prefs_actions.h
 include/claws-mail/prefs_common.h
 include/claws-mail/prefs_compose_writing.h
 include/claws-mail/prefs_customheader.h
 include/claws-mail/prefs_display_header.h
 include/claws-mail/prefs_ext_prog.h
 include/claws-mail/prefs_filtering.h
 include/claws-mail/prefs_filtering_action.h
 include/claws-mail/prefs_folder_column.h
 include/claws-mail/prefs_folder_item.h
 include/claws-mail/prefs_fonts.h
 include/claws-mail/prefs_gtk.h
 include/claws-mail/prefs_image_viewer.h
 include/claws-mail/prefs_logging.h
 include/claws-mail/prefs_matcher.h
 include/claws-mail/prefs_message.h
 include/claws-mail/prefs_migration.h
 include/claws-mail/prefs_msg_colors.h
 include/claws-mail/prefs_other.h
 include/claws-mail/prefs_quote.h
 include/claws-mail/prefs_receive.h
 include/claws-mail/prefs_send.h
 include/claws-mail/prefs_spelling.h
 include/claws-mail/prefs_summaries.h
 include/claws-mail/prefs_summary_column.h
 include/claws-mail/prefs_summary_open.h
 include/claws-mail/prefs_template.h
 include/claws-mail/prefs_themes.h
 include/claws-mail/prefs_toolbar.h
 include/claws-mail/prefs_wrapping.h
 include/claws-mail/printing.h
 include/claws-mail/privacy.h
 include/claws-mail/procheader.h
 include/claws-mail/procmime.h
 include/claws-mail/procmsg.h
 include/claws-mail/proctypes.h
 include/claws-mail/quote_fmt.h
 include/claws-mail/quote_fmt_lex.h
 include/claws-mail/quote_fmt_parse.h
 include/claws-mail/recv.h
 include/claws-mail/remotefolder.h
 include/claws-mail/send_message.h
 include/claws-mail/setup.h
 include/claws-mail/sourcewindow.h
 include/claws-mail/ssl_manager.h
 include/claws-mail/statusbar.h
 include/claws-mail/stock_pixmap.h
 include/claws-mail/summary_search.h
 include/claws-mail/summaryview.h
 include/claws-mail/textview.h
 include/claws-mail/toolbar.h
 include/claws-mail/undo.h
 include/claws-mail/unmime.h
 include/claws-mail/uri_opener.h
 include/claws-mail/vcard.h
 include/claws-mail/viewtypes.h
 include/claws-mail/wizard.h
 lib/claws-mail/plugins/pgpinline.deps
 lib/claws-mail/plugins/pgpmime.deps
 lib/claws-mail/plugins/smime.deps
 libdata/pkgconfig/claws-mail.pc
 man/man1/claws-mail.1.gz
 share/applications/claws-mail.desktop
 %%DATADIR%%/OOo2claws-mail.pl
 %%DATADIR%%/acroread2claws-mail.pl
 %%DATADIR%%/calypso_convert.pl
 %%DATADIR%%/convert_mbox.pl
 %%DATADIR%%/eud2gc.py
 %%DATADIR%%/filter_conv.pl
 %%DATADIR%%/filter_conv_new.pl
 %%DATADIR%%/fix_date.sh
 %%DATADIR%%/gif2xface.pl
 %%DATADIR%%/google_msgid.pl
 %%DATADIR%%/google_search.pl
 %%DATADIR%%/kmail-mailbox2claws-mail.pl
 %%DATADIR%%/kmail2claws-mail.pl
 %%DATADIR%%/kmail2claws-mail_v2.pl
 %%DATADIR%%/multiwebsearch.conf
 %%DATADIR%%/multiwebsearch.pl
 %%DATADIR%%/nautilus2claws-mail.sh
 %%DATADIR%%/outlook2claws-mail.pl
 %%DATADIR%%/tb2claws-mail
 %%DATADIR%%/tbird2claws.py
 %%DATADIR%%/textviewer.pl
 %%DATADIR%%/textviewer.sh
 %%DATADIR%%/thunderbird-filters-convertor.pl
 %%DATADIR%%/uudec
 %%DATADIR%%/uuooffice
 %%DATADIR%%/vcard2xml.py
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.tools
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.html
 %%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.pdf
 %%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.ps
 %%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.txt
 %%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.html
 %%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.pdf
 %%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.ps
 %%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.txt
 %%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.html
 %%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.pdf
 %%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.ps
 %%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.txt
 share/icons/hicolor/128x128/apps/claws-mail.png
 share/icons/hicolor/48x48/apps/claws-mail.png
 share/icons/hicolor/64x64/apps/claws-mail.png
 %%NLS%%share/locale/ca/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/da/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/de/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/es/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/claws-mail.mo
-%%NLS%%share/locale/he/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/id_ID/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/it/LC_MESSAGES/claws-mail.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/claws-mail.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
Index: head/mail/claws-mail-fancy/files/patch-prev-htmlview-fix
===================================================================
--- head/mail/claws-mail-fancy/files/patch-prev-htmlview-fix	(revision 456568)
+++ head/mail/claws-mail-fancy/files/patch-prev-htmlview-fix	(nonexistent)
@@ -1,236 +0,0 @@
-diff --git src/plugins/fancy/fancy_viewer.c src/plugins/fancy/fancy_viewer.c
-index 3e818f884..079a18e63 100644
---- src/plugins/fancy/fancy_viewer.c
-+++ src/plugins/fancy/fancy_viewer.c
-@@ -42,12 +42,9 @@ static void
- over_link_cb (WebKitWebView *view, const gchar *wtf, const gchar *link,
- 	      FancyViewer *viewer, void *wtfa);
- 
--static void
--load_progress_cb (WebKitWebView *view, gint progress, FancyViewer *viewer);
- 
--static WebKitNavigationResponse
--navigation_requested_cb (WebKitWebView *view, WebKitWebFrame *frame,
--			 WebKitNetworkRequest *netreq, FancyViewer *viewer);
-+static void
-+load_progress_cb(WebKitWebView *view, GParamSpec* pspec, FancyViewer *viewer);
- 
- static MimeViewerFactory fancy_viewer_factory;
- 
-@@ -199,15 +196,6 @@ static void fancy_set_defaults(FancyViewer *viewer)
- 	fancy_apply_prefs(viewer);
- }
- 
--static void fancy_load_uri(FancyViewer *viewer, const gchar *uri)
--{
--#if WEBKIT_CHECK_VERSION(1,1,1)
--	webkit_web_view_load_uri(viewer->view, uri);
--#else
--	webkit_web_view_open(viewer->view, uri);
--#endif
--}
--
- static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
- {
- 	FancyViewer *viewer = (FancyViewer *) _viewer;
-@@ -240,6 +228,7 @@ static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
- 	}
- 	else {
- 		const gchar *charset = NULL;
-+		gchar *contents = NULL;
- 		if (messageview && messageview->forced_charset)
- 			charset = _viewer->mimeview->messageview->forced_charset;
- 		else
-@@ -248,14 +237,20 @@ static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
- 			charset = conv_get_locale_charset_str();
- 		debug_print("using %s charset\n", charset);
- 		g_object_set(viewer->settings, "default-encoding", charset, NULL);
--		gchar *tmp = g_filename_to_uri(viewer->filename, NULL, NULL);
-+		
-+		contents = file_read_to_str_no_recode(viewer->filename);
-+		
- 		debug_print("zoom_level: %i\n", fancy_prefs.zoom_level);
- 		webkit_web_view_set_zoom_level(viewer->view, (fancy_prefs.zoom_level / 100.0));
- 
- 		fancy_set_defaults(viewer);
--		fancy_load_uri(viewer, tmp);
- 
--		g_free(tmp);
-+		webkit_web_view_load_string(viewer->view,
-+					    contents,
-+					    "text/html",
-+					    charset,
-+					    NULL);
-+		g_free(contents);
- 	}
- 	viewer->loading = FALSE;
- 	return FALSE;
-@@ -349,7 +344,7 @@ static void fancy_clear_viewer(MimeViewer *_viewer)
- 	viewer->cur_link = NULL;
- 	fancy_set_defaults(viewer);
- 
--	fancy_load_uri(viewer, "about:blank");
-+	webkit_web_view_load_uri(viewer->view, "about:blank");
- 
- 	debug_print("fancy_clear_viewer\n");
- 	fancy_prefs.zoom_level = webkit_web_view_get_zoom_level(viewer->view) * 100;
-@@ -368,25 +363,35 @@ static void fancy_destroy_viewer(MimeViewer *_viewer)
- 	g_free(viewer);
- }
- 
--static WebKitNavigationResponse
--navigation_requested_cb(WebKitWebView *view, WebKitWebFrame *frame,
--						WebKitNetworkRequest *netreq, FancyViewer *viewer)
-+static gboolean
-+navigation_policy_cb (WebKitWebView             *web_view,
-+		      WebKitWebFrame            *frame,
-+		      WebKitNetworkRequest      *request,
-+		      WebKitWebNavigationAction *navigation_action,
-+		      WebKitWebPolicyDecision   *policy_decision,
-+		      FancyViewer		*viewer)
- {
--	const gchar *uri = webkit_network_request_get_uri(netreq);
-+	const gchar *uri = webkit_network_request_get_uri(request);
- 
- 	debug_print("navigation requested to %s\n", uri);
- 
- 	if (!strncmp(uri, "mailto:", 7)) {
-+		debug_print("Opening message window\n");
- 		compose_new(NULL, uri + 7, NULL);
--		return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
--	} else if (!strncmp(uri, "file://", 7)) {
--		return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
--	} else if (viewer->override_prefs_remote_content)
--		return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
--	else {
-+		webkit_web_policy_decision_ignore(policy_decision);
-+	} else if (!strncmp(uri, "file://", 7) || !strcmp(uri, "about:blank")) {
-+		debug_print("local navigation request ACCEPTED\n");
-+		webkit_web_policy_decision_use(policy_decision);
-+	} else if (viewer->override_prefs_remote_content) {
-+		debug_print("remote navigation request ACCEPTED\n");
-+		webkit_web_policy_decision_use(policy_decision);
-+	} else {
-+		debug_print("remote navigation request IGNORED\n");
- 		fancy_show_notice(viewer, _("Remote content loading is disabled."));
--		return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
-+		webkit_web_policy_decision_ignore(policy_decision);
- 	}
-+
-+	return true;
- }
- 
- static void resource_request_starting_cb(WebKitWebView		*view,
-@@ -560,17 +565,33 @@ static void over_link_cb(WebKitWebView *view, const gchar *wtf,
- 	}
- }
- 
--static void load_progress_cb(WebKitWebView *view, gint progress,
-+static void load_progress_cb(WebKitWebView *view, GParamSpec* pspec,
- 			     FancyViewer *viewer)
- {
--	gdouble pbar;
--	gchar *label = g_strdup_printf("%d%% Loading...", progress);
--	pbar = (gdouble) progress / 100;
-+	WebKitLoadStatus status = webkit_web_view_get_load_status(viewer->view);
-+	gdouble pbar = webkit_web_view_get_progress(viewer->view);
-+	const gchar *uri = webkit_web_view_get_uri(viewer->view);
-+
-+	gchar *label = g_strdup_printf("%d%% Loading...", (gint)(pbar * 100));
- 	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(viewer->progress), pbar);
- 	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(viewer->progress),
- 				  (const gchar*)label);
- 	g_free(label);
-+
-+	switch (status) {
-+		case WEBKIT_LOAD_PROVISIONAL:
-+		case WEBKIT_LOAD_COMMITTED:
-+		case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
-+			break;
-+		case WEBKIT_LOAD_FAILED:
-+			debug_print("Load failed: %s\n", uri);
-+			break;
-+		case WEBKIT_LOAD_FINISHED:
-+			debug_print("Load finished: %s\n", uri);
-+			break;
-+	}
- }
-+
- static void stop_loading_cb(GtkWidget *widget, GdkEvent *ev,
- 							FancyViewer *viewer)
- {
-@@ -594,11 +615,8 @@ static void search_the_web_cb(GtkWidget *widget, FancyViewer *viewer)
- 		gchar *tmp = webkit_web_view_get_selected_text(viewer->view);
- #endif
- 		search = g_strconcat(GOOGLE_SEARCH, tmp, NULL);
--#if WEBKIT_CHECK_VERSION(1,1,1)
-+
- 		webkit_web_view_load_uri(viewer->view, search);
--#else
--		webkit_web_view_open(viewer->view, search);
--#endif
- 		g_free(search);
- 		g_free(tmp);
- 	}
-@@ -893,6 +911,17 @@ static void zoom_out_cb(GtkWidget *widget, GdkEvent *ev, FancyViewer *viewer)
- 	webkit_web_view_zoom_out(viewer->view);
- }
- 
-+#if WEBKIT_CHECK_VERSION (1,7,5)
-+static void resource_load_failed_cb(WebKitWebView     *web_view,
-+				    WebKitWebFrame    *web_frame,
-+				    WebKitWebResource *web_resource,
-+				    GError            *error,
-+				    FancyViewer	      *viewer)
-+{
-+	debug_print("Loading error: %s\n", error->message);
-+}
-+#endif
-+
- static MimeViewer *fancy_viewer_create(void)
- {
- 	FancyViewer    *viewer;
-@@ -1009,10 +1038,15 @@ static MimeViewer *fancy_viewer_create(void)
- 			 G_CALLBACK(load_finished_cb), viewer);
- 	g_signal_connect(G_OBJECT(viewer->view), "hovering-over-link",
- 			 G_CALLBACK(over_link_cb), viewer);
--	g_signal_connect(G_OBJECT(viewer->view), "load-progress-changed",
-+
-+	g_signal_connect(G_OBJECT(viewer->view), "notify::progress",
-+			 G_CALLBACK(load_progress_cb), viewer);
-+	g_signal_connect(G_OBJECT(viewer->view), "notify::load-status",
- 			 G_CALLBACK(load_progress_cb), viewer);
--	g_signal_connect(G_OBJECT(viewer->view), "navigation-requested",
--			 G_CALLBACK(navigation_requested_cb), viewer);
-+
-+	g_signal_connect(G_OBJECT(viewer->view), "navigation-policy-decision-requested",
-+			 G_CALLBACK(navigation_policy_cb), viewer);
-+
- 	g_signal_connect(G_OBJECT(viewer->view), "resource-request-starting",
- 			G_CALLBACK(resource_request_starting_cb), viewer);
- 	g_signal_connect(G_OBJECT(viewer->view), "populate-popup",
-@@ -1034,6 +1068,11 @@ static MimeViewer *fancy_viewer_create(void)
- 	g_signal_connect(G_OBJECT(viewer->view), "key_press_event",
- 			 G_CALLBACK(keypress_events_cb), viewer);
- 
-+#if WEBKIT_CHECK_VERSION (1,7,5)
-+	g_signal_connect(G_OBJECT(viewer->view), "resource-load-failed",
-+			 G_CALLBACK(resource_load_failed_cb), viewer);
-+#endif
-+
- 	viewer->filename = NULL;
- 	return (MimeViewer *) viewer;
- }
-diff --git src/plugins/fancy/fancy_viewer.h src/plugins/fancy/fancy_viewer.h
-index 4d751b712..952b33717 100644
---- src/plugins/fancy/fancy_viewer.h
-+++ src/plugins/fancy/fancy_viewer.h
-@@ -33,6 +33,8 @@
- #include <webkit/webkitversion.h>
- #include <webkit/webkitwebframe.h>
- #include <webkit/webkitnetworkrequest.h>
-+#include <webkit/webkitwebnavigationaction.h>
-+#include <webkit/webkitwebpolicydecision.h>
- #if WEBKIT_CHECK_VERSION (1,3,10)
- #include <webkit/webkitglobals.h>
- #endif

Property changes on: head/mail/claws-mail-fancy/files/patch-prev-htmlview-fix
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property