maiku.vv, im.pidgin.pidgin.vv: b0fb4896: Fix a few GLib warnings when trying to s...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: b0fb48968be0b7920578304ff5b1c43be26c9b17
Ancestor: 56b722019acec382844da07247d210ca6df8ead8
Author: maiku at soc.pidgin.im
Date: 2008-11-13T04:00:29
Branch: im.pidgin.maiku.vv
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/b0fb48968be0b7920578304ff5b1c43be26c9b17

Modified files:
        libpurple/protocols/jabber/jingle/rtp.c

ChangeLog: 

Fix a few GLib warnings when trying to start a second media session.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/rtp.c	8997af327be1605dcbe13f6e0ea4f4cd52b11d60
+++ libpurple/protocols/jabber/jingle/rtp.c	1a0dd5680973186c1f42b4d4c2338a59e47c69dd
@@ -623,6 +623,7 @@ jingle_rtp_initiate_media(JabberStream *
 	JingleTransport *transport;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
+	PurpleMedia *media;
 	
 	gchar *jid = NULL, *me = NULL, *sid = NULL;
 
@@ -668,13 +669,17 @@ jingle_rtp_initiate_media(JabberStream *
 		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