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

carlosgc at webkit.org carlosgc at webkit.org
Fri Jan 21 14:57:07 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 2e6a3326084fc8ce6bc9b5f65b47a18ab6043b08
Author: carlosgc at webkit.org <carlosgc at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 5 10:18:43 2011 +0000

    2011-01-05  Carlos Garcia Campos  <cgarcia at igalia.com>
    
            Unreviewed. Build fix for GTK when using gtk+-3 after r75009.
    
            * platform/gtk/RenderThemeGtk3.cpp:
            (WebCore::RenderThemeGtk::getStockIcon): Use adoptGRef instead of
            adoptGRefPtr which doesn't exist.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75055 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4c20764..e57d7b6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-05  Carlos Garcia Campos  <cgarcia at igalia.com>
+
+        Unreviewed. Build fix for GTK when using gtk+-3 after r75009.
+
+        * platform/gtk/RenderThemeGtk3.cpp:
+        (WebCore::RenderThemeGtk::getStockIcon): Use adoptGRef instead of
+        adoptGRefPtr which doesn't exist.
+
 2011-01-05  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/platform/gtk/RenderThemeGtk3.cpp b/WebCore/platform/gtk/RenderThemeGtk3.cpp
index d35e2d5..0a9bee9 100644
--- a/WebCore/platform/gtk/RenderThemeGtk3.cpp
+++ b/WebCore/platform/gtk/RenderThemeGtk3.cpp
@@ -411,7 +411,7 @@ GRefPtr<GdkPixbuf> RenderThemeGtk::getStockIcon(GType widgetType, const char* ic
 
     gtk_style_context_restore(context);
 
-    return adoptGRefPtr(icon);
+    return adoptGRef(icon);
 }
 
 Color RenderThemeGtk::platformActiveSelectionBackgroundColor() const

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list