From: Colin Leroy <colin@colino.net>
Date: Wed, 6 Mar 2013 11:22:54 +0000 (+0000)
Subject: 2013-03-06 [colin]	3.9.0cvs106
X-Git-Tag: 3.9.1~88
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ab4eb17db56891d7b6cb61ec20ae45496d54009f

2013-03-06 [colin]	3.9.0cvs106

	* src/plugins/fancy/fancy_viewer.c
		Make options setting clearer
---

diff --git a/ChangeLog b/ChangeLog
index a722c4b6b..771db9603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-06 [colin]	3.9.0cvs106
+
+	* src/plugins/fancy/fancy_viewer.c
+		Make options setting clearer
+
 2013-02-28 [mones]	3.9.0cvs105
 
 	* configure.ac
diff --git a/PATCHSETS b/PATCHSETS
index cbf049c38..e5b8079c0 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4603,3 +4603,4 @@
 ( cvs diff -u -r 1.94.2.242 -r 1.94.2.243 src/messageview.c;  ) > 3.9.0cvs103.patchset
 ( cvs diff -u -r 1.8.2.67 -r 1.8.2.68 README;  ) > 3.9.0cvs104.patchset
 ( cvs diff -u -r 1.654.2.4681 -r 1.654.2.4682 configure.ac;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/perl/Makefile.am;  diff -u /dev/null src/plugins/perl/cm_perl.pod;  diff -u /dev/null src/plugins/perl/tools/.cvsignore;  diff -u /dev/null src/plugins/perl/tools/Makefile.am;  diff -u /dev/null src/plugins/perl/tools/insert_perl.pl;  diff -u /dev/null src/plugins/perl/tools/matcherrc2perlfilter.pl;  ) > 3.9.0cvs105.patchset
+( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/fancy/fancy_viewer.c;  ) > 3.9.0cvs106.patchset
diff --git a/configure.ac b/configure.ac
index 0c1e93447..74aee4a2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=105
+EXTRA_VERSION=106
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index ddf90b4e1..f9ef4381d 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -381,39 +381,21 @@ static WebKitNavigationResponse
 navigation_requested_cb(WebKitWebView *view, WebKitWebFrame *frame, 
 						WebKitNetworkRequest *netreq, FancyViewer *viewer)
 {
-	if (!fancy_prefs.auto_load_images && !viewer->override_prefs_images) {
-		g_object_set(viewer->settings, "auto-load-images", FALSE, NULL);
-		webkit_web_view_set_settings(viewer->view, viewer->settings);
-	}
-	else {
-		g_object_set(viewer->settings, "auto-load-images", TRUE, NULL);
-		webkit_web_view_set_settings(viewer->view, viewer->settings);
-	}
+	g_object_set(viewer->settings, "auto-load-images",
+		fancy_prefs.auto_load_images || viewer->override_prefs_images,
+		NULL);
+	g_object_set(viewer->settings, "enable-scripts",
+		fancy_prefs.enable_scripts || viewer->override_prefs_scripts,
+		NULL);
+	g_object_set(viewer->settings, "enable-plugins",
+		fancy_prefs.enable_plugins || viewer->override_prefs_plugins,
+		NULL);
+	g_object_set(viewer->settings, "enable-java-applet",
+		fancy_prefs.enable_java || viewer->override_prefs_java,
+		NULL);
+
+	webkit_web_view_set_settings(viewer->view, viewer->settings);
 
-	if (!fancy_prefs.enable_scripts && !viewer->override_prefs_scripts) {
-		g_object_set(viewer->settings, "enable-scripts", FALSE, NULL);
-		webkit_web_view_set_settings(viewer->view, viewer->settings);
-	}
-	else {
-		g_object_set(viewer->settings, "enable-scripts", TRUE, NULL);
-		webkit_web_view_set_settings(viewer->view, viewer->settings);
-	}
-	if (!fancy_prefs.enable_plugins && !viewer->override_prefs_plugins) {
-		g_object_set(viewer->settings, "enable-plugins", FALSE, NULL);
-		webkit_web_view_set_settings(viewer->view, viewer->settings);
-	}
-	else {
-		g_object_set(viewer->settings, "enable-plugins", TRUE, NULL);
-		webkit_web_view_set_settings(viewer->view, viewer->settings);
-	}
-	if (!fancy_prefs.enable_java && !viewer->override_prefs_java) {
-		g_object_set(viewer->settings, "enable-java-applet", FALSE, NULL);
-		webkit_web_view_set_settings(viewer->view, viewer->settings);
-	}
-	else {
-		g_object_set(viewer->settings, "enable-java-applet", TRUE, NULL);
-		webkit_web_view_set_settings(viewer->view, viewer->settings);
-	}
 	if (fancy_prefs.block_extern_content && !viewer->override_prefs_block_extern_content) {
 		if (viewer->load_page) {
 			gchar *message = g_strdup_printf(_("Navigation to %s blocked"), viewer->cur_link);