diff --git a/midori/midori-view.c b/midori/midori-view.c index 35c08853..fb10fb59 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3790,11 +3790,13 @@ midori_view_construct_web_view (MidoriView* view) NULL); } -static gchar* -list_netscape_plugins (JSContextRef js_context) +static void +list_netscape_plugins (GString* ns_plugins, + JSContextRef js_context) { - if (midori_web_settings_has_plugin_support ()) - { + if (!midori_web_settings_has_plugin_support ()) + return; + /* Joins available plugins like this: URI1|title1,URI2|title2 */ gchar* value = sokoke_js_script_eval (js_context, "function plugins (l) { var f = new Array (); for (var i in l) " @@ -3803,7 +3805,7 @@ list_netscape_plugins (JSContextRef js_context) "plugins (navigator.plugins)", NULL); gchar** items = g_strsplit (value, ",", 0); guint i = 0; - GString* ns_plugins = g_string_new ("
"); + guint i; + for (i = 0; i < G_N_ELEMENTS (valid_about_uris); i++) + g_string_append_printf (markup, "%s ", + valid_about_uris[i], valid_about_uris[i]); +} + static gchar* prepare_speed_dial_html (MidoriView* view, gboolean load_missing) @@ -4168,8 +4183,11 @@ midori_view_set_uri (MidoriView* view, gchar* ident = katze_object_get_string (view->settings, "user-agent"); WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); - gchar* netscape_plugins = list_netscape_plugins (js_context); gchar* video_formats = list_video_formats (js_context); + GString* more = g_string_new (""); + list_netscape_plugins (more, js_context); + list_geolocation (more); + list_about_uris (more); katze_assign (view->uri, g_strdup (uri)); data = g_strdup_printf ( @@ -4193,7 +4211,7 @@ midori_view_set_uri (MidoriView* view, "