/pidgin/main: 15c91f0b009d: Fix call to gst_iterator_next, which...
Elliott Sales de Andrade
qulogic at pidgin.im
Mon Nov 5 18:15:57 EST 2012
Changeset: 15c91f0b009d5d03e468263ae056aa8ab39fa007
Author: Elliott Sales de Andrade <qulogic at pidgin.im>
Date: 2012-09-09 22:37 -0400
Branch: default
URL: http://hg.pidgin.im/pidgin/main/rev/15c91f0b009d
Description:
Fix call to gst_iterator_next, which takes a GValue now.
diffstat:
libpurple/mediamanager.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diffs (36 lines):
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -408,20 +408,31 @@ request_pad_unlinked_cb(GstPad *pad, Gst
{
GstElement *parent = GST_ELEMENT_PARENT(pad);
GstIterator *iter;
+#if GST_CHECK_VERSION(0,11,0)
+ GValue tmp = G_VALUE_INIT;
+#endif
GstPad *remaining_pad;
GstIteratorResult result;
- gst_element_release_request_pad(GST_ELEMENT_PARENT(pad), pad);
+ gst_element_release_request_pad(parent, pad);
iter = gst_element_iterate_src_pads(parent);
+#if GST_CHECK_VERSION(0,11,0)
+ result = gst_iterator_next(iter, &tmp);
+#else
result = gst_iterator_next(iter, (gpointer)&remaining_pad);
+#endif
if (result == GST_ITERATOR_DONE) {
gst_element_set_locked_state(parent, TRUE);
gst_element_set_state(parent, GST_STATE_NULL);
gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(parent)), parent);
} else if (result == GST_ITERATOR_OK) {
+#if GST_CHECK_VERSION(0,11,0)
+ remaining_pad = g_value_get_object(&tmp);
+ g_value_reset(&tmp);
+#endif
gst_object_unref(remaining_pad);
}
More information about the Commits
mailing list