Mercurial > pidgin

comparison libpurple/protocols/jabber/jingle/rtp.c @ 24961:403453f8b643

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a few GLib warnings when trying to start a second media session.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Thu, 13 Nov 2008 04:00:29 +0000
parents a5f1804fcb4b
children bee5ab815291
comparison
equal deleted inserted replaced
24960:a5f1804fcb4b 24961:403453f8b643
621 JingleSession *session; 621 JingleSession *session;
622 JingleContent *content; 622 JingleContent *content;
623 JingleTransport *transport; 623 JingleTransport *transport;
624 JabberBuddy *jb; 624 JabberBuddy *jb;
625 JabberBuddyResource *jbr; 625 JabberBuddyResource *jbr;
626 PurpleMedia *media;
626 627
627 gchar *jid = NULL, *me = NULL, *sid = NULL; 628 gchar *jid = NULL, *me = NULL, *sid = NULL;
628 629
629 /* construct JID to send to */ 630 /* construct JID to send to */
630 jb = jabber_buddy_find(js, who, FALSE); 631 jb = jabber_buddy_find(js, who, FALSE);
666 jingle_session_add_content(session, content); 667 jingle_session_add_content(session, content);
667 JINGLE_RTP(content)->priv->media_type = g_strdup("video"); 668 JINGLE_RTP(content)->priv->media_type = g_strdup("video");
668 jingle_rtp_init_media(content); 669 jingle_rtp_init_media(content);
669 } 670 }
670 671
671 purple_media_ready(jingle_rtp_get_media(session)); 672 if ((media = jingle_rtp_get_media(session)) == NULL) {
672 purple_media_wait(jingle_rtp_get_media(session)); 673 return NULL;
674 }
675
676 purple_media_ready(media);
677 purple_media_wait(media);
673 678
674 g_free(jid); 679 g_free(jid);
675 g_free(me); 680 g_free(me);
676 681
677 return NULL; 682 return media;
678 } 683 }
679 684
680 void 685 void
681 jingle_rtp_terminate_session(JabberStream *js, const gchar *who) 686 jingle_rtp_terminate_session(JabberStream *js, const gchar *who)
682 { 687 {