[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[christian at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 1bada6532899c7d1f713d66c90d858550603c6a2
Author: christian at webkit.org <christian at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 4 22:50:59 2010 +0000

    2010-02-04  Christian Dywan  <christian at twotoasts.de>
    
            Rubber-stamped by Gustavo Noronha Silva.
    
            Add ENABLE(VIDEO) guards around freeOwnedGPtr<GstElement> implementation.
    
            * platform/gtk/GOwnPtrGtk.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1393be2..43698cd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-04  Christian Dywan  <christian at twotoasts.de>
+
+        Rubber-stamped by Gustavo Noronha Silva.
+
+        Add ENABLE(VIDEO) guards around freeOwnedGPtr<GstElement> implementation.
+
+        * platform/gtk/GOwnPtrGtk.cpp:
+
 2010-02-04  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/gtk/GOwnPtrGtk.cpp b/WebCore/platform/gtk/GOwnPtrGtk.cpp
index 3bb1335..8538105 100644
--- a/WebCore/platform/gtk/GOwnPtrGtk.cpp
+++ b/WebCore/platform/gtk/GOwnPtrGtk.cpp
@@ -20,7 +20,9 @@
 #include "config.h"
 #include "GOwnPtrGtk.h"
 
+#if ENABLE(VIDEO)
 #include <gst/gstelement.h>
+#endif
 #include <libsoup/soup-uri.h>
 
 namespace WTF {
@@ -31,10 +33,12 @@ template <> void freeOwnedGPtr<SoupURI>(SoupURI* ptr)
         soup_uri_free(ptr);
 }
 
+#if ENABLE(VIDEO)
 template <> void freeOwnedGPtr<GstElement>(GstElement* ptr)
 {
     if (ptr)
         gst_object_unref(ptr);
 }
+#endif
 
 }

-- 
WebKit Debian packaging