[Xfce4-commits] <midori:master> Use enable-javascript in both WebKit1 and WebKit2

[Christian Dywan]

Updating branch refs/heads/master
         to 710fa9410b9b8e26a74ca94a2509b6faf9e83a91 (commit)
       from 93944622d29c065014e188108a11ec373bce3d89 (commit)

commit 710fa9410b9b8e26a74ca94a2509b6faf9e83a91
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Mar 17 09:51:29 2013 +0100

    Use enable-javascript in both WebKit1 and WebKit2

 extensions/statusbar-features.c |    6 +++---
 midori/midori-preferences.c     |    2 +-
 midori/midori-settings.vala     |    6 ++++++
 midori/midori-speeddial.vala    |    2 +-
 midori/midori-view.c            |    2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c
index 4cb65c0..6be3ff2 100644
--- a/extensions/statusbar-features.c
+++ b/extensions/statusbar-features.c
@@ -116,7 +116,7 @@ statusbar_features_property_proxy (MidoriWebSettings* settings,
     GtkWidget* button;
     GtkWidget* image;
     if (!strcmp (property, "auto-load-images")
-     || !strcmp (property, "enable-scripts")
+     || !strcmp (property, "enable-javascript")
      || !strcmp (property, "enable-plugins"))
         kind = "toggle";
     else if (!strcmp (property, "identify-as"))
@@ -157,7 +157,7 @@ statusbar_features_property_proxy (MidoriWebSettings* settings,
         g_signal_connect (toolbar, "notify::toolbar-style",
             G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button);
     }
-    if (!strcmp (property, "enable-scripts"))
+    if (!strcmp (property, "enable-javascript"))
     {
         g_object_set_data (G_OBJECT (button), "feature-label", _("Scripts"));
         image = gtk_image_new_from_stock (STOCK_SCRIPT, GTK_ICON_SIZE_MENU);
@@ -218,7 +218,7 @@ statusbar_features_app_add_browser_cb (MidoriApp*       app,
     {
         button = statusbar_features_property_proxy (settings, "auto-load-images", toolbar);
         gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
-        button = statusbar_features_property_proxy (settings, "enable-scripts", toolbar);
+        button = statusbar_features_property_proxy (settings, "enable-javascript", toolbar);
         gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
         button = statusbar_features_property_proxy (settings, "enable-plugins", toolbar);
         gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index f8c318e..6958e95 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -378,7 +378,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
         else
             g_free (enchant_path);
     }
-    button = katze_property_proxy (settings, "enable-scripts", NULL);
+    button = katze_property_proxy (settings, "enable-javascript", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts"));
     INDENTED_ADD (button);
     #if WEBKIT_CHECK_VERSION (1, 3, 8)
diff --git a/midori/midori-settings.vala b/midori/midori-settings.vala
index 18ffe79..6976e98 100644
--- a/midori/midori-settings.vala
+++ b/midori/midori-settings.vala
@@ -21,6 +21,12 @@ namespace Midori {
     /* Since: 0.1.3 */
 #if !HAVE_WEBKIT2
     public class Settings : WebKit.WebSettings {
+        /* Since: 0.5.0 */
+        public bool enable_javascript { get {
+            return enable_scripts;
+        } set {
+            enable_scripts = value;
+        } default = true; }
 #else
     public class Settings : WebKit.Settings {
 #endif
diff --git a/midori/midori-speeddial.vala b/midori/midori-speeddial.vala
index 899e3f2..d8dc29a 100644
--- a/midori/midori-speeddial.vala
+++ b/midori/midori-speeddial.vala
@@ -365,7 +365,7 @@ namespace Midori {
             if (thumb_view == null) {
                 thumb_view = new WebKit.WebView ();
                 var settings = new WebKit.WebSettings ();
-                settings. set ("enable-scripts", false,
+                settings. set ("enable-javascript", false,
                                "enable-plugins", false,
                                "auto-load-images", true,
                                "enable-html5-database", false,
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 18991ac..214d635 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3488,7 +3488,7 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings,
         view->middle_click_opens_selection = g_value_get_boolean (&value);
     else if (name == g_intern_string ("open-tabs-in-the-background"))
         view->open_tabs_in_the_background = g_value_get_boolean (&value);
-    else if (name == g_intern_string ("enable-scripts"))
+    else if (name == g_intern_string ("enable-javascript"))
     {
         /* Speed dial is only editable with scripts, so regenerate it */
         if (midori_view_is_blank (view))