aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-18 23:53:38 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-18 23:53:38 +0800
commitd345fc72a9ff9ce2af454f428b56f78cb611416a (patch)
treecc66f9e49c83fb95fcdc21acc3dbad4bc16f7cb3 /src/empathy.c
parentfc409d61494d325be2714f8b5a7aff2281755248 (diff)
downloadgsoc2013-empathy-d345fc72a9ff9ce2af454f428b56f78cb611416a.tar
gsoc2013-empathy-d345fc72a9ff9ce2af454f428b56f78cb611416a.tar.gz
gsoc2013-empathy-d345fc72a9ff9ce2af454f428b56f78cb611416a.tar.bz2
gsoc2013-empathy-d345fc72a9ff9ce2af454f428b56f78cb611416a.tar.lz
gsoc2013-empathy-d345fc72a9ff9ce2af454f428b56f78cb611416a.tar.xz
gsoc2013-empathy-d345fc72a9ff9ce2af454f428b56f78cb611416a.tar.zst
gsoc2013-empathy-d345fc72a9ff9ce2af454f428b56f78cb611416a.zip
Depend on telepathy-logger (#610956)
Diffstat (limited to 'src/empathy.c')
-rw-r--r--src/empathy.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/empathy.c b/src/empathy.c
index 552b8e171..5a6b13199 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -44,12 +44,8 @@
#include <telepathy-glib/connection-manager.h>
#include <telepathy-glib/interfaces.h>
-#ifdef ENABLE_TPL
#include <telepathy-logger/log-manager.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>
@@ -576,11 +572,7 @@ 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;
@@ -701,12 +693,7 @@ 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);