From 95f594165eb747a8f9789b4ada1ac166794f984b Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 6 Jun 2015 22:49:56 +0100
Subject: [PATCH] Moved stanza_get_id

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

diff --git a/src/server/stanza.c b/src/server/stanza.c
index 751408b..9ce6d56 100644
--- a/src/server/stanza.c
+++ b/src/server/stanza.c
@@ -168,6 +168,30 @@ stanza_get_child_by_name(XMPPStanza *stanza, char *name)
     return NULL;
 }
 
+const char *
+stanza_get_id(XMPPStanza *stanza)
+{
+    if (!stanza) {
+        return NULL;
+    }
+
+    if (!stanza->attrs) {
+        return NULL;
+    }
+
+    GList *curr_attr = stanza->attrs;
+    while (curr_attr) {
+        XMPPAttr *attr = curr_attr->data;
+        if (g_strcmp0(attr->name, "id") == 0) {
+            return attr->value;
+        }
+
+        curr_attr = g_list_next(curr_attr);
+    }
+
+    return NULL;
+}
+
 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 282bc61..08afcd3 100644
--- a/src/server/stanza.h
+++ b/src/server/stanza.h
@@ -44,5 +44,6 @@ char* stanza_to_string(XMPPStanza *stanza);
 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);
 
 #endif
diff --git a/src/server/stanzas.c b/src/server/stanzas.c
index 2edf86c..ef50fbb 100644
--- a/src/server/stanzas.c
+++ b/src/server/stanzas.c
@@ -62,30 +62,6 @@ stanza_add(XMPPStanza *stanza)
     pthread_mutex_unlock(&stanzas_lock);
 }
 
-const char *
-stanza_get_id(XMPPStanza *stanza)
-{
-    if (!stanza) {
-        return NULL;
-    }
-
-    if (!stanza->attrs) {
-        return NULL;
-    }
-
-    GList *curr_attr = stanza->attrs;
-    while (curr_attr) {
-        XMPPAttr *attr = curr_attr->data;
-        if (g_strcmp0(attr->name, "id") == 0) {
-            return attr->value;
-        }
-
-        curr_attr = g_list_next(curr_attr);
-    }
-
-    return NULL;
-}
-
 void
 stanza_set_id(XMPPStanza *stanza, const char *id)
 {
diff --git a/src/server/stanzas.h b/src/server/stanzas.h
index 50efc25..9a67cd1 100644
--- a/src/server/stanzas.h
+++ b/src/server/stanzas.h
@@ -28,7 +28,6 @@
 #include "server/stanza.h"
 
 void stanza_add(XMPPStanza *stanza);
-const char* stanza_get_id(XMPPStanza *stanza);
 void stanza_set_id(XMPPStanza *stanza, const char *id);
 const char *stanza_get_query_request(XMPPStanza *stanza);