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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit eed464855d32f7c8000ac6647b1e631e3dedaed2
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 11:13:13 2010 +0000

    2010-12-17  Carlos Garcia Campos  <cgarcia at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] Compile warning introduced in r74129
            https://bugs.webkit.org/show_bug.cgi?id=51181
    
            * platform/gtk/RenderThemeGtk.cpp:
            (WebCore::RenderThemeGtk::gtkContainer):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74246 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5c9d29f..2a4454e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-17  Carlos Garcia Campos  <cgarcia at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Compile warning introduced in r74129
+        https://bugs.webkit.org/show_bug.cgi?id=51181
+
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::gtkContainer):
+
 2010-12-17  James Simonsen  <simonjam at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/platform/gtk/RenderThemeGtk.cpp b/WebCore/platform/gtk/RenderThemeGtk.cpp
index f732c16..d3c39e9 100644
--- a/WebCore/platform/gtk/RenderThemeGtk.cpp
+++ b/WebCore/platform/gtk/RenderThemeGtk.cpp
@@ -818,7 +818,7 @@ GtkWidget* RenderThemeGtk::gtkContainer() const
         return m_gtkContainer;
 
     m_gtkWindow = gtk_window_new(GTK_WINDOW_POPUP);
-#if GTK_API_VERSION_2
+#ifdef GTK_API_VERSION_2
     gtk_widget_set_colormap(m_gtkWindow, m_themeParts.colormap);
 #endif
     gtk_widget_realize(m_gtkWindow);

-- 
WebKit Debian packaging