# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1240425581 0
# Node ID 33f4330401d52f81f93b914593df1afa40772c30
# Parent  d06af7664a7a7e14b324d245c74541d84e47f78c# Parent  9e0001caa207de1404086ab76bc4db85067394a3
merge of '9a8c2abfdbcf669fd21ec24f4aa474ac55a2ecb9'
     and 'fe650fc58681996bf988489a65e10198e25c1fd3'

diff -r 9e0001caa207 -r 33f4330401d5 libpurple/protocols/jabber/jingle/content.c
--- a/libpurple/protocols/jabber/jingle/content.c	Wed Apr 22 17:07:41 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/content.c	Wed Apr 22 18:39:41 2009 +0000
@@ -391,7 +391,13 @@
 jingle_content_parse(xmlnode *content)
 {
 	const gchar *type = xmlnode_get_namespace(xmlnode_get_child(content, "description"));
-	return JINGLE_CONTENT_CLASS(g_type_class_ref(jingle_get_type(type)))->parse(content);
+	GType jingle_type = jingle_get_type(type);
+
+	if (jingle_type != G_TYPE_NONE) {
+		return JINGLE_CONTENT_CLASS(g_type_class_ref(jingle_type))->parse(content);
+	} else {
+		return NULL;
+	}
 }
 
 static xmlnode *