From 7996baa8327d7550e7b4e7b75e9692bf91be37dd Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 6 Jun 2015 22:50:44 +0100
Subject: [PATCH] Moved stanza_set_id

---
 src/server/stanza.c  | 21 +++++++++++++++++++++
 src/server/stanza.h  |  1 +
 src/server/stanzas.c | 21 ---------------------
 src/server/stanzas.h |  1 -
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/server/stanza.c b/src/server/stanza.c
index 9ce6d56..4e8e302 100644
--- a/src/server/stanza.c
+++ b/src/server/stanza.c
@@ -192,6 +192,27 @@ stanza_get_id(XMPPStanza *stanza)
     return NULL;
 }
 
+void
+stanza_set_id(XMPPStanza *stanza, const char *id)
+{
+    GList *curr_attr = stanza->attrs;
+    while (curr_attr) {
+        XMPPAttr *attr = curr_attr->data;
+        if (g_strcmp0(attr->name, "id") == 0) {
+            free(attr->value);
+            attr->value = strdup(id);
+            return;
+        }
+
+        curr_attr = g_list_next(curr_attr);
+    }
+
+    XMPPAttr *attrnew = malloc(sizeof(XMPPAttr));
+    attrnew->name = strdup("id");
+    attrnew->value = strdup(id);
+    stanza->attrs = g_list_append(stanza->attrs, attrnew);
+}
+
 static void
 start_element(void *data, const char *element, const char **attributes)
 {
diff --git a/src/server/stanza.h b/src/server/stanza.h
index 08afcd3..d47ccb3 100644
--- a/src/server/stanza.h
+++ b/src/server/stanza.h
@@ -45,5 +45,6 @@ void stanza_add_child(XMPPStanza *parent, XMPPStanza *child);
 XMPPStanza* stanza_get_child_by_ns(XMPPStanza *stanza, char *ns);
 XMPPStanza* stanza_get_child_by_name(XMPPStanza *stanza, char *name);
 const char* stanza_get_id(XMPPStanza *stanza);
+void stanza_set_id(XMPPStanza *stanza, const char *id);
 
 #endif
diff --git a/src/server/stanzas.c b/src/server/stanzas.c
index ef50fbb..98d347d 100644
--- a/src/server/stanzas.c
+++ b/src/server/stanzas.c
@@ -62,27 +62,6 @@ stanza_add(XMPPStanza *stanza)
     pthread_mutex_unlock(&stanzas_lock);
 }
 
-void
-stanza_set_id(XMPPStanza *stanza, const char *id)
-{
-    GList *curr_attr = stanza->attrs;
-    while (curr_attr) {
-        XMPPAttr *attr = curr_attr->data;
-        if (g_strcmp0(attr->name, "id") == 0) {
-            free(attr->value);
-            attr->value = strdup(id);
-            return;
-        }
-
-        curr_attr = g_list_next(curr_attr);
-    }
-
-    XMPPAttr *attrnew = malloc(sizeof(XMPPAttr));
-    attrnew->name = strdup("id");
-    attrnew->value = strdup(id);
-    stanza->attrs = g_list_append(stanza->attrs, attrnew);
-}
-
 const char *
 stanza_get_attr(XMPPStanza *stanza, const char *name)
 {
diff --git a/src/server/stanzas.h b/src/server/stanzas.h
index 9a67cd1..74acca8 100644
--- a/src/server/stanzas.h
+++ b/src/server/stanzas.h
@@ -28,7 +28,6 @@
 #include "server/stanza.h"
 
 void stanza_add(XMPPStanza *stanza);
-void stanza_set_id(XMPPStanza *stanza, const char *id);
 const char *stanza_get_query_request(XMPPStanza *stanza);
 
 int stanza_verify_any(XMPPStanza *stanza);