Mercurial > pidgin
comparison libpurple/protocols/jabber/iq.c @ 25773:da4e18e318e7
propagate from branch 'im.pidgin.pidgin' (head b79100551ea19cf35ee8952a34a44b97204e75f3)
to branch 'im.pidgin.cpw.malu.xmpp.ibb_ft' (head ff75b10d74fa79731602410b5122236fdef7502b)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 12 Feb 2009 21:48:48 +0000 |
parents | a34d6975c239 |
children | 5f9a24d1c25e |
comparison
equal
deleted
inserted
replaced
25449:fa5987472e00 | 25773:da4e18e318e7 |
---|---|
32 #include "roster.h" | 32 #include "roster.h" |
33 #include "si.h" | 33 #include "si.h" |
34 #include "ping.h" | 34 #include "ping.h" |
35 #include "adhoccommands.h" | 35 #include "adhoccommands.h" |
36 #include "data.h" | 36 #include "data.h" |
37 #include "ibb.h" | |
37 | 38 |
38 #ifdef _WIN32 | 39 #ifdef _WIN32 |
39 #include "utsname.h" | 40 #include "utsname.h" |
40 #endif | 41 #endif |
41 | 42 |
391 if (xmlnode_get_child_with_namespace(packet, "data", XEP_0231_NAMESPACE)) { | 392 if (xmlnode_get_child_with_namespace(packet, "data", XEP_0231_NAMESPACE)) { |
392 jabber_data_parse(js, packet); | 393 jabber_data_parse(js, packet); |
393 return; | 394 return; |
394 } | 395 } |
395 | 396 |
397 if (xmlnode_get_child_with_namespace(packet, "data", XEP_0047_NAMESPACE) | |
398 || xmlnode_get_child_with_namespace(packet, "close", XEP_0047_NAMESPACE) | |
399 || xmlnode_get_child_with_namespace(packet, "open", XEP_0047_NAMESPACE)) { | |
400 jabber_ibb_parse(js, packet); | |
401 return; | |
402 } | |
403 | |
396 /* If we get here, send the default error reply mandated by XMPP-CORE */ | 404 /* If we get here, send the default error reply mandated by XMPP-CORE */ |
397 if(!strcmp(type, "set") || !strcmp(type, "get")) { | 405 if(!strcmp(type, "set") || !strcmp(type, "get")) { |
398 JabberIq *iq = jabber_iq_new(js, JABBER_IQ_ERROR); | 406 JabberIq *iq = jabber_iq_new(js, JABBER_IQ_ERROR); |
399 | 407 |
400 xmlnode_free(iq->node); | 408 xmlnode_free(iq->node); |