/pidgin/main: ba891043ec97: Fix a type as in Masca's patch.
Elliott Sales de Andrade
qulogic at pidgin.im
Mon Nov 5 18:38:44 EST 2012
Changeset: ba891043ec97ab7b8dcc9288cf351e85f791f9e5
Author: Elliott Sales de Andrade <qulogic at pidgin.im>
Date: 2012-11-05 18:36 -0500
Branch: default
URL: http://hg.pidgin.im/pidgin/main/rev/ba891043ec97
Description:
Fix a type as in Masca's patch.
diffstat:
libpurple/media/backend-fs2.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diffs (39 lines):
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -199,10 +199,11 @@ event_probe_cb(GstPad *srcpad, GstEvent
#if GST_CHECK_VERSION(1,0,0)
gst_pad_remove_probe(srcpad,
+ g_value_get_ulong(gst_structure_get_value(s, "handler-id")));
#else
gst_pad_remove_event_probe(srcpad,
+ g_value_get_uint(gst_structure_get_value(s, "handler-id")));
#endif
- g_value_get_uint(gst_structure_get_value(s, "handler-id")));
if (g_value_get_boolean(gst_structure_get_value(s, "release-pad")))
gst_element_release_request_pad(GST_ELEMENT_PARENT(srcpad), srcpad);
@@ -225,8 +226,8 @@ static void
unlink_teepad_dynamic(GstPad *srcpad, gboolean release_pad)
{
#if GST_CHECK_VERSION(1,0,0)
- guint id = gst_pad_add_probe(srcpad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
- event_probe_cb, NULL, NULL);
+ gulong id = gst_pad_add_probe(srcpad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
+ event_probe_cb, NULL, NULL);
#else
guint id = gst_pad_add_event_probe(srcpad, G_CALLBACK(event_probe_cb), NULL);
#endif
@@ -238,7 +239,11 @@ unlink_teepad_dynamic(GstPad *srcpad, gb
gst_event_new_custom(GST_EVENT_CUSTOM_DOWNSTREAM,
gst_structure_new("purple-unlink-tee",
"release-pad", G_TYPE_BOOLEAN, release_pad,
+#if GST_CHECK_VERSION(1,0,0)
+ "handler-id", G_TYPE_ULONG, id,
+#else
"handler-id", G_TYPE_UINT, id,
+#endif
NULL)));
}
More information about the Commits
mailing list