diff options
| author | Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> | 2010-02-24 03:32:57 +0800 |
|---|---|---|
| committer | Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> | 2010-02-26 01:26:57 +0800 |
| commit | 8d4d46e440c7a6bd321fc098265db8ede27c07de (patch) | |
| tree | bcdffe751459a38bd950d5424d628d831c5243a7 /libempathy-gtk/empathy-contact-menu.c | |
| parent | 8e24107b437f63d9b2ca93e0d5b7379ee87af98d (diff) | |
| download | gsoc2013-empathy-8d4d46e440c7a6bd321fc098265db8ede27c07de.tar gsoc2013-empathy-8d4d46e440c7a6bd321fc098265db8ede27c07de.tar.gz gsoc2013-empathy-8d4d46e440c7a6bd321fc098265db8ede27c07de.tar.bz2 gsoc2013-empathy-8d4d46e440c7a6bd321fc098265db8ede27c07de.tar.lz gsoc2013-empathy-8d4d46e440c7a6bd321fc098265db8ede27c07de.tar.xz gsoc2013-empathy-8d4d46e440c7a6bd321fc098265db8ede27c07de.tar.zst gsoc2013-empathy-8d4d46e440c7a6bd321fc098265db8ede27c07de.zip | |
TPL Enabling patch, all-in-one.
By default TPL is disabled, use --enable-tpl configure option to enable it.
Diffstat (limited to 'libempathy-gtk/empathy-contact-menu.c')
| -rw-r--r-- | libempathy-gtk/empathy-contact-menu.c | 18 |
1 files changed, 17 insertions, 1 deletions
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")); |