gabble: add capabilities.h and caps-channel-manager.h as public API

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

24 files changed, 27 insertions, 26 deletions

diff --git a/src/capabilities.h b/gabble/capabilities.h
index 811f1137..12d53bb4 100644
--- a/src/capabilities.h
+++ b/gabble/capabilities.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include "gabble/capabilities-set.h"
+#include <gabble/capabilities-set.h>
 
 /* Pseudo-capabilities for buggy or strange implementations, represented as
  * strings starting with a character not allowed in XML (the ASCII beep :-) */
diff --git a/src/caps-channel-manager.h b/gabble/caps-channel-manager.h
index 9442476a..9442476a 100644
--- a/src/caps-channel-manager.h
+++ b/gabble/caps-channel-manager.h
diff --git a/gabble/gabble.h b/gabble/gabble.h
index fe1a5027..8393ae8c 100644
--- a/gabble/gabble.h
+++ b/gabble/gabble.h
@@ -24,7 +24,9 @@
 
 #include <glib-object.h>
 
+#include <gabble/capabilities.h>
 #include <gabble/capabilities-set.h>
+#include <gabble/caps-channel-manager.h>
 #include <gabble/caps-hash.h>
 #include <gabble/connection.h>
 #include <gabble/error.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index 00f802a1..99367f1c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,12 +44,12 @@ libgabble_convenience_la_SOURCES = \
     call-stream.h \
     call-stream.c \
     $(top_srcdir)/gabble/capabilities-set.h \
-    capabilities.h \
+    $(top_srcdir)/gabble/capabilities.h \
     capabilities.c \
     $(top_srcdir)/gabble/caps-hash.h \
     caps-hash.h \
     caps-hash.c \
-    caps-channel-manager.h \
+    $(top_srcdir)/gabble/caps-channel-manager.h \
     caps-channel-manager.c \
     conn-aliasing.h \
     conn-aliasing.c \
diff --git a/src/auth-manager.c b/src/auth-manager.c
index a9424854..d9638eed 100644
--- a/src/auth-manager.c
+++ b/src/auth-manager.c
@@ -28,7 +28,7 @@
 
 #define DEBUG_FLAG GABBLE_DEBUG_AUTH
 
-#include "caps-channel-manager.h"
+#include "gabble/caps-channel-manager.h"
 #include "server-sasl-channel.h"
 #include "connection.h"
 #include "debug.h"
diff --git a/src/capabilities.c b/src/capabilities.c
index b3ef11e8..d0b36e78 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "capabilities.h"
+#include "gabble/capabilities.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
index 65005009..a7f8880d 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include "caps-channel-manager.h"
+#include "gabble/caps-channel-manager.h"
 
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/channel-manager.h>
diff --git a/src/caps-hash.c b/src/caps-hash.c
index c2bbb598..1518748e 100644
--- a/src/caps-hash.c
+++ b/src/caps-hash.c
@@ -35,7 +35,7 @@
 #define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
 
 #include "base64.h"
-#include "capabilities.h"
+#include "gabble/capabilities.h"
 #include "debug.h"
 #include "namespaces.h"
 #include "presence-cache.h"
diff --git a/src/connection.c b/src/connection.c
index e1404603..486ed841 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -51,8 +51,8 @@
 #define DEBUG_FLAG GABBLE_DEBUG_CONNECTION
 
 #include "bytestream-factory.h"
-#include "capabilities.h"
-#include "caps-channel-manager.h"
+#include "gabble/capabilities.h"
+#include "gabble/caps-channel-manager.h"
 #include "caps-hash.h"
 #include "auth-manager.h"
 #include "conn-aliasing.h"
diff --git a/src/connection.h b/src/connection.h
index 109f2d4f..b548243f 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -34,7 +34,7 @@
 #include <wocky/wocky-pep-service.h>
 
 #include "gabble/connection.h"
-#include "capabilities.h"
+#include "gabble/capabilities.h"
 #include "error.h"
 #include "ft-manager.h"
 #include "jingle-factory.h"
diff --git a/src/ft-manager.c b/src/ft-manager.c
index 11006afc..b79881ac 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -30,7 +30,7 @@
 
 #include "jingle-session.h"
 #include "jingle-share.h"
-#include "caps-channel-manager.h"
+#include "gabble/caps-channel-manager.h"
 #include "connection.h"
 #include "ft-manager.h"
 #include "error.h"
diff --git a/src/im-factory.c b/src/im-factory.c
index 08f19f6c..be518b27 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -36,7 +36,7 @@
 
 #include "extensions/extensions.h"
 
-#include "caps-channel-manager.h"
+#include "gabble/caps-channel-manager.h"
 #include "connection.h"
 #include "debug.h"
 #include "disco.h"
diff --git a/src/jingle-session.c b/src/jingle-session.c
index f20c2d63..2981e3e8 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -30,7 +30,7 @@
 
 #define DEBUG_FLAG GABBLE_DEBUG_MEDIA
 
-#include "capabilities.h"
+#include "gabble/capabilities.h"
 #include "connection.h"
 #include "conn-presence.h"
 #include "debug.h"
diff --git a/src/legacy-caps.h b/src/legacy-caps.h
index 080ac3b0..e2de46c3 100644
--- a/src/legacy-caps.h
+++ b/src/legacy-caps.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include "capabilities.h"
+#include "gabble/capabilities.h"
 
 typedef void (*TypeFlagsToCapsFunc) (guint typeflags, GabbleCapabilitySet *caps);
 typedef guint (*CapsToTypeFlagsFunc) (const GabbleCapabilitySet *caps);
diff --git a/src/media-factory.c b/src/media-factory.c
index 0c0b6c2d..e8ec9908 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -36,7 +36,7 @@
 
 #define DEBUG_FLAG GABBLE_DEBUG_MEDIA
 
-#include "caps-channel-manager.h"
+#include "gabble/caps-channel-manager.h"
 #include "connection.h"
 #include "debug.h"
 #include "jingle-factory.h"
diff --git a/src/muc-factory.c b/src/muc-factory.c
index 1feb21a1..554b1504 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -36,7 +36,7 @@
 
 #define DEBUG_FLAG GABBLE_DEBUG_MUC
 
-#include "caps-channel-manager.h"
+#include "gabble/caps-channel-manager.h"
 #include "connection.h"
 #include "conn-olpc.h"
 #include "debug.h"
diff --git a/src/presence-cache.c b/src/presence-cache.c
index e3d9970d..8917df39 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -46,8 +46,8 @@
 
 #define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
 
-#include "capabilities.h"
-#include "caps-channel-manager.h"
+#include "gabble/capabilities.h"
+#include "gabble/caps-channel-manager.h"
 #include "conn-presence.h"
 #include "debug.h"
 #include "disco.h"
diff --git a/src/presence.c b/src/presence.c
index 1f95529c..8be1998f 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -25,7 +25,7 @@
 #include <telepathy-glib/channel-manager.h>
 #include <wocky/wocky-utils.h>
 
-#include "capabilities.h"
+#include "gabble/capabilities.h"
 #include "conn-presence.h"
 #include "presence-cache.h"
 #include "namespaces.h"
diff --git a/src/presence.h b/src/presence.h
index 5406bd84..50d6945a 100644
--- a/src/presence.h
+++ b/src/presence.h
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 
-#include "capabilities.h"
+#include "gabble/capabilities.h"
 #include "connection.h"
 #include "types.h"
 
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index b2b3200f..52c10a84 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -36,8 +36,7 @@
 
 #define DEBUG_FLAG GABBLE_DEBUG_TUBES
 
-#include "caps-channel-manager.h"
-#include "capabilities.h"
+#include "gabble/caps-channel-manager.h"
 #include "connection.h"
 #include "debug.h"
 #include "muc-channel.h"
diff --git a/src/roomlist-manager.c b/src/roomlist-manager.c
index 76abee68..5f38a102 100644
--- a/src/roomlist-manager.c
+++ b/src/roomlist-manager.c
@@ -33,7 +33,7 @@
 
 #define DEBUG_FLAG GABBLE_DEBUG_MUC
 
-#include "caps-channel-manager.h"
+#include "gabble/caps-channel-manager.h"
 #include "connection.h"
 #include "debug.h"
 #include "namespaces.h"
diff --git a/src/roster.c b/src/roster.c
index 48d2461f..7c712a2b 100644
--- a/src/roster.c
+++ b/src/roster.c
@@ -37,7 +37,7 @@
 
 #define DEBUG_FLAG GABBLE_DEBUG_ROSTER
 
-#include "caps-channel-manager.h"
+#include "gabble/caps-channel-manager.h"
 #include "conn-aliasing.h"
 #include "conn-presence.h"
 #include "conn-util.h"
diff --git a/src/search-manager.c b/src/search-manager.c
index d3c1fa57..fec4b74d 100644
--- a/src/search-manager.c
+++ b/src/search-manager.c
@@ -29,7 +29,7 @@
 
 #define DEBUG_FLAG GABBLE_DEBUG_SEARCH
 
-#include "caps-channel-manager.h"
+#include "gabble/caps-channel-manager.h"
 #include "connection.h"
 #include "debug.h"
 #include "disco.h"
diff --git a/src/server-tls-manager.c b/src/server-tls-manager.c
index 62ab8865..48364512 100644
--- a/src/server-tls-manager.c
+++ b/src/server-tls-manager.c
@@ -23,7 +23,7 @@
 
 #define DEBUG_FLAG GABBLE_DEBUG_TLS
 #include "debug.h"
-#include "caps-channel-manager.h"
+#include "gabble/caps-channel-manager.h"
 #include "connection.h"
 #include "server-tls-channel.h"
 #include "util.h"