Removed caps functions from xmpp.h

5 files changed, 38 insertions, 4 deletions

diff --git a/Makefile.am b/Makefile.am
index d71c7930..06c25aaa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ profanity_SOURCES = src/command.c src/contact.c src/command_history.c \
 	src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/connection.c \
 	src/xmpp/iq.c src/xmpp/message.c src/xmpp/presence.c src/xmpp/stanza.c \
 	src/xmpp/stanza.h src/xmpp/message.h src/xmpp/iq.h src/xmpp/presence.h \
+	src/xmpp/capabilities.h \
 	src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/windows.c \
 	src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c
 
diff --git a/src/xmpp/capabilities.h b/src/xmpp/capabilities.h
new file mode 100644
index 00000000..10c59927
--- /dev/null
+++ b/src/xmpp/capabilities.h
@@ -0,0 +1,35 @@
+/*
+ * capabilities.h
+ *
+ * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef CAPABILITIES_H
+#define CAPABILITIES_H
+
+#include <strophe.h>
+
+#include "xmpp.h"
+
+void caps_add(const char * const caps_str, const char * const client);
+gboolean caps_contains(const char * const caps_str);
+char* caps_create_sha1_str(xmpp_stanza_t * const query);
+xmpp_stanza_t* caps_create_query_response_stanza(xmpp_ctx_t * const ctx);
+
+#endif
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index e63ca01a..72f7c39f 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -32,6 +32,7 @@
 #include "xmpp.h"
 #include "stanza.h"
 #include "iq.h"
+#include "capabilities.h"
 
 #define HANDLE(ns, type, func) xmpp_handler_add(conn, func, ns, STANZA_NAME_IQ, type, ctx)
 
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index 2046845f..b679317e 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -32,6 +32,7 @@
 #include "profanity.h"
 #include "xmpp.h"
 #include "stanza.h"
+#include "capabilities.h"
 
 static GHashTable *sub_requests;
 
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index 428908cf..ab22d191 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -92,11 +92,7 @@ void presence_update(jabber_presence_t status, const char * const msg,
 
 // caps functions
 void caps_init(void);
-void caps_add(const char * const caps_str, const char * const client);
-gboolean caps_contains(const char * const caps_str);
 Capabilities* caps_get(const char * const caps_str);
-char* caps_create_sha1_str(xmpp_stanza_t * const query);
-xmpp_stanza_t* caps_create_query_response_stanza(xmpp_ctx_t * const ctx);
 void caps_close(void);
 
 #endif