include config.h

Also alphabetic ordering for TPL_DEBUG_XXX constant and GDebugKey array

18 files changed, 40 insertions, 21 deletions

diff --git a/telepathy-logger/action-chain.c b/telepathy-logger/action-chain.c
index f5975db40..7d4af575f 100644
--- a/telepathy-logger/action-chain.c
+++ b/telepathy-logger/action-chain.c
@@ -19,6 +19,7 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "action-chain.h"
 
 TplActionChain *
diff --git a/telepathy-logger/channel-factory.c b/telepathy-logger/channel-factory.c
index f91c2009f..d9db53dc1 100644
--- a/telepathy-logger/channel-factory.c
+++ b/telepathy-logger/channel-factory.c
@@ -19,6 +19,7 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "channel-factory.h"
 
 #include <telepathy-glib/util.h>
diff --git a/telepathy-logger/channel-text.c b/telepathy-logger/channel-text.c
index 8e564e8f1..d738bcffe 100644
--- a/telepathy-logger/channel-text.c
+++ b/telepathy-logger/channel-text.c
@@ -19,13 +19,7 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
-/*
- * This object acts as a Text Channel context, handling a automaton to
- * set up all the needed information before connect to Text iface
- * signals.
- */
-
-#include "../config.h"
+#include "config.h"
 #include "channel-text.h"
 
 #include <glib.h>
diff --git a/telepathy-logger/channel.c b/telepathy-logger/channel.c
index d55906c0f..4a4ddeab4 100644
--- a/telepathy-logger/channel.c
+++ b/telepathy-logger/channel.c
@@ -19,6 +19,7 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "channel.h"
 
 #include <string.h>
diff --git a/telepathy-logger/conf.c b/telepathy-logger/conf.c
index 17c14f27f..a4780562e 100644
--- a/telepathy-logger/conf.c
+++ b/telepathy-logger/conf.c
@@ -19,7 +19,8 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
-#include "conf.h"
+#include "config.h" /* autoheader generated */
+#include "conf.h" /* conf.c module headers */
 
 #include <glib.h>
 
diff --git a/telepathy-logger/contact.c b/telepathy-logger/contact.c
index 54f6efc74..e3574954e 100644
--- a/telepathy-logger/contact.c
+++ b/telepathy-logger/contact.c
@@ -19,6 +19,7 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "contact.h"
 
 #include <telepathy-glib/account.h>
diff --git a/telepathy-logger/datetime.c b/telepathy-logger/datetime.c
index 5bd7639a4..8afe00e5b 100644
--- a/telepathy-logger/datetime.c
+++ b/telepathy-logger/datetime.c
@@ -20,6 +20,7 @@
  * Authors: Richard Hult <richard@imendio.com>
  */
 
+#include "config.h"
 #include "datetime.h"
 
 #include <glib/gi18n.h>
diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c
index df51e231e..0cd4e2c3b 100644
--- a/telepathy-logger/dbus-service.c
+++ b/telepathy-logger/dbus-service.c
@@ -19,6 +19,7 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "dbus-service.h"
 
 #include <glib.h>
diff --git a/telepathy-logger/debug.c b/telepathy-logger/debug.c
index bb7f7d838..100b1b02b 100644
--- a/telepathy-logger/debug.c
+++ b/telepathy-logger/debug.c
@@ -30,14 +30,16 @@
 static TplDebugFlags flags = 0;
 
 static GDebugKey keys[] = {
-  { "observer",     TPL_DEBUG_OBSERVER },
+  { "action-chain", TPL_DEBUG_ACTION_CHAIN },
   { "channel",      TPL_DEBUG_CHANNEL },
-  { "log-manager",  TPL_DEBUG_LOG_MANAGER },
-  { "log-store",    TPL_DEBUG_LOG_STORE },
   { "conf",         TPL_DEBUG_CONF },
   { "contact",      TPL_DEBUG_CONTACT },
-  { "main",         TPL_DEBUG_MAIN },
   { "dbus-service", TPL_DEBUG_DBUS_SERVICE },
+  { "log-entry",    TPL_DEBUG_LOG_ENTRY },
+  { "log-manager",  TPL_DEBUG_LOG_MANAGER },
+  { "log-store",    TPL_DEBUG_LOG_STORE },
+  { "main",         TPL_DEBUG_MAIN },
+  { "observer",     TPL_DEBUG_OBSERVER },
   { 0, },
 };
 
diff --git a/telepathy-logger/debug.h b/telepathy-logger/debug.h
index 030bfff11..16ba2c47f 100644
--- a/telepathy-logger/debug.h
+++ b/telepathy-logger/debug.h
@@ -32,14 +32,16 @@ G_BEGIN_DECLS
 
 typedef enum
 {
-  TPL_DEBUG_OBSERVER      = 1 << 0,
-  TPL_DEBUG_CHANNEL       = 1 << 1,
-  TPL_DEBUG_LOG_MANAGER   = 1 << 2,
-  TPL_DEBUG_LOG_STORE     = 1 << 3,
-  TPL_DEBUG_CONF          = 1 << 4,
-  TPL_DEBUG_CONTACT       = 1 << 5,
-  TPL_DEBUG_MAIN          = 1 << 6,
-  TPL_DEBUG_DBUS_SERVICE  = 1 << 7
+  TPL_DEBUG_ACTION_CHAIN  = 1 << 0,
+  TPL_DEBUG_CONF          = 1 << 1,
+  TPL_DEBUG_CONTACT       = 1 << 2,
+  TPL_DEBUG_CHANNEL       = 1 << 3,
+  TPL_DEBUG_DBUS_SERVICE  = 1 << 4,
+  TPL_DEBUG_LOG_ENTRY     = 1 << 5,
+  TPL_DEBUG_LOG_MANAGER   = 1 << 6,
+  TPL_DEBUG_LOG_STORE     = 1 << 7,
+  TPL_DEBUG_MAIN          = 1 << 8,
+  TPL_DEBUG_OBSERVER      = 1 << 9
 } TplDebugFlags;
 
 void tpl_debug_set_flags_from_env (void);
diff --git a/telepathy-logger/log-entry-text.c b/telepathy-logger/log-entry-text.c
index fc05431cf..1cb249755 100644
--- a/telepathy-logger/log-entry-text.c
+++ b/telepathy-logger/log-entry-text.c
@@ -19,6 +19,7 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "log-entry-text.h"
 
 #include <glib-object.h>
diff --git a/telepathy-logger/log-entry.c b/telepathy-logger/log-entry.c
index 9b0ad9b04..0c8f3f6e9 100644
--- a/telepathy-logger/log-entry.c
+++ b/telepathy-logger/log-entry.c
@@ -18,6 +18,7 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "log-entry.h"
 
 #include <glib.h>
@@ -27,6 +28,9 @@
 #include <telepathy-logger/debug.h>
 #include <telepathy-logger/util.h>
 
+#define DEBUG_FLAG TPL_DEBUG_LOG_ENTRY
+#include <telepathy-logger/debug.h>
+
 /**
  * SECTION:log-entry
  * @title: TplLogEntry
diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index 7b4935cda..7b1509d58 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -22,6 +22,7 @@
  *          Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "log-manager.h"
 #include "log-manager-priv.h"
 
diff --git a/telepathy-logger/log-store-empathy.c b/telepathy-logger/log-store-empathy.c
index e7748392f..c88befcb4 100644
--- a/telepathy-logger/log-store-empathy.c
+++ b/telepathy-logger/log-store-empathy.c
@@ -23,6 +23,7 @@
  *          Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "log-store-empathy.h"
 
 #include <string.h>
diff --git a/telepathy-logger/log-store-factory.c b/telepathy-logger/log-store-factory.c
index 05dd9e1ed..f919526b2 100644
--- a/telepathy-logger/log-store-factory.c
+++ b/telepathy-logger/log-store-factory.c
@@ -19,6 +19,7 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "log-store-factory.h"
 
 #include <telepathy-logger/util.h>
diff --git a/telepathy-logger/log-store.c b/telepathy-logger/log-store.c
index 63e29cd53..134bd57fe 100644
--- a/telepathy-logger/log-store.c
+++ b/telepathy-logger/log-store.c
@@ -21,8 +21,12 @@
  *          Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "log-store.h"
 
+#define DEBUG_FLAG TPL_DEBUG_LOG_STORE
+#include <telepathy-logger/debug.h>
+
 /**
  * SECTION:log-store
  * @title: TplLogStore
diff --git a/telepathy-logger/observer.c b/telepathy-logger/observer.c
index 560aafb88..507c720e0 100644
--- a/telepathy-logger/observer.c
+++ b/telepathy-logger/observer.c
@@ -19,7 +19,7 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
-
+#include "config.h"
 #include "observer.h"
 
 #include <glib.h>
@@ -38,6 +38,7 @@
 
 #define DEBUG_FLAG TPL_DEBUG_OBSERVER
 #include <telepathy-logger/debug.h>
+
 /**
  * SECTION:observer
  * @title: TplObserver
diff --git a/telepathy-logger/util.c b/telepathy-logger/util.c
index 8a7ac7795..d263c46b7 100644
--- a/telepathy-logger/util.c
+++ b/telepathy-logger/util.c
@@ -19,6 +19,7 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
+#include "config.h"
 #include "util.h"
 
 #include <telepathy-glib/util.h>