diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-02-26 16:49:16 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-02-26 16:49:16 +0800 |
| commit | 04a3f49597c3ffb367b48fe6c01f972bdd15ea11 (patch) | |
| tree | 71365ef368afa72968af8bff1b41d8c0665d1009 /src | |
| parent | e86aa1065dbf60d7a1e68bf50d9fbbccbb34312a (diff) | |
| parent | 28244a9c41e2c4274d2cb298c20b5e8909f7578a (diff) | |
| download | gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar.gz gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar.bz2 gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar.lz gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar.xz gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar.zst gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.zip | |
Merge commit 'ka/empathy-tpl-20100225-ifdef'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 2 | ||||
| -rw-r--r-- | src/empathy.c | 18 |
3 files changed, 20 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9460fc959..3f8d15733 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,6 +13,7 @@ CPPFLAGS_COMMON = \ AM_LDFLAGS = -lm AM_CPPFLAGS = \ $(CPPFLAGS_COMMON) \ + $(TPL_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(LIBCHAMPLAIN_CFLAGS) \ $(WEBKIT_CFLAGS) \ @@ -22,6 +23,7 @@ LDADD = \ $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ $(top_builddir)/libempathy/libempathy.la \ $(top_builddir)/extensions/libemp-extensions.la \ + $(TPL_LIBS) \ $(LIBNOTIFY_LIBS) \ $(EMPATHY_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index d8c68dc03..2e2f5c003 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1315,6 +1315,8 @@ chat_window_new_message_cb (EmpathyChat *chat, if (has_focus && priv->current_chat == chat) { /* window and tab are focused so consider the message to be read */ + + /* FIXME: see Bug#610994 and coments about it in EmpathyChatPriv */ empathy_chat_messages_read (chat); return; } 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); |