# HG changeset patch # User Mike Ruprecht # Date 1226548829 0 # Node ID 403453f8b6431da0bc2aff71ffe8d8e33a8e186a # Parent a5f1804fcb4be33d77df218e8fa9661908dd8b1d Fix a few GLib warnings when trying to start a second media session. diff -r a5f1804fcb4b -r 403453f8b643 libpurple/protocols/jabber/jingle/rtp.c --- a/libpurple/protocols/jabber/jingle/rtp.c Thu Nov 13 03:46:28 2008 +0000 +++ b/libpurple/protocols/jabber/jingle/rtp.c Thu Nov 13 04:00:29 2008 +0000 @@ -623,6 +623,7 @@ JingleTransport *transport; JabberBuddy *jb; JabberBuddyResource *jbr; + PurpleMedia *media; gchar *jid = NULL, *me = NULL, *sid = NULL; @@ -668,13 +669,17 @@ jingle_rtp_init_media(content); } - purple_media_ready(jingle_rtp_get_media(session)); - purple_media_wait(jingle_rtp_get_media(session)); + if ((media = jingle_rtp_get_media(session)) == NULL) { + return NULL; + } + + purple_media_ready(media); + purple_media_wait(media); g_free(jid); g_free(me); - return NULL; + return media; } void