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_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
got_list_channel (EmpathyTpContactList *list,
TpChannel *channel)
G_CALLBACK (tp_contact_list_subscribe_group_members_changed_cb),
list);
}
+
+ 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
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);
+ }
+}
+
static void
conn_ready_cb (TpConnection *connection,
const GError *error,
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
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;
}