typedef struct {
EmpathyTpContactFactory *factory;
TpConnection *connection;
- const gchar *protocol_group;
TpChannel *publish;
TpChannel *subscribe;
GHashTable *add_to_group; /* group name -> GArray of handles */
EmpathyContactListFlags flags;
+
+ TpProxySignalConnection *new_channels_sig;
} EmpathyTpContactListPriv;
typedef enum {
g_hash_table_remove (priv->groups, group_name);
}
+static void
+contacts_added_to_group (EmpathyTpContactList *list,
+ TpChannel *channel,
+ GArray *added)
+{
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ const gchar *group_name;
+ guint i;
+
+ group_name = tp_channel_get_identifier (channel);
+
+ for (i = 0; i < added->len; i++) {
+ EmpathyContact *contact;
+ TpHandle handle;
+
+ handle = g_array_index (added, TpHandle, i);
+ contact = g_hash_table_lookup (priv->members,
+ GUINT_TO_POINTER (handle));
+ if (contact == NULL) {
+ continue;
+ }
+
+ DEBUG ("Contact %s (%d) added to group %s",
+ empathy_contact_get_id (contact), handle, group_name);
+ g_signal_emit_by_name (list, "groups-changed", contact,
+ group_name,
+ TRUE);
+ }
+}
+
+static void
+tp_contact_list_group_members_changed_cb (TpChannel *channel,
+ gchar *message,
+ GArray *added,
+ GArray *removed,
+ GArray *local_pending,
+ GArray *remote_pending,
+ guint actor,
+ guint reason,
+ EmpathyTpContactList *list)
+{
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ const gchar *group_name;
+ guint i;
+
+ contacts_added_to_group (list, channel, added);
+
+ group_name = tp_channel_get_identifier (channel);
+
+ for (i = 0; i < removed->len; i++) {
+ EmpathyContact *contact;
+ TpHandle handle;
+
+ handle = g_array_index (removed, TpHandle, i);
+ contact = g_hash_table_lookup (priv->members,
+ GUINT_TO_POINTER (handle));
+ if (contact == NULL) {
+ continue;
+ }
+
+ DEBUG ("Contact %s (%d) removed from group %s",
+ empathy_contact_get_id (contact), handle, group_name);
+
+ g_signal_emit_by_name (list, "groups-changed", contact,
+ group_name,
+ FALSE);
+ }
+}
+
static void
tp_contact_list_group_ready_cb (TpChannel *channel,
const GError *error,
EmpathyTpContactListPriv *priv = GET_PRIV (list);
TpChannel *old_group;
const gchar *group_name;
+ const TpIntSet *members;
+ GArray *arr;
if (error) {
DEBUG ("Error: %s", error->message);
g_hash_table_insert (priv->groups, (gpointer) group_name, channel);
DEBUG ("Group %s added", group_name);
+ g_signal_connect (channel, "group-members-changed",
+ G_CALLBACK (tp_contact_list_group_members_changed_cb),
+ list);
+
g_signal_connect (channel, "invalidated",
G_CALLBACK (tp_contact_list_group_invalidated_cb),
list);
g_hash_table_remove (priv->add_to_group, group_name);
}
}
-}
-
-static void
-tp_contact_list_group_members_changed_cb (TpChannel *channel,
- gchar *message,
- GArray *added,
- GArray *removed,
- GArray *local_pending,
- GArray *remote_pending,
- guint actor,
- guint reason,
- EmpathyTpContactList *list)
-{
- EmpathyTpContactListPriv *priv = GET_PRIV (list);
- const gchar *group_name;
- guint i;
-
- group_name = tp_channel_get_identifier (channel);
-
- for (i = 0; i < added->len; i++) {
- EmpathyContact *contact;
- TpHandle handle;
-
- handle = g_array_index (added, TpHandle, i);
- contact = g_hash_table_lookup (priv->members,
- GUINT_TO_POINTER (handle));
- if (contact == NULL) {
- continue;
- }
-
- DEBUG ("Contact %s (%d) added to group %s",
- empathy_contact_get_id (contact), handle, group_name);
- g_signal_emit_by_name (list, "groups-changed", contact,
- group_name,
- TRUE);
- }
-
- for (i = 0; i < removed->len; i++) {
- EmpathyContact *contact;
- TpHandle handle;
-
- handle = g_array_index (removed, TpHandle, i);
- contact = g_hash_table_lookup (priv->members,
- GUINT_TO_POINTER (handle));
- if (contact == NULL) {
- continue;
- }
- DEBUG ("Contact %s (%d) removed from group %s",
- empathy_contact_get_id (contact), handle, group_name);
-
- g_signal_emit_by_name (list, "groups-changed", contact,
- group_name,
- FALSE);
- }
+ /* Get initial members of the group */
+ members = tp_channel_group_get_members (channel);
+ g_assert (members != NULL);
+ arr = tp_intset_to_array (members);
+ contacts_added_to_group (list, channel, arr);
+ g_array_free (arr, TRUE);
}
static void
object_path, channel_type,
handle_type, handle, NULL);
- /* TpChannel emits initial set of members just before being ready */
- g_signal_connect (channel, "group-members-changed",
- G_CALLBACK (tp_contact_list_group_members_changed_cb),
- list);
-
/* Give the ref to the callback */
tp_channel_call_when_ready (channel,
tp_contact_list_group_ready_cb,
G_OBJECT_CLASS (empathy_tp_contact_list_parent_class)->finalize (object);
}
+static gboolean
+received_all_list_channels (EmpathyTpContactList *self)
+{
+ EmpathyTpContactListPriv *priv = GET_PRIV (self);
+
+ return (priv->stored != NULL && priv->publish != NULL &&
+ priv->subscribe != NULL);
+}
+
static void
-list_ensure_channel_cb (TpConnection *conn,
- gboolean yours,
- const gchar *path,
- GHashTable *properties,
- const GError *error,
- gpointer user_data,
- GObject *weak_object)
+got_list_channel (EmpathyTpContactList *list,
+ TpChannel *channel)
{
- EmpathyTpContactList *list = user_data;
EmpathyTpContactListPriv *priv = GET_PRIV (list);
const gchar *id;
- TpChannel *channel;
-
- if (error != NULL) {
- DEBUG ("failed: %s\n", error->message);
- return;
- }
/* We requested that channel by providing TargetID property, so it's
* guaranteed that tp_channel_get_identifier will return it. */
- channel = tp_channel_new_from_properties (conn, path, properties, NULL);
id = tp_channel_get_identifier (channel);
/* TpChannel emits initial set of members just before being ready */
if (!tp_strdiff (id, "stored")) {
- priv->stored = channel;
+ if (priv->stored != NULL)
+ return;
+ priv->stored = g_object_ref (channel);
} else if (!tp_strdiff (id, "publish")) {
- priv->publish = channel;
+ if (priv->publish != NULL)
+ return;
+ priv->publish = g_object_ref (channel);
g_signal_connect (priv->publish, "group-members-changed",
G_CALLBACK (tp_contact_list_publish_group_members_changed_cb),
list);
} else if (!tp_strdiff (id, "subscribe")) {
- priv->subscribe = channel;
+ if (priv->subscribe != NULL)
+ return;
+ priv->subscribe = g_object_ref (channel);
g_signal_connect (priv->subscribe, "group-members-changed",
G_CALLBACK (tp_contact_list_subscribe_group_members_changed_cb),
list);
- } else {
- g_warn_if_reached ();
+ }
+
+ if (received_all_list_channels (list) && priv->new_channels_sig != NULL) {
+ /* We don't need to watch NewChannels anymore */
+ tp_proxy_signal_connection_disconnect (priv->new_channels_sig);
+ priv->new_channels_sig = NULL;
+ }
+}
+
+static void
+list_ensure_channel_cb (TpConnection *conn,
+ gboolean yours,
+ const gchar *path,
+ GHashTable *properties,
+ const GError *error,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ EmpathyTpContactList *list = user_data;
+ TpChannel *channel;
+
+ if (error != NULL) {
+ DEBUG ("failed: %s\n", error->message);
+ return;
+ }
+
+ channel = tp_channel_new_from_properties (conn, path, properties, NULL);
+ got_list_channel (list, channel);
+ g_object_unref (channel);
+}
+
+static void
+new_channels_cb (TpConnection *conn,
+ const GPtrArray *channels,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ EmpathyTpContactList *list = EMPATHY_TP_CONTACT_LIST (weak_object);
+ guint i;
+
+ for (i = 0; i < channels->len ; i++) {
+ GValueArray *arr = g_ptr_array_index (channels, i);
+ const gchar *path;
+ GHashTable *properties;
+ const gchar *id;
+ TpChannel *channel;
+
+ path = g_value_get_boxed (g_value_array_get_nth (arr, 0));
+ properties = g_value_get_boxed (g_value_array_get_nth (arr, 1));
+
+ if (tp_strdiff (tp_asv_get_string (properties,
+ TP_IFACE_CHANNEL ".ChannelType"),
+ TP_IFACE_CHANNEL_TYPE_CONTACT_LIST))
+ return;
+
+ if (tp_asv_get_uint32 (properties,
+ TP_IFACE_CHANNEL ".TargetHandleType", NULL)
+ != TP_HANDLE_TYPE_LIST)
+ return;
+
+ id = tp_asv_get_string (properties,
+ TP_IFACE_CHANNEL ".TargetID");
+ if (id == NULL)
+ return;
+
+ channel = tp_channel_new_from_properties (conn, path,
+ properties, NULL);
+ got_list_channel (list, channel);
g_object_unref (channel);
}
}
TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT, TP_HANDLE_TYPE_LIST,
NULL);
+ /* Watch the NewChannels signal so if ensuring list channels fails (for
+ * example because the server is slow and the D-Bus call timeouts before CM
+ * fetches the roster), we have a chance to get them later. */
+ priv->new_channels_sig =
+ tp_cli_connection_interface_requests_connect_to_new_channels (
+ priv->connection, new_channels_cb, NULL, NULL, G_OBJECT (list), NULL);
+
/* Request the 'stored' list. */
tp_asv_set_static_string (request, TP_IFACE_CHANNEL ".TargetID", "stored");
tp_cli_connection_interface_requests_call_ensure_channel (priv->connection,
tp_contact_list_constructed (GObject *list)
{
EmpathyTpContactListPriv *priv = GET_PRIV (list);
- gchar *protocol_name = NULL;
priv->factory = empathy_tp_contact_factory_dup_singleton (priv->connection);
tp_contact_list_new_channel_cb,
NULL, NULL,
list, NULL);
-
- /* Check for protocols that does not support contact groups. We can
- * put all contacts into a special group in that case.
- * FIXME: Default group should be an information in the profile */
- tp_connection_parse_object_path (priv->connection, &protocol_name, NULL);
- if (!tp_strdiff (protocol_name, "local-xmpp")) {
- priv->protocol_group = _("People nearby");
- }
- g_free (protocol_name);
}
static void
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) {
l->data = g_strdup (l->data);
}
- if (priv->protocol_group) {
- ret = g_list_prepend (ret, g_strdup (priv->protocol_group));
- }
-
return ret;
}
}
}
- if (priv->protocol_group) {
- ret = g_list_prepend (ret, g_strdup (priv->protocol_group));
- }
-
return ret;
}
projects / empathy.git / blobdiff