diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-02 10:52:06 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-03 10:53:34 +0200 |
| commit | f6cca8274e3cce4821d93b9bbdb456a864a7b7dc (patch) | |
| tree | 6382804ef2c993aaf8d18dc65e0d2aa3d1768083 /libempathy-gtk/empathy-individual-store-channel.c | |
| parent | b7f5aed23c4253145811b7759f8ea8ed120903a1 (diff) | |
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
Diffstat (limited to 'libempathy-gtk/empathy-individual-store-channel.c')
| -rw-r--r-- | 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 76ff74e2..e5edb264 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 ( |