diff --git a/INSTALL b/INSTALL index aed4768e..50ae6001 100644 --- a/INSTALL +++ b/INSTALL @@ -67,6 +67,8 @@ If you want to "dry run" without WebKitGTK+ rendering, try this: 'MIDORI_UNARMED=1 _build_/default/midori/midori' +To disable Netscape plugins, use MOZ_PLUGIN_PATH=/. + To debug extensions you can specify the path: 'export MIDORI_EXTENSION_PATH=_build_/default/extensions' diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index 9480fec7..24e55f2a 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -142,8 +142,11 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, g_signal_connect (toolbar, "notify::toolbar-style", G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); - button = katze_property_proxy (settings, "enable-plugins", "toggle"); - g_object_set_data (G_OBJECT (button), "feature-label", _("Netscape plugins")); + if (midori_web_settings_has_plugin_support ()) + { + button = katze_property_proxy (settings, "enable-plugins", "toggle"); + g_object_set_data (G_OBJECT (button), "feature-label", _("Netscape plugins")); + } image = gtk_image_new_from_stock (STOCK_PLUGINS, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), image); gtk_widget_set_tooltip_text (button, _("Enable Netscape plugins")); diff --git a/midori/main.c b/midori/main.c index 08b163a3..f0efec49 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1743,6 +1743,8 @@ midori_clear_web_cookies_cb (void) } /* Local shared objects/ Flash cookies */ + if (midori_web_settings_has_plugin_support ()) + { #ifdef GDK_WINDOWING_X11 cache = g_build_filename (g_get_home_dir (), ".macromedia", "Flash_Player", NULL); sokoke_remove_path (cache, TRUE); @@ -1757,6 +1759,7 @@ midori_clear_web_cookies_cb (void) sokoke_remove_path (cache, TRUE); g_free (cache); #endif + } /* HTML5 databases */ webkit_remove_all_web_databases (); diff --git a/midori/midori-view.c b/midori/midori-view.c index 77b32737..a94881fa 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3660,6 +3660,8 @@ midori_view_construct_web_view (MidoriView* view) static gchar* list_netscape_plugins () { + if (midori_web_settings_has_plugin_support ()) + { GtkWidget* web_view = webkit_web_view_new (); WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); @@ -3671,7 +3673,7 @@ static gchar* list_netscape_plugins () "plugins (navigator.plugins)", NULL); gchar** items = g_strsplit (value, ",", 0); guint i = 0; - GString* ns_plugins = g_string_new (NULL); + GString* ns_plugins = g_string_new ("
No plugins found |