[telepathy-salut/master] rename GIBBER_XMPP_NS_OOB to GIBBER_XMPP_NS_IQ_OOB

[Guillaume Desmottes]

---
 lib/gibber/gibber-bytestream-oob.c    |    8 ++++----
 lib/gibber/gibber-namespaces.h        |    2 +-
 lib/gibber/gibber-oob-file-transfer.c |    4 ++--
 src/salut-si-bytestream-manager.c     |    6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/gibber/gibber-bytestream-oob.c b/lib/gibber/gibber-bytestream-oob.c
index a4c568d..e6a6ba0 100644
--- a/lib/gibber/gibber-bytestream-oob.c
+++ b/lib/gibber/gibber-bytestream-oob.c
@@ -323,7 +323,7 @@ parse_oob_init_iq (GibberBytestreamOOB *self,
     return FALSE;
 
   query_node = gibber_xmpp_node_get_child_ns (stanza->node, "query",
-      GIBBER_XMPP_NS_OOB);
+      GIBBER_XMPP_NS_IQ_OOB);
   if (query_node == NULL)
     return FALSE;
 
@@ -518,7 +518,7 @@ gibber_bytestream_oob_get_property (GObject *object,
         g_value_set_string (value, priv->host);
         break;
       case PROP_PROTOCOL:
-        g_value_set_string (value, GIBBER_XMPP_NS_OOB);
+        g_value_set_string (value, GIBBER_XMPP_NS_IQ_OOB);
         break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -729,7 +729,7 @@ create_si_accept_iq (GibberBytestreamOOB *self)
             GIBBER_NODE, "field",
               GIBBER_NODE_ATTRIBUTE, "var", "stream-method",
               GIBBER_NODE, "value",
-                GIBBER_NODE_TEXT, GIBBER_XMPP_NS_OOB,
+                GIBBER_NODE_TEXT, GIBBER_XMPP_NS_IQ_OOB,
               GIBBER_NODE_END,
             GIBBER_NODE_END,
           GIBBER_NODE_END,
@@ -905,7 +905,7 @@ make_oob_init_iq (const gchar *from,
       GIBBER_STANZA_TYPE_IQ, GIBBER_STANZA_SUB_TYPE_SET,
       from, to,
       GIBBER_NODE, "query",
-        GIBBER_NODE_XMLNS, GIBBER_XMPP_NS_OOB,
+        GIBBER_NODE_XMLNS, GIBBER_XMPP_NS_IQ_OOB,
         GIBBER_NODE_ATTRIBUTE, "sid", stream_id,
         GIBBER_NODE, "url",
           GIBBER_NODE_TEXT, url,
diff --git a/lib/gibber/gibber-namespaces.h b/lib/gibber/gibber-namespaces.h
index 2ece81e..1157661 100644
--- a/lib/gibber/gibber-namespaces.h
+++ b/lib/gibber/gibber-namespaces.h
@@ -53,7 +53,7 @@
 #define GIBBER_XMPP_NS_STANZAS \
   "urn:ietf:params:xml:ns:xmpp-stanzas"
 
-#define GIBBER_XMPP_NS_OOB \
+#define GIBBER_XMPP_NS_IQ_OOB \
   "jabber:iq:oob"
 
 #define GIBBER_XMPP_NS_JINGLE_ERRORS \
diff --git a/lib/gibber/gibber-oob-file-transfer.c b/lib/gibber/gibber-oob-file-transfer.c
index 30f5301..8a0e35c 100644
--- a/lib/gibber/gibber-oob-file-transfer.c
+++ b/lib/gibber/gibber-oob-file-transfer.c
@@ -472,7 +472,7 @@ create_transfer_offer (GibberOobFileTransfer *self,
       GIBBER_FILE_TRANSFER (self)->peer_id);
 
   query_node = gibber_xmpp_node_add_child_ns (stanza->node, "query",
-      GIBBER_XMPP_NS_OOB);
+      GIBBER_XMPP_NS_IQ_OOB);
 
   url_node = gibber_xmpp_node_add_child_with_content (query_node, "url", url);
   gibber_xmpp_node_set_attribute (url_node, "type", "file");
@@ -742,7 +742,7 @@ gibber_oob_file_transfer_cancel (GibberFileTransfer *ft,
   gibber_xmpp_node_set_attribute (stanza->node, "id", ft->id);
 
   query = gibber_xmpp_node_add_child_ns (stanza->node, "query",
-      GIBBER_XMPP_NS_OOB);
+      GIBBER_XMPP_NS_IQ_OOB);
   gibber_xmpp_node_add_child_with_content (query, "url", self->priv->url);
 
   error_node = gibber_xmpp_node_add_child (stanza->node, "error");
diff --git a/src/salut-si-bytestream-manager.c b/src/salut-si-bytestream-manager.c
index 9c78c73..8d8ec31 100644
--- a/src/salut-si-bytestream-manager.c
+++ b/src/salut-si-bytestream-manager.c
@@ -254,7 +254,7 @@ choose_bytestream_method (SalutSiBytestreamManager *self,
   /* check OOB */
   for (l = stream_methods; l != NULL; l = l->next)
     {
-      if (!tp_strdiff (l->data, GIBBER_XMPP_NS_OOB))
+      if (!tp_strdiff (l->data, GIBBER_XMPP_NS_IQ_OOB))
         {
           DEBUG ("choose OOB in methods list");
           return g_object_new (GIBBER_TYPE_BYTESTREAM_OOB,
@@ -628,7 +628,7 @@ salut_si_bytestream_manager_make_stream_init_iq (const gchar *from,
 
               GIBBER_NODE, "option",
                 GIBBER_NODE, "value",
-                  GIBBER_NODE_TEXT, GIBBER_XMPP_NS_OOB,
+                  GIBBER_NODE_TEXT, GIBBER_XMPP_NS_IQ_OOB,
                 GIBBER_NODE_END,
               GIBBER_NODE_END,
 
@@ -821,7 +821,7 @@ si_request_reply_cb (SalutXmppConnectionManager *manager,
 
       stream_method = value->content;
 
-      if (!tp_strdiff (stream_method, GIBBER_XMPP_NS_OOB))
+      if (!tp_strdiff (stream_method, GIBBER_XMPP_NS_IQ_OOB))
       {
         /* Remote user have accepted the stream */
         DEBUG ("remote user chose a OOB bytestream");
-- 
1.5.6.5