summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-01-22 16:52:09 +0000
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-02-10 12:08:38 +0000
commit7bf66fdb71e2076fecef9da6be200bca701462bc (patch)
treef701cb879b3f9629ad6dc28c6aef65dcb5e323b6 /lib
parentbeba2ea4d45c64bb447d82b3b43342ea9de45f66 (diff)
rename GIBBER_XMPP_NS_OOB to GIBBER_XMPP_NS_IQ_OOB
Diffstat (limited to 'lib')
-rw-r--r--lib/gibber/gibber-bytestream-oob.c8
-rw-r--r--lib/gibber/gibber-namespaces.h2
-rw-r--r--lib/gibber/gibber-oob-file-transfer.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/gibber/gibber-bytestream-oob.c b/lib/gibber/gibber-bytestream-oob.c
index a4c568df..e6a6ba05 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 2ece81e5..11576611 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 30f5301b..8a0e35c8 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");