From 8d4d46e440c7a6bd321fc098265db8ede27c07de Mon Sep 17 00:00:00 2001
From: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Date: Tue, 23 Feb 2010 19:32:57 +0000
Subject: TPL Enabling patch, all-in-one.

By default TPL is disabled, use --enable-tpl configure option to enable it.
---
 src/empathy.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/empathy.c')

diff --git a/src/empathy.c b/src/empathy.c
index 5ba8be1b2..a530b4ae0 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -44,6 +44,13 @@
 #include <telepathy-glib/connection-manager.h>
 #include <telepathy-glib/interfaces.h>
 
+#ifdef ENABLE_TPL
+#include <telepathy-logger/log-manager.h>
+#include <telepathy-logger/log-store-empathy.h>
+#else
+
+#include <libempathy/empathy-log-manager.h>
+#endif /* ENABLE_TPL */
 #include <libempathy/empathy-idle.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-call-factory.h>
@@ -53,7 +60,6 @@
 #include <libempathy/empathy-connection-managers.h>
 #include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-dispatch-operation.h>
-#include <libempathy/empathy-log-manager.h>
 #include <libempathy/empathy-ft-factory.h>
 #include <libempathy/empathy-tp-chat.h>
 #include <libempathy/empathy-tp-call.h>
@@ -547,7 +553,11 @@ main (int argc, char *argv[])
   EmpathyStatusIcon *icon;
   EmpathyDispatcher *dispatcher;
   TpAccountManager *account_manager;
+#ifdef ENABLE_TPL
+  TplLogManager *log_manager;
+#else
   EmpathyLogManager *log_manager;
+#endif /* ENABLE_TPL */
   EmpathyChatroomManager *chatroom_manager;
   EmpathyCallFactory *call_factory;
   EmpathyFTFactory  *ft_factory;
@@ -560,7 +570,7 @@ main (int argc, char *argv[])
 
 #ifdef ENABLE_DEBUG
   TpDebugSender *debug_sender;
-#endif
+#endif /* ENABLE_TPL */
 
   GOptionContext *optcontext;
   GOptionEntry options[] = {
@@ -654,8 +664,12 @@ main (int argc, char *argv[])
       G_CALLBACK (unique_app_message_cb), window);
 
   /* Logging */
+#ifdef ENABLE_TPL
+  log_manager = tpl_log_manager_dup_singleton ();
+#else
   log_manager = empathy_log_manager_dup_singleton ();
   empathy_log_manager_observe (log_manager, dispatcher);
+#endif
 
   chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
   empathy_chatroom_manager_observe (chatroom_manager, dispatcher);
-- 
cgit v1.2.3