[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

girish at forwardbias.in girish at forwardbias.in
Wed Dec 22 12:37:39 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ad9275fc18d10c5ee46b2559fe06c6f17a5ac043
Author: girish at forwardbias.in <girish at forwardbias.in@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 07:33:04 2010 +0000

    [Qt] Replace QLibrary("libgdk-x11-2.0.so.0") with QLibrary("libgdk-x11-2.0", 0)
    
    https://bugs.webkit.org/show_bug.cgi?id=44618
    
    Reviewed by Ariya Hidayat.
    
    * plugins/qt/PluginViewQt.cpp:
    (WebCore::getPluginDisplay):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 54db900..09690a3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-26  Girish Ramakrishnan  <girish at forwardbias.in>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Replace QLibrary("libgdk-x11-2.0.so.0") with QLibrary("libgdk-x11-2.0", 0)
+        https://bugs.webkit.org/show_bug.cgi?id=44618
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::getPluginDisplay):
+
 2010-08-26  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index 5c681b8..4e89c7b 100644
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -755,7 +755,7 @@ static Display *getPluginDisplay()
     // support gdk based plugins (like flash) that use a different X connection.
     // The code below has the same effect as this one:
     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-    QLibrary library("libgdk-x11-2.0.so.0");
+    QLibrary library("libgdk-x11-2.0", 0);
     if (!library.load())
         return 0;
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list