[telepathy-gabble/master] remove NS_DATA as we already have NS_X_DATA for this namespace

[Guillaume Desmottes]

---
 src/bytestream-factory.c |    6 +++---
 src/namespaces.h         |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index a442230..edd94dd 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -703,7 +703,7 @@ streaminit_parse_request (LmMessage *message,
       return FALSE;
     }
 
-  x = lm_message_node_get_child_with_namespace (feature, "x", NS_DATA);
+  x = lm_message_node_get_child_with_namespace (feature, "x", NS_X_DATA);
   if (x == NULL)
     {
       NODE_DEBUG (message->node, "got a SI request without a X data field");
@@ -798,7 +798,7 @@ gabble_bytestream_factory_make_stream_init_iq (const gchar *full_jid,
         '(', "feature", "",
           '@', "xmlns", NS_FEATURENEG,
           '(', "x", "",
-            '@', "xmlns", NS_DATA,
+            '@', "xmlns", NS_X_DATA,
             '@', "type", "form",
             '(', "field", "",
               '@', "var", "stream-method",
@@ -2053,7 +2053,7 @@ gabble_bytestream_factory_make_accept_iq (const gchar *full_jid,
         '(', "feature", "",
           '@', "xmlns", NS_FEATURENEG,
           '(', "x", "",
-            '@', "xmlns", NS_DATA,
+            '@', "xmlns", NS_X_DATA,
             '@', "type", "submit",
             '(', "field", "",
               '@', "var", "stream-method",
diff --git a/src/namespaces.h b/src/namespaces.h
index 46ccc4b..111cf9f 100644
--- a/src/namespaces.h
+++ b/src/namespaces.h
@@ -24,7 +24,6 @@
 #define NS_AMP                  "http://jabber.org/protocol/amp"
 #define NS_BYTESTREAMS          "http://jabber.org/protocol/bytestreams"
 #define NS_CAPS                 "http://jabber.org/protocol/caps"
-#define NS_DATA                 "jabber:x:data"
 #define NS_CHAT_STATES          "http://jabber.org/protocol/chatstates"
 #define NS_DISCO_INFO           "http://jabber.org/protocol/disco#info"
 #define NS_DISCO_ITEMS          "http://jabber.org/protocol/disco#items"
-- 
1.5.6.5