commit 7aafbfc2704741f20baafa1bcb49d73430894d3d
parent 8d838ebc89b2e0cbb11f8803fcc45d3b7811e766
Author: Colin Leroy <colin@colino.net>
Date: Thu, 14 Mar 2013 17:36:51 +0000
2013-03-14 [colin] 3.9.0cvs125
* src/plugins/fancy/fancy_viewer.c
Remove some crashy calls (wonder why.)
Diffstat:
4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-14 [colin] 3.9.0cvs125
+
+ * src/plugins/fancy/fancy_viewer.c
+ Remove some crashy calls (wonder why.)
+
2013-03-13 [colin] 3.9.0cvs124
* src/plugins/fancy/Makefile.am
diff --git a/PATCHSETS b/PATCHSETS
@@ -4622,3 +4622,4 @@
( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pdf_viewer/poppler_viewer.c; ) > 3.9.0cvs122.patchset
( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/fancy/fancy_viewer.h; ) > 3.9.0cvs123.patchset
( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/fancy/Makefile.am; diff -u /dev/null src/plugins/fancy/claws.def; diff -u /dev/null src/plugins/fancy/plugin.def; diff -u /dev/null src/plugins/fancy/version.rc; ) > 3.9.0cvs124.patchset
+( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/fancy/fancy_viewer.c; ) > 3.9.0cvs125.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=124
+EXTRA_VERSION=125
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
@@ -372,8 +372,9 @@ navigation_requested_cb(WebKitWebView *view, WebKitWebFrame *frame,
WebKitNetworkRequest *netreq, FancyViewer *viewer)
{
const gchar *uri = webkit_network_request_get_uri(netreq);
+#ifndef G_OS_WIN32
debug_print("navigation requested to %s\n", uri);
-
+#endif
if (!strncmp(uri, "mailto:", 7)) {
compose_new(NULL, uri + 7, NULL);
return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
@@ -427,10 +428,15 @@ static void resource_request_starting_cb(WebKitWebView *view,
uri = webkit_network_request_get_uri(request);
if (!viewer->override_prefs_remote_content
&& strncmp(uri, "file://", 7)) {
+#ifndef G_OS_WIN32
debug_print("Preventing load of %s\n", uri);
+#endif
webkit_network_request_set_uri(request, "about:blank");
- } else
+ }
+#ifndef G_OS_WIN32
+ else
debug_print("Starting request of %s\n", uri);
+#endif
}
static gboolean fancy_text_search(MimeViewer *_viewer, gboolean backward,
