aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-contact-menu.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 /libempathy-gtk/empathy-contact-menu.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 'libempathy-gtk/empathy-contact-menu.c')
-rw-r--r--libempathy-gtk/empathy-contact-menu.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 9cc93b191..9ea19af32 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -25,12 +25,8 @@
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
-#ifdef ENABLE_TPL
#include <telepathy-logger/log-manager.h>
-#else
-#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>
@@ -322,30 +318,19 @@ 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"));