[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5307205b8ad8a7352b7542007a4b551660047d40
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 27 17:37:25 2010 +0000

    2010-12-27  Carlos Garcia Campos  <cgarcia at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] Disable flash plugin in GtkLauncher when using gtk3
            https://bugs.webkit.org/show_bug.cgi?id=51591
    
            Flash plugin uses gtk2 that is incompatible with gtk3 making
            webkit crash when it's built with gtk3.
    
            * GtkLauncher/main.c:
            (main):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74685 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 18b27c8..cbf5af9 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-27  Carlos Garcia Campos  <cgarcia at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Disable flash plugin in GtkLauncher when using gtk3
+        https://bugs.webkit.org/show_bug.cgi?id=51591
+
+        Flash plugin uses gtk2 that is incompatible with gtk3 making
+        webkit crash when it's built with gtk3.
+
+        * GtkLauncher/main.c:
+        (main):
+
 2010-12-25  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/Tools/GtkLauncher/main.c b/Tools/GtkLauncher/main.c
index a1baf05..ad666e2 100644
--- a/Tools/GtkLauncher/main.c
+++ b/Tools/GtkLauncher/main.c
@@ -230,6 +230,24 @@ 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;
@@ -239,6 +257,10 @@ 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/");

-- 
WebKit Debian packaging