Mercurial > pidgin
comparison libpurple/mediamanager.c @ 29297:338d6a211055
propagate from branch 'im.pidgin.pidgin' (head 46ae10a850bb3c3ce9a3bb47a7de9edd4becdb93)
to branch 'im.pidgin.cpw.attention_ui' (head 35fb2ab19ffca9636faa388b208d31fe7f70caa3)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 28 Jul 2009 20:52:33 +0000 |
| parents | feb17f2b5b7a |
| children | 6ed9c1def7c8 |
comparison
equal
deleted
inserted
replaced
| 29296:15cde23b43bc | 29297:338d6a211055 |
|---|---|
| 778 GstElement *queue = GST_ELEMENT_PARENT(peer); | 778 GstElement *queue = GST_ELEMENT_PARENT(peer); |
| 779 gst_object_unref(pad); | 779 gst_object_unref(pad); |
| 780 pad = gst_element_get_static_pad(queue, "sink"); | 780 pad = gst_element_get_static_pad(queue, "sink"); |
| 781 peer = gst_pad_get_peer(pad); | 781 peer = gst_pad_get_peer(pad); |
| 782 gst_object_unref(pad); | 782 gst_object_unref(pad); |
| 783 gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer); | 783 if (peer != NULL) |
| 784 gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer); | |
| 784 gst_element_set_locked_state(queue, TRUE); | 785 gst_element_set_locked_state(queue, TRUE); |
| 785 gst_element_set_state(queue, GST_STATE_NULL); | 786 gst_element_set_state(queue, GST_STATE_NULL); |
| 786 gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue); | 787 gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue); |
| 787 gst_element_set_locked_state(output_window->sink, TRUE); | 788 gst_element_set_locked_state(output_window->sink, TRUE); |
| 788 gst_element_set_state(output_window->sink, GST_STATE_NULL); | 789 gst_element_set_state(output_window->sink, GST_STATE_NULL); |