diff libpurple/media/media.c @ 29185:f65689100cfe

Move odd direction changing functionality to the Fs2 media backend.
author maiku@pidgin.im
date Tue, 27 Oct 2009 18:34:46 +0000
parents dfc724880907
children 7e9d8840e97f
line wrap: on
line diff
--- a/libpurple/media/media.c	Tue Oct 27 18:15:23 2009 +0000
+++ b/libpurple/media/media.c	Tue Oct 27 18:34:46 2009 +0000
@@ -1230,9 +1230,7 @@
 	participant = purple_media_backend_fs2_get_participant(
 			PURPLE_MEDIA_BACKEND_FS2(media->priv->backend), who);
 
-	stream = purple_media_get_stream(media, sess_id, who);
-
-	if (!stream) {
+	if (purple_media_get_stream(media, sess_id, who) == NULL) {
 		FsStream *fsstream = NULL;
 
 		fsstream = purple_media_backend_fs2_get_stream(
@@ -1249,13 +1247,6 @@
 		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
 				0, PURPLE_MEDIA_STATE_NEW,
 				session->id, who);
-	} else {
-		if (purple_media_to_fs_stream_direction(stream->session->type)
-				!= type_direction) {
-			/* change direction */
-			g_object_set(stream->stream, "direction",
-					type_direction, NULL);
-		}
 	}
 
 	return TRUE;