Mercurial > pidgin
comparison libpurple/protocols/jabber/iq.c @ 24944:8bfa1f01f035
merge of 'a4aa548f12b557cc419b1567e6902eb124d0cf06'
and 'c2b27ebb3760df28827d2fd1b391386a894cf952'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sun, 19 Oct 2008 04:40:59 +0000 |
| parents | bd598b606ca4 4d752d07a126 |
| children | bcad7dc4b453 |
comparison
equal
deleted
inserted
replaced
| 24938:bd598b606ca4 | 24944:8bfa1f01f035 |
|---|---|
| 32 #include "oob.h" | 32 #include "oob.h" |
| 33 #include "roster.h" | 33 #include "roster.h" |
| 34 #include "si.h" | 34 #include "si.h" |
| 35 #include "ping.h" | 35 #include "ping.h" |
| 36 #include "adhoccommands.h" | 36 #include "adhoccommands.h" |
| 37 #include "data.h" | |
| 37 | 38 |
| 38 #ifdef _WIN32 | 39 #ifdef _WIN32 |
| 39 #include "utsname.h" | 40 #include "utsname.h" |
| 40 #endif | 41 #endif |
| 41 | 42 |
| 312 JabberCallbackData *jcd; | 313 JabberCallbackData *jcd; |
| 313 xmlnode *query, *error, *x; | 314 xmlnode *query, *error, *x; |
| 314 const char *xmlns; | 315 const char *xmlns; |
| 315 const char *type, *id, *from; | 316 const char *type, *id, *from; |
| 316 JabberIqHandler *jih; | 317 JabberIqHandler *jih; |
| 317 | 318 |
| 318 query = xmlnode_get_child(packet, "query"); | 319 query = xmlnode_get_child(packet, "query"); |
| 319 type = xmlnode_get_attrib(packet, "type"); | 320 type = xmlnode_get_attrib(packet, "type"); |
| 320 from = xmlnode_get_attrib(packet, "from"); | 321 from = xmlnode_get_attrib(packet, "from"); |
| 321 id = xmlnode_get_attrib(packet, "id"); | 322 id = xmlnode_get_attrib(packet, "id"); |
| 322 | 323 |
| 352 if(xmlnode_get_child_with_namespace(packet, "new-mail", "google:mail:notify")) { | 353 if(xmlnode_get_child_with_namespace(packet, "new-mail", "google:mail:notify")) { |
| 353 jabber_gmail_poke(js, packet); | 354 jabber_gmail_poke(js, packet); |
| 354 return; | 355 return; |
| 355 } | 356 } |
| 356 | 357 |
| 358 purple_debug_info("jabber", "jabber_iq_parse\n"); | |
| 359 | |
| 357 if(xmlnode_get_child_with_namespace(packet, "ping", "urn:xmpp:ping")) { | 360 if(xmlnode_get_child_with_namespace(packet, "ping", "urn:xmpp:ping")) { |
| 358 jabber_ping_parse(js, packet); | 361 jabber_ping_parse(js, packet); |
| 362 return; | |
| 363 } | |
| 364 | |
| 365 if (xmlnode_get_child_with_namespace(packet, "data", XEP_0231_NAMESPACE)) { | |
| 366 jabber_data_parse(js, packet); | |
| 359 return; | 367 return; |
| 360 } | 368 } |
| 361 | 369 |
| 362 #ifdef USE_VV | 370 #ifdef USE_VV |
| 363 if (xmlnode_get_child_with_namespace(packet, "jingle", JINGLE)) { | 371 if (xmlnode_get_child_with_namespace(packet, "jingle", JINGLE)) { |