diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2009-11-23 23:00:54 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2009-11-23 23:00:54 +0000 |
| commit | 4e041946706d3fc3aed405152028b02ec2794902 (patch) | |
| tree | ef4a4862f5476c49150cdd25f2ebbb3707ea2246 /protocols/jabber | |
| parent | b3117f2524775ff7c61ead7c3bdb3799064ed97f (diff) | |
| parent | fb51d85751b36098ad4271bc4553ade4dc53f20b (diff) | |
Merging BitlBee 1.2.4+
Diffstat (limited to 'protocols/jabber')
| -rw-r--r-- | protocols/jabber/iq.c | 5 | ||||
| -rw-r--r-- | protocols/jabber/jabber.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/protocols/jabber/iq.c b/protocols/jabber/iq.c index 38c5a5a9..875b5c81 100644 --- a/protocols/jabber/iq.c +++ b/protocols/jabber/iq.c @@ -50,10 +50,11 @@ xt_status jabber_pkt_iq( struct xt_node *node, gpointer data ) else if( strcmp( type, "get" ) == 0 ) { if( !( ( c = xt_find_node( node->children, "query" ) ) || - ( c = xt_find_node( node->children, "ping" ) ) ) || /* O_o WHAT is wrong with just <query/> ????? */ + ( c = xt_find_node( node->children, "ping" ) ) ) || !( s = xt_find_attr( c, "xmlns" ) ) ) { - imcb_log( ic, "Warning: Received incomplete IQ-%s packet", type ); + /* Sigh. Who decided to suddenly invent new elements + instead of just sticking with <query/>? */ return XT_HANDLED; } diff --git a/protocols/jabber/jabber.h b/protocols/jabber/jabber.h index ee453144..1180d2b9 100644 --- a/protocols/jabber/jabber.h +++ b/protocols/jabber/jabber.h @@ -26,8 +26,9 @@ #include <glib.h> -#include "xmltree.h" #include "bitlbee.h" +#include "md5.h" +#include "xmltree.h" extern GSList *jabber_connections; |