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.
---
 libempathy-gtk/empathy-contact-menu.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'libempathy-gtk/empathy-contact-menu.c')

diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 3d194fced..54bb4b286 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -25,9 +25,13 @@
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
+#ifdef ENABLE_TPL
+#include <telepathy-logger/log-manager.h>
+#else
 
-#include <libempathy/empathy-call-factory.h>
 #include <libempathy/empathy-log-manager.h>
+#endif /* ENABLE_TPL */
+#include <libempathy/empathy-call-factory.h>
 #include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-utils.h>
@@ -307,18 +311,30 @@ contact_log_menu_item_activate_cb (EmpathyContact *contact)
 GtkWidget *
 empathy_contact_log_menu_item_new (EmpathyContact *contact)
 {
+#ifndef ENABLE_TPL
 	EmpathyLogManager *manager;
+#else
+	TplLogManager     *manager;
+#endif /* ENABLE_TPL */
 	gboolean           have_log;
 	GtkWidget         *item;
 	GtkWidget         *image;
 
 	g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
+#ifndef ENABLE_TPL
 	manager = empathy_log_manager_dup_singleton ();
 	have_log = empathy_log_manager_exists (manager,
 					       empathy_contact_get_account (contact),
 					       empathy_contact_get_id (contact),
 					       FALSE);
+#else
+	manager = tpl_log_manager_dup_singleton ();
+	have_log = tpl_log_manager_exists (manager,
+					       empathy_contact_get_account (contact),
+					       empathy_contact_get_id (contact),
+					       FALSE);
+#endif /* ENABLE_TPL */
 	g_object_unref (manager);
 
 	item = gtk_image_menu_item_new_with_mnemonic (_("_Previous Conversations"));
-- 
cgit v1.2.3