rename all non public headers to -internal.h

35 files changed, 62 insertions, 62 deletions

diff --git a/src/telepathy-logger.c b/src/telepathy-logger.c
index 000c72081..6ce67e9d8 100644
--- a/src/telepathy-logger.c
+++ b/src/telepathy-logger.c
@@ -25,10 +25,10 @@
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/debug-sender.h>
 
-#include <telepathy-logger/channel-factory.h>
-#include <telepathy-logger/channel-text.h>
-#include <telepathy-logger/observer.h>
-#include <telepathy-logger/dbus-service.h>
+#include <telepathy-logger/channel-factory-internal.h>
+#include <telepathy-logger/channel-text-internal.h>
+#include <telepathy-logger/observer-internal.h>
+#include <telepathy-logger/dbus-service-internal.h>
 
 #define DEBUG_FLAG TPL_DEBUG_MAIN
 #include <telepathy-logger/debug-internal.h>
diff --git a/src/test-api.c b/src/test-api.c
index 0692c294a..f9eb00463 100644
--- a/src/test-api.c
+++ b/src/test-api.c
@@ -25,7 +25,7 @@
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/proxy-subclass.h>
 
-#include <telepathy-logger/dbus-service.h>
+#include <telepathy-logger/dbus-service-internal.h>
 #include <extensions/extensions.h>
 
 static GMainLoop *mainloop = NULL;
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
index 44de46b89..9ce1bd465 100644
--- a/telepathy-logger/Makefile.am
+++ b/telepathy-logger/Makefile.am
@@ -28,19 +28,19 @@ LIBTPL_HEADERS = \
 libtelepathy_logger_la_SOURCES = \
 		action-chain.c			\
 		action-chain-internal.h		\
-		channel.h			\
+		channel-internal.h			\
 		channel.c			\
 		channel-factory.c		\
-		channel-factory.h		\
+		channel-factory-internal.h		\
 		channel-text.c			\
-		channel-text.h			\
+		channel-text-internal.h			\
 		conf.c				\
-		conf.h				\
+		conf-internal.h				\
 		contact.c			\
 		datetime.c			\
 		datetime-internal.h		\
 		dbus-service.c			\
-		dbus-service.h			\
+		dbus-service-internal.h			\
 		debug-internal.h		\
 		debug.c				\
 		log-entry.c			\
@@ -50,15 +50,15 @@ libtelepathy_logger_la_SOURCES = \
 		log-manager.c			\
 		log-manager-internal.h		\
 		log-store.c			\
-		log-store.h			\
+		log-store-internal.h			\
 		log-store-xml.c			\
-		log-store-xml.h			\
+		log-store-xml-internal.h			\
 		log-store-sqlite.c		\
-		log-store-sqlite.h		\
+		log-store-sqlite-internal.h		\
 		log-store-factory.c		\
-		log-store-factory.h		\
+		log-store-factory-internal.h		\
 		observer.c			\
-		observer.h			\
+		observer-internal.h			\
 		util-internal.h			\
 		util.c				\
 		$(NULL)
diff --git a/telepathy-logger/channel-factory.h b/telepathy-logger/channel-factory-internal.h
index 0a4767ab3..8c7dfc35f 100644
--- a/telepathy-logger/channel-factory.h
+++ b/telepathy-logger/channel-factory-internal.h
@@ -26,7 +26,7 @@
 #include <telepathy-glib/connection.h>
 #include <telepathy-glib/account.h>
 
-#include <telepathy-logger/channel.h>
+#include <telepathy-logger/channel-internal.h>
 
 #define TPL_CHANNEL_FACTORY_ERROR g_quark_from_static_string ( \
     "tpl-channel-factory-error-quark")
diff --git a/telepathy-logger/channel-factory.c b/telepathy-logger/channel-factory.c
index 8a48662d0..7289258e7 100644
--- a/telepathy-logger/channel-factory.c
+++ b/telepathy-logger/channel-factory.c
@@ -20,11 +20,11 @@
  */
 
 #include "config.h"
-#include "channel-factory.h"
+#include "channel-factory-internal.h"
 
 #include <telepathy-glib/util.h>
 
-#include <telepathy-logger/channel-text.h>
+#include <telepathy-logger/channel-text-internal.h>
 
 #define DEBUG_FLAG TPL_DEBUG_CHANNEL
 #include <telepathy-logger/debug-internal.h>
diff --git a/telepathy-logger/channel.h b/telepathy-logger/channel-internal.h
index 5387d6a54..5387d6a54 100644
--- a/telepathy-logger/channel.h
+++ b/telepathy-logger/channel-internal.h
diff --git a/telepathy-logger/channel-text.h b/telepathy-logger/channel-text-internal.h
index e7da8a35e..9eeb540e9 100644
--- a/telepathy-logger/channel-text.h
+++ b/telepathy-logger/channel-text-internal.h
@@ -32,7 +32,7 @@
 #include <telepathy-glib/connection.h>
 #include <telepathy-glib/contact.h>
 
-#include <telepathy-logger/channel.h>
+#include <telepathy-logger/channel-internal.h>
 
 G_BEGIN_DECLS
 #define TPL_TYPE_CHANNEL_TEXT                  (tpl_channel_text_get_type ())
diff --git a/telepathy-logger/channel-text.c b/telepathy-logger/channel-text.c
index c52e8be1c..74319f7a4 100644
--- a/telepathy-logger/channel-text.c
+++ b/telepathy-logger/channel-text.c
@@ -20,20 +20,20 @@
  */
 
 #include "config.h"
-#include "channel-text.h"
+#include "channel-text-internal.h"
 
 #include <glib.h>
 #include <telepathy-glib/contact.h>
 #include <telepathy-glib/enums.h>
 #include <telepathy-glib/proxy.h>
 
-#include <telepathy-logger/channel.h>
-#include <telepathy-logger/observer.h>
+#include <telepathy-logger/channel-internal.h>
+#include <telepathy-logger/observer-internal.h>
 #include <telepathy-logger/log-entry-internal.h>
 #include <telepathy-logger/log-entry-text.h>
 #include <telepathy-logger/log-entry-text-internal.h>
 #include <telepathy-logger/log-manager-internal.h>
-#include <telepathy-logger/log-store-sqlite.h>
+#include <telepathy-logger/log-store-sqlite-internal.h>
 
 #define DEBUG_FLAG TPL_DEBUG_CHANNEL
 #include <telepathy-logger/action-chain-internal.h>
diff --git a/telepathy-logger/channel.c b/telepathy-logger/channel.c
index a33dbada2..f236a7242 100644
--- a/telepathy-logger/channel.c
+++ b/telepathy-logger/channel.c
@@ -20,15 +20,15 @@
  */
 
 #include "config.h"
-#include "channel.h"
+#include "channel-internal.h"
 
 #include <string.h>
 
 #include <glib.h>
 #include <telepathy-glib/util.h>
 
-#include <telepathy-logger/channel-text.h>
-#include <telepathy-logger/observer.h>
+#include <telepathy-logger/channel-text-internal.h>
+#include <telepathy-logger/observer-internal.h>
 
 #define DEBUG_FLAG TPL_DEBUG_CHANNEL
 #include <telepathy-logger/action-chain-internal.h>
diff --git a/telepathy-logger/conf.h b/telepathy-logger/conf-internal.h
index eaeca6c46..eaeca6c46 100644
--- a/telepathy-logger/conf.h
+++ b/telepathy-logger/conf-internal.h
diff --git a/telepathy-logger/conf.c b/telepathy-logger/conf.c
index af0644722..e6147a528 100644
--- a/telepathy-logger/conf.c
+++ b/telepathy-logger/conf.c
@@ -19,8 +19,8 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
-#include "config.h" /* autoheader generated */
-#include "conf.h" /* conf.c module headers */
+#include "config.h"
+#include "conf-internal.h"
 
 #include <glib.h>
 
diff --git a/telepathy-logger/dbus-service.h b/telepathy-logger/dbus-service-internal.h
index 600c826fd..600c826fd 100644
--- a/telepathy-logger/dbus-service.h
+++ b/telepathy-logger/dbus-service-internal.h
diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c
index 168f86952..20ab2a61b 100644
--- a/telepathy-logger/dbus-service.c
+++ b/telepathy-logger/dbus-service.c
@@ -20,7 +20,7 @@
  */
 
 #include "config.h"
-#include "dbus-service.h"
+#include "dbus-service-internal.h"
 
 #include <string.h>
 #include <sys/stat.h>
diff --git a/telepathy-logger/log-entry-text.h b/telepathy-logger/log-entry-text.h
index 77bf03fda..bc9e09e6a 100644
--- a/telepathy-logger/log-entry-text.h
+++ b/telepathy-logger/log-entry-text.h
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-logger/channel-text.h>
+#include <telepathy-logger/channel-text-internal.h>
 #include <telepathy-logger/log-entry.h>
 
 G_BEGIN_DECLS
diff --git a/telepathy-logger/log-manager-internal.h b/telepathy-logger/log-manager-internal.h
index 7019b5d14..7c981c0e4 100644
--- a/telepathy-logger/log-manager-internal.h
+++ b/telepathy-logger/log-manager-internal.h
@@ -25,8 +25,8 @@
 #define __TPL_LOG_MANAGER_PRIV_H__
 
 #include <telepathy-logger/log-manager.h>
-#include <telepathy-logger/log-store-factory.h>
-#include <telepathy-logger/log-store.h>
+#include <telepathy-logger/log-store-factory-internal.h>
+#include <telepathy-logger/log-store-internal.h>
 
 gboolean _tpl_log_manager_add_message (TplLogManager *manager,
     TplLogEntry *message, GError **error);
diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index 3fb4e4313..99780228c 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -37,9 +37,9 @@
 
 #include <telepathy-logger/log-entry.h>
 #include <telepathy-logger/log-entry-internal.h>
-#include <telepathy-logger/log-store.h>
-#include <telepathy-logger/log-store-xml.h>
-#include <telepathy-logger/log-store-sqlite.h>
+#include <telepathy-logger/log-store-internal.h>
+#include <telepathy-logger/log-store-xml-internal.h>
+#include <telepathy-logger/log-store-sqlite-internal.h>
 
 #define DEBUG_FLAG TPL_DEBUG_LOG_MANAGER
 #include <telepathy-logger/datetime-internal.h>
diff --git a/telepathy-logger/log-store-factory.h b/telepathy-logger/log-store-factory-internal.h
index 5cbf7506c..580fbf148 100644
--- a/telepathy-logger/log-store-factory.h
+++ b/telepathy-logger/log-store-factory-internal.h
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-logger/log-store.h>
+#include <telepathy-logger/log-store-internal.h>
 
 typedef TplLogStore* (*TplLogStoreConstructor) (const gchar *name,
     gboolean write_access, gboolean read_access);
diff --git a/telepathy-logger/log-store-factory.c b/telepathy-logger/log-store-factory.c
index 570788ae3..740b97217 100644
--- a/telepathy-logger/log-store-factory.c
+++ b/telepathy-logger/log-store-factory.c
@@ -20,7 +20,7 @@
  */
 
 #include "config.h"
-#include "log-store-factory.h"
+#include "log-store-factory-internal.h"
 
 #define DEBUG_FLAG TPL_DEBUG_LOG_STORE
 #include <telepathy-logger/debug-internal.h>
diff --git a/telepathy-logger/log-store.h b/telepathy-logger/log-store-internal.h
index 37fe54427..37fe54427 100644
--- a/telepathy-logger/log-store.h
+++ b/telepathy-logger/log-store-internal.h
diff --git a/telepathy-logger/log-store-sqlite.h b/telepathy-logger/log-store-sqlite-internal.h
index 7036f1615..557b9c915 100644
--- a/telepathy-logger/log-store-sqlite.h
+++ b/telepathy-logger/log-store-sqlite-internal.h
@@ -26,7 +26,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <telepathy-logger/log-store.h>
+#include <telepathy-logger/log-store-internal.h>
 
 G_BEGIN_DECLS
 
diff --git a/telepathy-logger/log-store-sqlite.c b/telepathy-logger/log-store-sqlite.c
index 7e6907275..38cf29858 100644
--- a/telepathy-logger/log-store-sqlite.c
+++ b/telepathy-logger/log-store-sqlite.c
@@ -30,7 +30,7 @@
 #include "log-entry-internal.h"
 #include "log-entry-text.h"
 #include "log-entry-text-internal.h"
-#include "log-store-sqlite.h"
+#include "log-store-sqlite-internal.h"
 
 #define DEBUG_FLAG TPL_DEBUG_LOG_STORE
 #include "datetime-internal.h"
diff --git a/telepathy-logger/log-store-xml.h b/telepathy-logger/log-store-xml-internal.h
index 2e6a7110d..2e6a7110d 100644
--- a/telepathy-logger/log-store-xml.h
+++ b/telepathy-logger/log-store-xml-internal.h
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index 538f2d863..f26c80907 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "log-store-xml.h"
+#include "log-store-xml-internal.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -44,7 +44,7 @@
 #include <telepathy-logger/log-entry-text.h>
 #include <telepathy-logger/log-entry-text-internal.h>
 #include <telepathy-logger/log-manager.h>
-#include <telepathy-logger/log-store.h>
+#include <telepathy-logger/log-store-internal.h>
 
 #define DEBUG_FLAG TPL_DEBUG_LOG_STORE
 #include <telepathy-logger/contact-internal.h>
diff --git a/telepathy-logger/log-store.c b/telepathy-logger/log-store.c
index d9cbe39f1..edb710ee4 100644
--- a/telepathy-logger/log-store.c
+++ b/telepathy-logger/log-store.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include <telepathy-logger/log-store.h>
+#include <telepathy-logger/log-store-internal.h>
 
 #define DEBUG_FLAG TPL_DEBUG_LOG_STORE
 #include <telepathy-logger/debug-internal.h>
diff --git a/telepathy-logger/observer.h b/telepathy-logger/observer-internal.h
index 408689c94..58053e46d 100644
--- a/telepathy-logger/observer.h
+++ b/telepathy-logger/observer-internal.h
@@ -25,8 +25,8 @@
 #include <glib-object.h>
 #include <telepathy-glib/dbus-properties-mixin.h>
 
-#include <telepathy-logger/channel.h>
-#include <telepathy-logger/channel-factory.h>
+#include <telepathy-logger/channel-internal.h>
+#include <telepathy-logger/channel-factory-internal.h>
 
 #define TPL_OBSERVER_WELL_KNOWN_BUS_NAME \
   "org.freedesktop.Telepathy.Client.Logger"
diff --git a/telepathy-logger/observer.c b/telepathy-logger/observer.c
index e6c9d5bf5..5ea8f2ae6 100644
--- a/telepathy-logger/observer.c
+++ b/telepathy-logger/observer.c
@@ -20,7 +20,7 @@
  */
 
 #include "config.h"
-#include "observer.h"
+#include "observer-internal.h"
 
 #include <glib.h>
 #include <telepathy-glib/interfaces.h>
@@ -31,9 +31,9 @@
 #include <telepathy-glib/svc-client.h>
 #include <telepathy-glib/account-manager.h>
 
-#include <telepathy-logger/conf.h>
-#include <telepathy-logger/channel.h>
-#include <telepathy-logger/channel-factory.h>
+#include <telepathy-logger/conf-internal.h>
+#include <telepathy-logger/channel-internal.h>
+#include <telepathy-logger/channel-factory-internal.h>
 #include <telepathy-logger/log-manager.h>
 
 #define DEBUG_FLAG TPL_DEBUG_OBSERVER
diff --git a/telepathy-logger/util.c b/telepathy-logger/util.c
index d769c9e3c..112c56dad 100644
--- a/telepathy-logger/util.c
+++ b/telepathy-logger/util.c
@@ -22,7 +22,7 @@
 #include "util-internal.h"
 
 #include "datetime-internal.h"
-#include "log-store-sqlite.h"
+#include "log-store-sqlite-internal.h"
 
 /* Bug#26838 prevents us to trust Messages' iface message-token
  * header, so I need to create a token which TPL can trust to be unique
diff --git a/tests/test-searches.c b/tests/test-searches.c
index f280c8046..a0c4a13fd 100644
--- a/tests/test-searches.c
+++ b/tests/test-searches.c
@@ -4,8 +4,8 @@
 
 #include <telepathy-logger/log-manager.h>
 #include <telepathy-logger/log-manager-internal.h>
-#include <telepathy-logger/log-store.h>
-#include <telepathy-logger/log-store-xml.h>
+#include <telepathy-logger/log-store-internal.h>
+#include <telepathy-logger/log-store-xml-internal.h>
 
 
 static GMainLoop *loop = NULL;
diff --git a/tests/test-tpl-channel.c b/tests/test-tpl-channel.c
index 6ebb429fe..a7373729e 100644
--- a/tests/test-tpl-channel.c
+++ b/tests/test-tpl-channel.c
@@ -1,6 +1,6 @@
 #include "tpl-channel-test.h"
 
-#include <telepathy-logger/conf.h>
+#include <telepathy-logger/conf-internal.h>
 
 #define CONNECTION_PATH "org.freedesktop.Telepathy.Connection.gabble.jabber.cosimo_2ealfarano_40collabora_2eco_2euk_2fKazoo"
 #define ACCOUNT_PATH "/org/freedesktop/Telepathy/Account/FOO/BAR/BAZ"
diff --git a/tests/test-tpl-conf.c b/tests/test-tpl-conf.c
index 132c13cf3..28244f6d4 100644
--- a/tests/test-tpl-conf.c
+++ b/tests/test-tpl-conf.c
@@ -1,4 +1,4 @@
-#include <telepathy-logger/conf.h>
+#include <telepathy-logger/conf-internal.h>
 
 int
 main (int argc, char **argv)
diff --git a/tests/test-tpl-log-store-sqlite.c b/tests/test-tpl-log-store-sqlite.c
index 23791ed76..054485054 100644
--- a/tests/test-tpl-log-store-sqlite.c
+++ b/tests/test-tpl-log-store-sqlite.c
@@ -1,4 +1,4 @@
-#include <telepathy-logger/log-store-sqlite.h>
+#include <telepathy-logger/log-store-sqlite-internal.h>
 #include <telepathy-logger/debug-internal.h>
 
 int
diff --git a/tests/test-tpl-observer.c b/tests/test-tpl-observer.c
index e62fff8c1..e26e007a8 100644
--- a/tests/test-tpl-observer.c
+++ b/tests/test-tpl-observer.c
@@ -1,7 +1,7 @@
 #include "tpl-channel-test.h"
 
-#include <telepathy-logger/channel-factory.h>
-#include <telepathy-logger/observer.h>
+#include <telepathy-logger/channel-factory-internal.h>
+#include <telepathy-logger/observer-internal.h>
 
 static gint factory_counter = 0;
 
diff --git a/tests/tpl-channel-test.c b/tests/tpl-channel-test.c
index f11980e25..f571e6bdd 100644
--- a/tests/tpl-channel-test.c
+++ b/tests/tpl-channel-test.c
@@ -28,7 +28,7 @@
 #include "tpl-channel-test.h"
 
 #include <telepathy-logger/action-chain-internal.h>
-#include <telepathy-logger/channel.h>
+#include <telepathy-logger/channel-internal.h>
 
 static void call_when_ready_wrapper (TplChannel *tpl_chan, GAsyncReadyCallback
     cb, gpointer user_data);
diff --git a/tests/tpl-channel-test.h b/tests/tpl-channel-test.h
index 93ae63c54..4cc0339db 100644
--- a/tests/tpl-channel-test.h
+++ b/tests/tpl-channel-test.h
@@ -33,8 +33,8 @@
 #include <telepathy-glib/contact.h>
 #include <telepathy-glib/svc-client.h>
 
-#include <telepathy-logger/channel.h>
-#include <telepathy-logger/observer.h>
+#include <telepathy-logger/channel-internal.h>
+#include <telepathy-logger/observer-internal.h>
 
 G_BEGIN_DECLS
 #define TPL_TYPE_CHANNEL_TEST                 (tpl_channel_test_get_type ())
diff --git a/tests/twisted/main-debug.c b/tests/twisted/main-debug.c
index 4a343f6be..69688fd19 100644
--- a/tests/twisted/main-debug.c
+++ b/tests/twisted/main-debug.c
@@ -23,9 +23,9 @@
 
 #include <dbus/dbus.h>
 
-#include <telepathy-logger/observer.h>
-#include <telepathy-logger/channel-factory.h>
-#include <telepathy-logger/channel-text.h>
+#include <telepathy-logger/observer-internal.h>
+#include <telepathy-logger/channel-factory-internal.h>
+#include <telepathy-logger/channel-text-internal.h>
 
 
 static TplObserver *