[empathy] individual-store-channel: stop preparing TP_CHANNEL_FEATURE_CONTACTS

[Guillaume Desmottes <gdesmott src gnome org>]

commit f6cca8274e3cce4821d93b9bbdb456a864a7b7dc
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed May 2 10:52:06 2012 +0200

    individual-store-channel: stop preparing TP_CHANNEL_FEATURE_CONTACTS
    
    The factory does it for us now.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=675229

 libempathy-gtk/empathy-individual-store-channel.c |   31 +++-----------------
 1 files changed, 5 insertions(+), 26 deletions(-)
---
diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c
index 76ff74e..e5edb26 100644
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -139,22 +139,14 @@ group_contacts_changed_cb (TpChannel *channel,
 }
 
 static void
-channel_prepare_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
+individual_store_channel_set_individual_channel (
+    EmpathyIndividualStoreChannel *self,
+    TpChannel *channel)
 {
-  EmpathyIndividualStoreChannel *self = user_data;
-  TpChannel *channel = (TpChannel *) source;
-  GError *error = NULL;
   GPtrArray *members;
 
-  if (!tp_proxy_prepare_finish (source, result, &error))
-    {
-      DEBUG ("Failed to prepare %s: %s", tp_proxy_get_object_path (source),
-          error->message);
-
-      g_error_free (error);
-    }
+  g_assert (self->priv->channel == NULL); /* construct only */
+  self->priv->channel = g_object_ref (channel);
 
   /* Add initial members */
   members = tp_channel_group_dup_members_contacts (channel);
@@ -169,19 +161,6 @@ channel_prepare_cb (GObject *source,
 }
 
 static void
-individual_store_channel_set_individual_channel (
-    EmpathyIndividualStoreChannel *self,
-    TpChannel *channel)
-{
-  GQuark features[] = { TP_CHANNEL_FEATURE_CONTACTS, 0 };
-
-  g_assert (self->priv->channel == NULL); /* construct only */
-  self->priv->channel = g_object_ref (channel);
-
-  tp_proxy_prepare_async (channel, features, channel_prepare_cb, self);
-}
-
-static void
 individual_store_channel_dispose (GObject *object)
 {
   EmpathyIndividualStoreChannel *self = EMPATHY_INDIVIDUAL_STORE_CHANNEL (