pidgin.vv: ea95803d: Set the purple_media_connected_cb timeou...
maiku at soc.pidgin.im
maiku at soc.pidgin.im
Mon Feb 2 02:10:54 EST 2009
-----------------------------------------------------------------
Revision: ea95803dbb84a2724c0ca489b0c7bc9ceca3e1ff
Ancestor: 8a94ecf4760bc3dc342321fe81f9b44ee93b801d
Author: maiku at soc.pidgin.im
Date: 2009-02-02T05:38:29
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/ea95803dbb84a2724c0ca489b0c7bc9ceca3e1ff
Modified files:
libpurple/media.c
ChangeLog:
Set the purple_media_connected_cb timeout to a high priority and remove
it when stream is freed.
-------------- next part --------------
============================================================
--- libpurple/media.c 00921f7ff0f9e62ed8138a563176f05463228aa6
+++ libpurple/media.c 071de82d3a209571bc4f2eeb117806c49858f3ca
@@ -240,6 +240,9 @@ purple_media_stream_free(PurpleMediaStre
if (stream == NULL)
return;
+ /* Remove the connected_cb timeout */
+ g_source_remove_by_user_data(stream);
+
g_free(stream->participant);
if (stream->local_candidates)
@@ -1685,7 +1688,8 @@ purple_media_src_pad_added_cb(FsStream *
gst_pad_link(srcpad, sinkpad);
gst_element_set_state(stream->sink, GST_STATE_PLAYING);
- g_timeout_add(0, (GSourceFunc)purple_media_connected_cb, stream);
+ g_timeout_add_full(G_PRIORITY_HIGH, 0,
+ (GSourceFunc)purple_media_connected_cb, stream, NULL);
}
static gboolean
More information about the Commits
mailing list