summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2011-04-18 09:16:35 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2011-04-18 09:20:30 +0200
commit5d38f0d398cc43c55f57453f32fc2856f722138c (patch)
tree309e8496e2cb23418759b90aadd2f1327cb16ed8
parent99b6b1bbb803ecf29ca16584668d475ad7f4f881 (diff)
gio: Remove the bus GSource from the main context
Prevents a valgrind warning about possibly leaked memory, see bug #647763.
-rw-r--r--tests/check/pipelines/gio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/check/pipelines/gio.c b/tests/check/pipelines/gio.c
index b7bbc199e..ee1411016 100644
--- a/tests/check/pipelines/gio.c
+++ b/tests/check/pipelines/gio.c
@@ -63,15 +63,14 @@ GST_START_TEST (test_memory_stream)
GstElement *bin;
GstElement *src, *sink;
GstBus *bus;
-
GMemoryInputStream *input;
GMemoryOutputStream *output;
-
guint8 *in_data;
guint8 *out_data;
gint i;
GstFormat fmt = GST_FORMAT_BYTES;
gint64 duration;
+ guint bus_watch = 0;
got_eos = FALSE;
@@ -105,7 +104,7 @@ GST_START_TEST (test_memory_stream)
fail_unless (gst_element_link_many (src, sink, NULL));
bus = gst_element_get_bus (bin);
- gst_bus_add_watch (bus, message_handler, loop);
+ bus_watch = gst_bus_add_watch (bus, message_handler, loop);
gst_object_unref (bus);
gst_element_set_state (bin, GST_STATE_PAUSED);
@@ -147,6 +146,7 @@ GST_START_TEST (test_memory_stream)
g_object_unref (output);
g_main_loop_unref (loop);
+ g_source_remove (bus_watch);
}
GST_END_TEST;