aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-03 21:08:29 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-08 20:33:27 +0800
commit7457b90af7b993bb34b40abf0cc2e3f605a4efa4 (patch)
treed36d6cdaad5a62fda28241ff2357946e3505de32
parent6104a6ca517210e89d441a44ed720168591c0a4e (diff)
downloadgsoc2013-empathy-7457b90af7b993bb34b40abf0cc2e3f605a4efa4.tar
gsoc2013-empathy-7457b90af7b993bb34b40abf0cc2e3f605a4efa4.tar.gz
gsoc2013-empathy-7457b90af7b993bb34b40abf0cc2e3f605a4efa4.tar.bz2
gsoc2013-empathy-7457b90af7b993bb34b40abf0cc2e3f605a4efa4.tar.lz
gsoc2013-empathy-7457b90af7b993bb34b40abf0cc2e3f605a4efa4.tar.xz
gsoc2013-empathy-7457b90af7b993bb34b40abf0cc2e3f605a4efa4.tar.zst
gsoc2013-empathy-7457b90af7b993bb34b40abf0cc2e3f605a4efa4.zip
notifications-approver: stop using EmpathyContactManager
https://bugzilla.gnome.org/show_bug.cgi?id=663327
-rw-r--r--src/empathy-notifications-approver.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index c312a3be6..ac51459fb 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -27,7 +27,6 @@
#include <telepathy-yell/telepathy-yell.h>
-#include <libempathy/empathy-contact-manager.h>
#include <libempathy/empathy-tp-streamed-media.h>
#include <libempathy-gtk/empathy-notify-manager.h>
@@ -158,18 +157,12 @@ notification_decline_subscription_cb (NotifyNotification *notification,
gchar *action,
EmpathyNotificationsApprover *self)
{
- EmpathyContactManager *manager;
-
if (self->priv->event == NULL)
return;
- manager = empathy_contact_manager_dup_singleton ();
- empathy_contact_list_remove (EMPATHY_CONTACT_LIST (manager),
- self->priv->event->contact, "");
+ empathy_contact_remove_from_contact_list (self->priv->event->contact);
empathy_event_remove (self->priv->event);
-
- g_object_unref (manager);
}
static void
@@ -177,18 +170,12 @@ notification_accept_subscription_cb (NotifyNotification *notification,
gchar *action,
EmpathyNotificationsApprover *self)
{
- EmpathyContactManager *manager;
-
if (self->priv->event == NULL)
return;
- manager = empathy_contact_manager_dup_singleton ();
- empathy_contact_list_add (EMPATHY_CONTACT_LIST (manager),
- self->priv->event->contact, "");
+ empathy_contact_add_to_contact_list (self->priv->event->contact, "");
empathy_event_remove (self->priv->event);
-
- g_object_unref (manager);
}
static void