diff options
| -rw-r--r-- | libempathy/empathy-tp-contact-list.c | 67 |
1 files changed, 66 insertions, 1 deletions
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index 3e1015d0c..5e3ea4598 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -47,6 +47,7 @@ typedef struct { TpChannel *publish; TpChannel *subscribe; + TpChannel *stored; GHashTable *members; /* handle -> EmpathyContact */ GHashTable *pendings; /* handle -> EmpathyContact */ GHashTable *groups; /* group name -> TpChannel */ @@ -750,6 +751,9 @@ tp_contact_list_finalize (GObject *object) if (priv->publish) { g_object_unref (priv->publish); } + if (priv->stored) { + g_object_unref (priv->stored); + } if (priv->connection) { g_object_unref (priv->connection); @@ -774,9 +778,57 @@ tp_contact_list_finalize (GObject *object) } static void -tp_contact_list_constructed (GObject *list) +store_create_channel_cb (TpConnection *conn, + const gchar *path, + GHashTable *properties, + const GError *error, + gpointer user_data, + GObject *weak_object) +{ + EmpathyTpContactList *list = user_data; + EmpathyTpContactListPriv *priv = GET_PRIV (list); + + if (error != NULL) { + DEBUG ("failed: %s\n", error->message); + return; + } + + priv->stored = tp_channel_new_from_properties (conn, path, properties, NULL); +} + +static void +conn_ready_cb (TpConnection *connection, + const GError *error, + gpointer data) { + EmpathyTpContactList *list = data; + EmpathyTpContactListPriv *priv = GET_PRIV (list); + GHashTable *request; + + if (error != NULL) { + DEBUG ("failed: %s", error->message); + goto out; + } + /* Try to request the 'stored' list. */ + request = tp_asv_new ( + TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST, + TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT, TP_HANDLE_TYPE_LIST, + TP_IFACE_CHANNEL ".TargetID", G_TYPE_STRING, "stored", + NULL); + + tp_cli_connection_interface_requests_call_create_channel (priv->connection, + -1, request, store_create_channel_cb, list, NULL, G_OBJECT (list)); + + g_hash_table_unref (request); + +out: + g_object_unref (list); +} + +static void +tp_contact_list_constructed (GObject *list) +{ EmpathyTpContactListPriv *priv = GET_PRIV (list); gchar *protocol_name = NULL; const gchar *names[] = {NULL, NULL}; @@ -826,6 +878,9 @@ tp_contact_list_constructed (GObject *list) NULL, NULL, G_OBJECT (list)); + g_object_ref (list); + tp_connection_call_when_ready (priv->connection, conn_ready_cb, list); + tp_cli_connection_call_list_channels (priv->connection, -1, tp_contact_list_list_channels_cb, NULL, NULL, @@ -994,6 +1049,16 @@ tp_contact_list_remove (EmpathyContactList *list, GArray handles = {(gchar *) &handle, 1}; handle = empathy_contact_get_handle (contact); + + /* FIXME: this is racy if tp_contact_list_remove is called before the + * 'stored' list has been retrieved. */ + if (priv->stored != NULL) { + tp_cli_channel_interface_group_call_remove_members (priv->stored, + -1, &handles, message, NULL, NULL, NULL, NULL); + /* Contact will be removed from 'publish' and 'subscribe' too */ + return; + } + if (priv->subscribe) { tp_cli_channel_interface_group_call_remove_members (priv->subscribe, -1, &handles, message, NULL, NULL, NULL, NULL); |