diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2009-04-22 18:39:41 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2009-04-22 18:39:41 +0000 |
| commit | 20411dd391c8ade61953215f76406edb0246813f (patch) | |
| tree | 0f6f6ab6038f6f8ff2dd2cfddb36978f20636883 | |
| parent | 7e310f608a40ed7806ea128e5e29a1b9ecb14785 (diff) | |
| parent | b3ef7a9c42ca787a0210233eebfc3f32ce881942 (diff) | |
| download | pidgin-20411dd391c8ade61953215f76406edb0246813f.tar.gz | |
merge of '3e5b8729d071af0c16ceca909bcab99a121310f9'
and '99f1ce9cfc3f975050b519fb0ef532b2034f7545'
| -rw-r--r-- | libpurple/protocols/jabber/jingle/content.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libpurple/protocols/jabber/jingle/content.c b/libpurple/protocols/jabber/jingle/content.c index 3b83e7fe86..e3d06c9662 100644 --- a/libpurple/protocols/jabber/jingle/content.c +++ b/libpurple/protocols/jabber/jingle/content.c @@ -391,7 +391,13 @@ JingleContent * 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 * |