Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/jingle/rtp.c	Tue Jan 13 13:01:50 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/rtp.c	Tue Jan 13 13:43:13 2009 +0000
@@ -553,7 +553,7 @@
 			/* This needs to be for the entire session, not a single content */
 			/* very hacky */
 			if (xmlnode_get_next_twin(xmlcontent) == NULL)
-				purple_media_got_accept(jingle_rtp_get_media(session));
+				purple_media_accept(jingle_rtp_get_media(session));
 
 			g_object_unref(session);
 			break;
@@ -585,10 +585,6 @@
 						candidates);
 			}
 
-			/* very hacky */
-			if (xmlnode_get_next_twin(xmlcontent) == NULL)
-				purple_media_ready(jingle_rtp_get_media(session));
-
 			g_object_unref(session);
 			break;
 		}
@@ -696,9 +692,6 @@
 		return NULL;
 	}
 
-	purple_media_ready(media);
-	purple_media_wait(media);
-
 	g_free(jid);
 	g_free(me);