From 6292ff4ae06bd9c1e4bc21c038d685bf695f948a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 26 May 2009 11:13:35 +0100 Subject: [PATCH] Revert "rtspconnection: don't use GLib-2.16 API, we require only 2.14" This reverts commit 418760cf740332c12c3fd9cf3244af134fa9534b. We now require GLib 2.16. --- gst-libs/gst/rtsp/gstrtspconnection.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c index 0ee93c9..74e735c 100644 --- a/gst-libs/gst/rtsp/gstrtspconnection.c +++ b/gst-libs/gst/rtsp/gstrtspconnection.c @@ -2808,12 +2808,9 @@ static void gst_rtsp_source_finalize (GSource * source) { GstRTSPWatch *watch = (GstRTSPWatch *) source; - gpointer rtsp_rec; build_reset (&watch->builder); - while ((rtsp_rec = g_async_queue_try_pop (watch->messages))) - gst_rtsp_rec_free (rtsp_rec); g_async_queue_unref (watch->messages); watch->messages = NULL; @@ -2865,8 +2862,7 @@ gst_rtsp_watch_new (GstRTSPConnection * conn, result->conn = conn; result->builder.state = STATE_START; - /* FIXME: use g_async_queue_new_full() once we depend on GLib >= 2.16 */ - result->messages = g_async_queue_new (); + result->messages = g_async_queue_new_full (gst_rtsp_rec_free); result->readfd.fd = -1; result->writefd.fd = -1; -- 2.7.4