Changeset 47d3ac4 for protocols/jabber/iq.c

Timestamp:

2006-10-31T08:25:41Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0d3f30f

Parents:

abbd8ed

Message:

Added #defines for XML namespaces.

File:

• protocols/jabber/iq.c (modified) (11 diffs)

protocols/jabber/iq.c

@@ -77 +77 @@
                 
                 /* Of course this is a very essential query to support. ;-) */
-                if( strcmp( s, "jabber:iq:version" ) == 0 )
+                if( strcmp( s, XMLNS_VERSION ) == 0 )
                 {
                         xt_add_child( reply, xt_new_node( "name", "BitlBee", NULL ) );
@@ -83 +83 @@
                         xt_add_child( reply, xt_new_node( "os", ARCH, NULL ) );
                 }
-                else if( strcmp( s, "jabber:iq:time" ) == 0 )
+                else if( strcmp( s, XMLNS_TIME ) == 0 )
                 {
                         time_t time_ep;
@@ -97 +97 @@
                         xt_add_child( reply, xt_new_node( "tz", buf, NULL ) );
                 }
-                else if( strcmp( s, "http://jabber.org/protocol/disco#info" ) == 0 )
+                else if( strcmp( s, XMLNS_DISCOVER ) == 0 )
                 {
                         c = xt_new_node( "identity", NULL, NULL );
@@ -106 +106 @@
                         
                         c = xt_new_node( "feature", NULL, NULL );
-                        xt_add_attr( c, "var", "jabber:iq:version" );
+                        xt_add_attr( c, "var", XMLNS_VERSION );
                         xt_add_child( reply, c );
                         
                         c = xt_new_node( "feature", NULL, NULL );
-                        xt_add_attr( c, "var", "jabber:iq:time" );
+                        xt_add_attr( c, "var", XMLNS_TIME );
                         xt_add_child( reply, c );
                         
                         c = xt_new_node( "feature", NULL, NULL );
-                        xt_add_attr( c, "var", "http://jabber.org/protocol/chatstates" );
+                        xt_add_attr( c, "var", XMLNS_CHATSTATES );
                         xt_add_child( reply, c );
                         
@@ -136 +136 @@
                 }
                 
-                if( strcmp( s, "jabber:iq:roster" ) == 0 )
+                if( strcmp( s, XMLNS_ROSTER ) == 0 )
                 {
                         int bare_len = strlen( gc->acc->user );
@@ -198 +198 @@
         
         node = xt_new_node( "query", NULL, xt_new_node( "username", jd->username, NULL ) );
-        xt_add_attr( node, "xmlns", "jabber:iq:auth" );
+        xt_add_attr( node, "xmlns", XMLNS_AUTH );
         node = jabber_make_packet( "iq", "get", NULL, node );
         
@@ -218 +218 @@
         /* Time to authenticate ourselves! */
         reply = xt_new_node( "query", NULL, NULL );
-        xt_add_attr( reply, "xmlns", "jabber:iq:auth" );
+        xt_add_attr( reply, "xmlns", XMLNS_AUTH );
         xt_add_child( reply, xt_new_node( "username", jd->username, NULL ) );
         xt_add_child( reply, xt_new_node( "resource", set_getstr( &gc->acc->set, "resource" ), NULL ) );
@@ -322 +322 @@
         
         node = xt_new_node( "query", NULL, NULL );
-        xt_add_attr( node, "xmlns", "jabber:iq:roster" );
+        xt_add_attr( node, "xmlns", XMLNS_ROSTER );
         node = jabber_make_packet( "iq", "get", NULL, node );
         
@@ -391 +391 @@
         
         node = xt_new_node( "vCard", NULL, NULL );
-        xt_add_attr( node, "xmlns", "vcard-temp" );
+        xt_add_attr( node, "xmlns", XMLNS_VCARD );
         node = jabber_make_packet( "iq", "get", bare_jid, node );
         
@@ -536 +536 @@
         /* And pack it into a roster-add packet */
         node = xt_new_node( "query", NULL, node );
-        xt_add_attr( node, "xmlns", "jabber:iq:roster" );
+        xt_add_attr( node, "xmlns", XMLNS_ROSTER );
         node = jabber_make_packet( "iq", "set", NULL, node );
         
@@ -557 +557 @@
         /* And pack it into a roster-add packet */
         node = xt_new_node( "query", NULL, node );
-        xt_add_attr( node, "xmlns", "jabber:iq:roster" );
+        xt_add_attr( node, "xmlns", XMLNS_ROSTER );
         node = jabber_make_packet( "iq", "set", NULL, node );