# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1240425451 0
# Node ID d06af7664a7a7e14b324d245c74541d84e47f78c
# Parent  474a0cb44f58e2c10f31959bd2fe9815bd50536a# Parent  7be72613e9ce6b78810054916625dbc52e86078b
merge of '6a70c2c1325aeb644bff8476f94c5a25f83044fb'
     and 'd5a487de6cafd4f773a3cc1b9b08d6081771e9de'

diff -r 474a0cb44f58 -r d06af7664a7a libpurple/protocols/jabber/jingle/content.c
--- a/libpurple/protocols/jabber/jingle/content.c	Tue Apr 21 22:17:18 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/content.c	Wed Apr 22 18:37:31 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 *