# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1238480607 0
# Node ID 5a7fa2093d1e9d20eb201747de16c830b9c92baa
# Parent  de03cce95e1796c1ae63ec58844dcb4fce9403b6
Make Finch not crash if someone requests a session with video with you.

diff -r de03cce95e17 -r 5a7fa2093d1e libpurple/media.c
--- a/libpurple/media.c	Tue Mar 31 05:35:22 2009 +0000
+++ b/libpurple/media.c	Tue Mar 31 06:23:27 2009 +0000
@@ -1137,6 +1137,7 @@
 	GstPad *srcpad;
 
 	g_return_if_fail(PURPLE_IS_MEDIA(media));
+	g_return_if_fail(GST_IS_ELEMENT(src));
 
 	session = purple_media_get_session(media, sess_id);
 
@@ -1679,6 +1680,7 @@
 		GList *codec_conf = NULL;
 		gchar *filename = NULL;
 		PurpleMediaSessionType session_type;
+		GstElement *src = NULL;
 
 		session = g_new0(PurpleMediaSession, 1);
 
@@ -1742,9 +1744,17 @@
 
 		session_type = purple_media_from_fs(media_type,
 				FS_DIRECTION_SEND);
-		purple_media_set_src(media, session->id,
-				purple_media_manager_get_element(
-				media->priv->manager, session_type));
+		src = purple_media_manager_get_element(
+				media->priv->manager, session_type);
+		if (!GST_IS_ELEMENT(src)) {
+			purple_debug_error("media",
+					"Error creating src for session %s\n",
+					session->id);
+			purple_media_end(media, session->id, NULL);
+			return FALSE;
+		}
+
+		purple_media_set_src(media, session->id, src);
 		gst_element_set_state(session->src, GST_STATE_PLAYING);
 
 		purple_media_manager_create_output_window(
@@ -1940,6 +1950,14 @@
 	g_return_if_fail(PURPLE_IS_MEDIA(media));
 	stream = purple_media_get_stream(media, sess_id, name);
 
+	if (stream == NULL) {
+		purple_debug_error("media",
+				"purple_media_add_remote_candidates: "
+				"couldn't find stream %s %s.\n",
+				sess_id, name);
+		return;
+	}
+
 	stream->remote_candidates = g_list_concat(stream->remote_candidates,
 			purple_media_candidate_list_to_fs(remote_candidates));