[empathy] notifications-approver: stop using EmpathyContactManager



commit 7457b90af7b993bb34b40abf0cc2e3f605a4efa4
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Nov 3 14:08:29 2011 +0100

    notifications-approver: stop using EmpathyContactManager
    
    https://bugzilla.gnome.org/show_bug.cgi?id=663327

 src/empathy-notifications-approver.c |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index c312a3b..ac51459 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



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]