# HG changeset patch
# User maiku@pidgin.im
# Date 1250071494 0
# Node ID 359800ae7d17c24e0dad6e30ca3171940fca58c0
# Parent  dad4cb8f81df6d07bca53ef23cb3ef082fa59a2a# Parent  d865064a3104ae7335cbcd8e60894a54eb78d234
merge of '235259eaef44e8bacfe07e83eb5c66ddd4887ace'
     and '2417ca53bef6c584fa8f1e7d5d205793a7091496'

diff -r dad4cb8f81df -r 359800ae7d17 libpurple/media.c
--- a/libpurple/media.c	Wed Aug 12 07:36:51 2009 +0000
+++ b/libpurple/media.c	Wed Aug 12 10:04:54 2009 +0000
@@ -2463,12 +2463,12 @@
 			gst_bin_add(GST_BIN(priv->confbin), stream->volume);
 			gst_bin_add(GST_BIN(priv->confbin), stream->level);
 			gst_bin_add(GST_BIN(priv->confbin), sink);
+			gst_element_set_state(sink, GST_STATE_PLAYING);
+			gst_element_set_state(stream->level, GST_STATE_PLAYING);
+			gst_element_set_state(stream->volume, GST_STATE_PLAYING);
 			gst_element_link(stream->level, sink);
 			gst_element_link(stream->volume, stream->level);
 			gst_element_link(queue, stream->volume);
-			gst_element_sync_state_with_parent(sink);
-			gst_element_sync_state_with_parent(stream->level);
-			gst_element_sync_state_with_parent(stream->volume);
 			sink = queue;
 		} else if (codec->media_type == FS_MEDIA_TYPE_VIDEO) {
 			stream->src = gst_element_factory_make(
@@ -2481,9 +2481,9 @@
 		stream->tee = gst_element_factory_make("tee", NULL);
 		gst_bin_add_many(GST_BIN(priv->confbin),
 				stream->src, stream->tee, NULL);
-		gst_element_sync_state_with_parent(sink);
-		gst_element_sync_state_with_parent(stream->tee);
-		gst_element_sync_state_with_parent(stream->src);
+		gst_element_set_state(sink, GST_STATE_PLAYING);
+		gst_element_set_state(stream->tee, GST_STATE_PLAYING);
+		gst_element_set_state(stream->src, GST_STATE_PLAYING);
 		gst_element_link_many(stream->src, stream->tee, sink, NULL);
 	}
 
diff -r dad4cb8f81df -r 359800ae7d17 libpurple/mediamanager.c
--- a/libpurple/mediamanager.c	Wed Aug 12 07:36:51 2009 +0000
+++ b/libpurple/mediamanager.c	Wed Aug 12 10:04:54 2009 +0000
@@ -751,9 +751,9 @@
 					G_CALLBACK(window_id_cb), ow);
 			gst_object_unref(bus);
 
-			gst_element_sync_state_with_parent(ow->sink);
+			gst_element_set_state(ow->sink, GST_STATE_PLAYING);
+			gst_element_set_state(queue, GST_STATE_PLAYING);
 			gst_element_link(queue, ow->sink);
-			gst_element_sync_state_with_parent(queue);
 			gst_element_link(tee, queue);
 		}
 	}