Mercurial > ~mikael > mcabber > hg

diff mcabber/mcabber/xmpp_muc.c @ 1908:e2def760c6d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduce NS_MUC_{USER,ADMIN,OWNER}
author Mikael Berthe <mikael@lilotux.net>
date Sun, 18 Apr 2010 14:04:45 +0200
parents decf94827efe
children bfa507815e0c
line wrap: on
line diff
--- a/mcabber/mcabber/xmpp_muc.c	Sat Apr 17 14:11:16 2010 +0200
+++ b/mcabber/mcabber/xmpp_muc.c	Sun Apr 18 14:04:45 2010 +0200
@@ -51,8 +51,7 @@
   m = lm_message_new(invitation->to, LM_MESSAGE_TYPE_MESSAGE);
 
   x = lm_message_node_add_child(m->node, "x", NULL);
-  lm_message_node_set_attribute(x, "xmlns",
-                                "http://jabber.org/protocol/muc#user");
+  lm_message_node_set_attribute(x, "xmlns", NS_MUC_USER);
 
   y = lm_message_node_add_child(x, "decline", NULL);
   lm_message_node_set_attribute(y, "to", invitation->from);
@@ -149,7 +148,7 @@
   // Send the XML request
   x = lm_message_new_presence(mystatus, roomid, mystatusmsg);
   y = lm_message_node_add_child(x->node, "x", NULL);
-  lm_message_node_set_attribute(y, "xmlns", "http://jabber.org/protocol/muc");
+  lm_message_node_set_attribute(y, "xmlns", NS_MUC);
   if (passwd)
     lm_message_node_add_child(y, "password", passwd);
 
@@ -172,8 +171,7 @@
   msg = lm_message_new(room, LM_MESSAGE_TYPE_MESSAGE);
 
   x = lm_message_node_add_child(msg->node, "x", NULL);
-  lm_message_node_set_attribute(x, "xmlns",
-                                "http://jabber.org/protocol/muc#user");
+  lm_message_node_set_attribute(x, "xmlns", NS_MUC_USER);
 
   y = lm_message_node_add_child(x, "invite", NULL);
   lm_message_node_set_attribute(y, "to", fjid);
@@ -211,8 +209,7 @@
   iq = lm_message_new_with_sub_type(roomid, LM_MESSAGE_TYPE_IQ,
                                     LM_MESSAGE_SUB_TYPE_SET);
   query = lm_message_node_add_child(iq->node, "query", NULL);
-  lm_message_node_set_attribute(query, "xmlns",
-                                "http://jabber.org/protocol/muc#admin");
+  lm_message_node_set_attribute(query, "xmlns", NS_MUC_ADMIN);
   x = lm_message_node_add_child(query, "item", NULL);
 
   if (fjid) {
@@ -249,8 +246,7 @@
                                     LM_MESSAGE_SUB_TYPE_SET);
 
   node = lm_message_node_add_child(iq->node, "query", NULL);
-  lm_message_node_set_attribute(node, "xmlns",
-                                "http://jabber.org/protocol/muc#owner");
+  lm_message_node_set_attribute(node, "xmlns", NS_MUC_OWNER);
   node = lm_message_node_add_child(node, "x", NULL);
   lm_message_node_set_attributes(node, "xmlns", "jabber:x:data",
                                  "type", "submit", NULL);
@@ -272,8 +268,7 @@
   iq = lm_message_new_with_sub_type(room, LM_MESSAGE_TYPE_IQ,
                                     LM_MESSAGE_SUB_TYPE_SET);
   query = lm_message_node_add_child(iq->node, "query", NULL);
-  lm_message_node_set_attribute(query, "xmlns",
-                                "http://jabber.org/protocol/muc#owner");
+  lm_message_node_set_attribute(query, "xmlns", NS_MUC_OWNER);
   x = lm_message_node_add_child(query, "destroy", NULL);
 
   if (venue && *venue)