Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/caps.c @ 30683:6362579b3d2e
jabber: Start adding some caps tests
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Fri, 09 Jul 2010 22:14:03 +0000 |
| parents | 12ba4c648872 |
| children | 502b9d2f2d7a |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/caps.c Thu Jul 08 21:27:36 2010 +0000 +++ b/libpurple/protocols/jabber/caps.c Fri Jul 09 22:14:03 2010 +0000 @@ -41,14 +41,6 @@ static GHashTable *nodetable = NULL; /* char *node -> JabberCapsNodeExts */ static guint save_timer = 0; -/** - * Processes a query-node and returns a JabberCapsClientInfo object with all relevant info. - * - * @param query A query object. - * @return A JabberCapsClientInfo object. - */ -static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query); - /* Free a GList of allocated char* */ static void free_string_glist(GList *list) @@ -764,13 +756,14 @@ return result; } -static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query) +JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query) { xmlnode *child; JabberCapsClientInfo *info; - if (!query || strcmp(query->xmlns, NS_DISCO_INFO)) - return 0; + if (!query || !g_str_equal(query->name, "query") || + !purple_strequal(query->xmlns, NS_DISCO_INFO)) + return NULL; info = g_new0(JabberCapsClientInfo, 1);