diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Tools/GtkLauncher | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Tools/GtkLauncher')
| -rw-r--r-- | Tools/GtkLauncher/main.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/Tools/GtkLauncher/main.c b/Tools/GtkLauncher/main.c index ad666e2..a1baf05 100644 --- a/Tools/GtkLauncher/main.c +++ b/Tools/GtkLauncher/main.c @@ -230,24 +230,6 @@ static gchar* filenameToURL(const char* filename) return fileURL; } -#ifndef GTK_API_VERSION_2 -static void disablePlugin(const char* pluginName) -{ - WebKitWebPluginDatabase *database = webkit_get_web_plugin_database(); - GSList *plugins = webkit_web_plugin_database_get_plugins(database); - GSList *p; - - for (p = plugins; p; p = g_slist_next(p)) { - WebKitWebPlugin *plugin = WEBKIT_WEB_PLUGIN(p->data); - - if (!g_strcmp0(webkit_web_plugin_get_name(plugin), pluginName)) - webkit_web_plugin_set_enabled(plugin, FALSE); - } - - webkit_web_plugin_database_plugins_list_free(plugins); -} -#endif - int main(int argc, char* argv[]) { WebKitWebView *webView; @@ -257,10 +239,6 @@ int main(int argc, char* argv[]) if (!g_thread_supported()) g_thread_init(NULL); -#ifndef GTK_API_VERSION_2 - disablePlugin("Shockwave Flash"); -#endif - main_window = createWindow(&webView); gchar *uri =(gchar*)(argc > 1 ? argv[1] : "http://www.google.com/"); |