# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1271592285 -7200
# Node ID e2def760c6d0ced6272aa6ee79840dece4eb1af8
# Parent  8517e5ec9db99c2f941e27b4468ca9a673f63d56
Introduce NS_MUC_{USER,ADMIN,OWNER}

diff -r 8517e5ec9db9 -r e2def760c6d0 mcabber/mcabber/xmpp.c
--- a/mcabber/mcabber/xmpp.c	Sat Apr 17 14:11:16 2010 +0200
+++ b/mcabber/mcabber/xmpp.c	Sun Apr 18 14:04:45 2010 +0200
@@ -1293,8 +1293,7 @@
   }
 
   if (from) {
-    x = lm_message_node_find_xmlns(m->node,
-                                   "http://jabber.org/protocol/muc#user");
+    x = lm_message_node_find_xmlns(m->node, NS_MUC_USER);
     if (x && !strcmp(x->name, "x"))
       got_muc_message(from, x);
   }
@@ -1345,8 +1344,7 @@
   LmMessageSubType mstype;
 
   // Check for MUC presence packet
-  muc_packet = lm_message_node_find_xmlns
-          (m->node, "http://jabber.org/protocol/muc#user");
+  muc_packet = lm_message_node_find_xmlns(m->node, NS_MUC_USER);
 
   from = lm_message_get_from(m);
 
diff -r 8517e5ec9db9 -r e2def760c6d0 mcabber/mcabber/xmpp_defines.h
--- a/mcabber/mcabber/xmpp_defines.h	Sat Apr 17 14:11:16 2010 +0200
+++ b/mcabber/mcabber/xmpp_defines.h	Sun Apr 18 14:04:45 2010 +0200
@@ -43,6 +43,9 @@
 #define NS_CHATSTATES "http://jabber.org/protocol/chatstates"
 #define NS_COMMANDS   "http://jabber.org/protocol/commands"
 #define NS_MUC        "http://jabber.org/protocol/muc"
+#define NS_MUC_USER   "http://jabber.org/protocol/muc#user"
+#define NS_MUC_ADMIN  "http://jabber.org/protocol/muc#admin"
+#define NS_MUC_OWNER  "http://jabber.org/protocol/muc#owner"
 
 #define NS_XDBGINSERT "jabber:xdb:ginsert"
 #define NS_XDBNSLIST  "jabber:xdb:nslist"
diff -r 8517e5ec9db9 -r e2def760c6d0 mcabber/mcabber/xmpp_muc.c
--- 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)