aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/empathy.c')
-rw-r--r--src/empathy.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/empathy.c b/src/empathy.c
index 82efb7976..2cc5a9f28 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>
@@ -548,7 +554,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;
@@ -561,7 +571,7 @@ main (int argc, char *argv[])
#ifdef ENABLE_DEBUG
TpDebugSender *debug_sender;
-#endif
+#endif /* ENABLE_TPL */
GOptionContext *optcontext;
GOptionEntry options[] = {
@@ -655,8 +665,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);