# HG changeset patch
# User Michael Ruprecht <maiku@pidgin.im>
# Date 1248232548 0
# Node ID a96e1707a83438f839f510e1083ea786986738f8
# Parent  7ed64195754dc3d01b95e1419bd11694f81c5a4f# Parent  7c38fd0e3b4548abdd628c55c5bd778a1698d742
merge of '7ed64195754dc3d01b95e1419bd11694f81c5a4f'
     and '7c38fd0e3b4548abdd628c55c5bd778a1698d742'

diff -r 7c38fd0e3b45 -r a96e1707a834 libpurple/mediamanager.c
--- a/libpurple/mediamanager.c	Wed Jul 22 02:36:28 2009 +0000
+++ b/libpurple/mediamanager.c	Wed Jul 22 03:15:48 2009 +0000
@@ -780,7 +780,8 @@
 		pad = gst_element_get_static_pad(queue, "sink");
 		peer = gst_pad_get_peer(pad);
 		gst_object_unref(pad);
-		gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer);
+		if (peer != NULL)
+			gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer);
 		gst_element_set_locked_state(queue, TRUE);
 		gst_element_set_state(queue, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue);
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/gtkconv.c
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/dialogs/scalable/auth.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/dialogs/scalable/cool.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/dialogs/scalable/dialog.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/dialogs/scalable/error.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/dialogs/scalable/info.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/dialogs/scalable/mail.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/dialogs/scalable/question.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/dialogs/scalable/warning.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/aol-client.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/birthday.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/blocked.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/bot.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/external.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/female.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/free-for-chat.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/game.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/male.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/mobile.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/music.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/not-authorized.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/qq-member.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/secure.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/unavailable.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/video.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/emblems/scalable/voice.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/icons/hicolor/scalable/apps/pidgin.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/logo-nonvv.png
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/aim.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/bonjour.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/gadu-gadu.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/google-talk.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/icq.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/irc.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/jabber.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/meanwhile.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/msn.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/novell.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/qq.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/silc.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/simple.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/yahoo.svg
diff -r 7c38fd0e3b45 -r a96e1707a834 pidgin/pixmaps/protocols/scalable/zephyr.svg