From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 10 Apr 2012 12:34:51 +0000 (+0200)
Subject: individual-manager: remove (un)linking API
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=29c177e550a8102dd9ea3b60d81af64cb038823b

individual-manager: remove (un)linking API

Empathy now relies on gnome-contacts to link contacts.
---

diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index a1ca269c..28f35df2 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -687,75 +687,6 @@ empathy_individual_manager_remove_group (EmpathyIndividualManager *manager,
       (gpointer) group);
 }
 
-static void
-link_personas_cb (FolksIndividualAggregator *aggregator,
-    GAsyncResult *async_result,
-    gpointer user_data)
-{
-  GError *error = NULL;
-
-  folks_individual_aggregator_link_personas_finish (aggregator, async_result,
-      &error);
-
-  if (error != NULL)
-    {
-      g_warning ("Failed to link personas: %s", error->message);
-      g_clear_error (&error);
-    }
-}
-
-void
-empathy_individual_manager_link_personas (EmpathyIndividualManager *self,
-    GeeSet *personas)
-{
-  EmpathyIndividualManagerPriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_INDIVIDUAL_MANAGER (self));
-  g_return_if_fail (personas != NULL);
-
-  priv = GET_PRIV (self);
-
-  DEBUG ("Linking %u personas",
-      gee_collection_get_size (GEE_COLLECTION (personas)));
-
-  folks_individual_aggregator_link_personas (priv->aggregator, personas,
-      (GAsyncReadyCallback) link_personas_cb, NULL);
-}
-
-static void
-unlink_individual_cb (FolksIndividualAggregator *aggregator,
-    GAsyncResult *async_result,
-    gpointer user_data)
-{
-  GError *error = NULL;
-
-  folks_individual_aggregator_unlink_individual_finish (aggregator,
-      async_result, &error);
-
-  if (error != NULL)
-    {
-      g_warning ("Failed to unlink individual: %s", error->message);
-      g_clear_error (&error);
-    }
-}
-
-void
-empathy_individual_manager_unlink_individual (EmpathyIndividualManager *self,
-    FolksIndividual *individual)
-{
-  EmpathyIndividualManagerPriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_INDIVIDUAL_MANAGER (self));
-  g_return_if_fail (FOLKS_IS_INDIVIDUAL (individual));
-
-  priv = GET_PRIV (self);
-
-  DEBUG ("Unlinking individual '%s'", folks_individual_get_id (individual));
-
-  folks_individual_aggregator_unlink_individual (priv->aggregator, individual,
-      (GAsyncReadyCallback) unlink_individual_cb, NULL);
-}
-
 gboolean
 empathy_individual_manager_get_contacts_loaded (EmpathyIndividualManager *self)
 {
diff --git a/libempathy/empathy-individual-manager.h b/libempathy/empathy-individual-manager.h
index ec760388..3e17bbd8 100644
--- a/libempathy/empathy-individual-manager.h
+++ b/libempathy/empathy-individual-manager.h
@@ -74,13 +74,6 @@ void empathy_individual_manager_remove (EmpathyIndividualManager *manager,
 void empathy_individual_manager_remove_group (EmpathyIndividualManager *manager,
     const gchar *group);
 
-void empathy_individual_manager_link_personas (EmpathyIndividualManager *self,
-    GeeSet *personas);
-
-void empathy_individual_manager_unlink_individual (
-    EmpathyIndividualManager *self,
-    FolksIndividual *individual);
-
 gboolean empathy_individual_manager_supports_blocking (
     EmpathyIndividualManager *self,
     FolksIndividual *individual);