[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[philn at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit b5d20fc1e86b8849f30e13e01a85cbf541441b92
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 11:04:46 2010 +0000

    2009-12-22  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Eric Seidel.
    
            [GTK] G_OBJECT() cast is not necessary for signals connection and properties access
            https://bugs.webkit.org/show_bug.cgi?id=32661
    
            Reverted the SENTINEL / NULL crap :) Hopefully the style-bot won't
            complain about NULL usage in g_object_{get,set} anymore.
    
            * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::MediaPlayerPrivate::hasVideo):
            (WebCore::MediaPlayerPrivate::hasAudio):
            (WebCore::MediaPlayerPrivate::setVolume):
            (WebCore::MediaPlayerPrivate::setRate):
            (WebCore::MediaPlayerPrivate::updateStates):
            (WebCore::MediaPlayerPrivate::createGSTPlayBin):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52727 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cc493ee..d03bc4e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2009-12-22  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] G_OBJECT() cast is not necessary for signals connection and properties access
+        https://bugs.webkit.org/show_bug.cgi?id=32661
+
+        Reverted the SENTINEL / NULL crap :) Hopefully the style-bot won't
+        complain about NULL usage in g_object_{get,set} anymore.
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::hasVideo):
+        (WebCore::MediaPlayerPrivate::hasAudio):
+        (WebCore::MediaPlayerPrivate::setVolume):
+        (WebCore::MediaPlayerPrivate::setRate):
+        (WebCore::MediaPlayerPrivate::updateStates):
+        (WebCore::MediaPlayerPrivate::createGSTPlayBin):
+
 2010-01-04  Alex Milowski  <alex at milowski.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
index 384f9f6..0984a46 100644
--- a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
@@ -48,8 +48,6 @@
 #include <math.h>
 #include <wtf/gtk/GOwnPtr.h>
 
-#define SENTINEL (void*) 0
-
 using namespace std;
 
 namespace WebCore {
@@ -414,7 +412,7 @@ bool MediaPlayerPrivate::hasVideo() const
 {
     gint currentVideo = -1;
     if (m_playBin)
-        g_object_get(m_playBin, "current-video", &currentVideo, SENTINEL);
+        g_object_get(m_playBin, "current-video", &currentVideo, NULL);
     return currentVideo > -1;
 }
 
@@ -422,7 +420,7 @@ bool MediaPlayerPrivate::hasAudio() const
 {
     gint currentAudio = -1;
     if (m_playBin)
-        g_object_get(m_playBin, "current-audio", &currentAudio, SENTINEL);
+        g_object_get(m_playBin, "current-audio", &currentAudio, NULL);
     return currentAudio > -1;
 }
 
@@ -431,7 +429,7 @@ void MediaPlayerPrivate::setVolume(float volume)
     if (!m_playBin)
         return;
 
-    g_object_set(m_playBin, "volume", static_cast<double>(volume), SENTINEL);
+    g_object_set(m_playBin, "volume", static_cast<double>(volume), NULL);
 }
 
 void MediaPlayerPrivate::volumeChanged()
@@ -489,7 +487,7 @@ void MediaPlayerPrivate::setRate(float rate)
                           GST_SEEK_TYPE_SET, end))
         LOG_VERBOSE(Media, "Set rate to %f failed", rate);
     else
-        g_object_set(m_playBin, "mute", mute, SENTINEL);
+        g_object_set(m_playBin, "mute", mute, NULL);
 }
 
 int MediaPlayerPrivate::dataRate() const
@@ -636,7 +634,7 @@ void MediaPlayerPrivate::updateStates()
 
         m_networkState = MediaPlayer::Loaded;
 
-        g_object_get(m_playBin, "source", &m_source, SENTINEL);
+        g_object_get(m_playBin, "source", &m_source, NULL);
         if (!m_source)
             LOG_VERBOSE(Media, "m_source is 0");
         break;
@@ -927,7 +925,7 @@ void MediaPlayerPrivate::createGSTPlayBin(String url)
     g_signal_connect(bus, "message", G_CALLBACK(mediaPlayerPrivateMessageCallback), this);
     gst_object_unref(bus);
 
-    g_object_set(m_playBin, "uri", url.utf8().data(), SENTINEL);
+    g_object_set(m_playBin, "uri", url.utf8().data(), NULL);
 
     g_signal_connect(m_playBin, "notify::volume", G_CALLBACK(mediaPlayerPrivateVolumeChangedCallback), this);
 
@@ -939,16 +937,16 @@ void MediaPlayerPrivate::createGSTPlayBin(String url)
     if (channel->state == WTFLogChannelOn) {
         m_fpsSink = gst_element_factory_make("fpsdisplaysink", "sink");
         if (g_object_class_find_property(G_OBJECT_GET_CLASS(m_fpsSink), "video-sink")) {
-            g_object_set(m_fpsSink, "video-sink", m_videoSink, SENTINEL);
+            g_object_set(m_fpsSink, "video-sink", m_videoSink, NULL);
             g_object_ref_sink(m_fpsSink);
-            g_object_set(m_playBin, "video-sink", m_fpsSink, SENTINEL);
+            g_object_set(m_playBin, "video-sink", m_fpsSink, NULL);
         } else {
             m_fpsSink = 0;
-            g_object_set(m_playBin, "video-sink", m_videoSink, SENTINEL);
+            g_object_set(m_playBin, "video-sink", m_videoSink, NULL);
             LOG(Media, "Can't display FPS statistics, you need gst-plugins-bad >= 0.10.18");
         }
     } else
-        g_object_set(m_playBin, "video-sink", m_videoSink, SENTINEL);
+        g_object_set(m_playBin, "video-sink", m_videoSink, NULL);
 
     g_signal_connect(m_videoSink, "repaint-requested", G_CALLBACK(mediaPlayerPrivateRepaintCallback), this);
 }

-- 
WebKit Debian packaging