Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/jingle.c	Wed Jul 16 21:55:08 2008 +0000
+++ b/libpurple/protocols/jabber/jingle.c	Thu Jul 17 21:01:46 2008 +0000
@@ -819,8 +819,7 @@
 	if (purple_media_candidates_prepared(media, remote_jid)) {
 		jabber_iq_send(jabber_jingle_session_create_session_accept(session));
 
-		purple_debug_info("jingle", "Sent session accept, starting stream\n");
-		gst_element_set_state(purple_media_get_pipeline(session->media), GST_STATE_PLAYING);
+		purple_debug_info("jingle", "Sent session accept.\n");
 		jabber_jingle_session_set_state(session, ACTIVE);
 	} else
 		jabber_jingle_session_set_state(session, ACCEPTED);
@@ -922,9 +921,7 @@
 				jabber_jingle_session_get_remote_jid(session))) {
 		jabber_iq_send(jabber_jingle_session_create_session_accept(session));
 		
-		purple_debug_info("jingle", "Sent session accept, starting stream\n");
-		gst_element_set_state(purple_media_get_pipeline(session->media),
-				      GST_STATE_PLAYING);
+		purple_debug_info("jingle", "Sent session accept.\n");
 		jabber_jingle_session_set_state(session, ACTIVE);
 	}
 }
@@ -1223,9 +1220,7 @@
 
 	if (!strcmp(action, "session-accept")) {
 		purple_media_got_accept(jabber_jingle_session_get_media(session));
-		purple_debug_info("jingle", "Got session-accept, starting stream\n");
-		gst_element_set_state(purple_media_get_pipeline(session->media),
-				      GST_STATE_PLAYING);
+		purple_debug_info("jingle", "Got session-accept");
 	}
 
 	jabber_iq_send(jabber_jingle_session_create_ack(session, jingle));
@@ -1332,8 +1327,6 @@
 
 	/* maybe we should look at the reasoncode to determine if it was
 	   a hangup or a reject, and call different callbacks to purple_media */
-	gst_element_set_state(purple_media_get_pipeline(session->media), GST_STATE_NULL);
-
 	purple_media_got_hangup(jabber_jingle_session_get_media(session));
 	jabber_iq_send(jabber_jingle_session_create_ack(session, jingle));
 	jabber_jingle_session_destroy(session);