- /* Try to request the 'stored' list. */
- request = g_hash_table_new_full (g_str_hash, g_str_equal,
- NULL, (GDestroyNotify) tp_g_value_slice_free);
-
- /* org.freedesktop.Telepathy.Channel.ChannelType */
- value = tp_g_value_slice_new_string (TP_IFACE_CHANNEL_TYPE_CONTACT_LIST);
- g_hash_table_insert (request, TP_IFACE_CHANNEL ".ChannelType", value);
-
- /* org.freedesktop.Telepathy.Channel.TargetHandleType */
- value = tp_g_value_slice_new_uint (TP_HANDLE_TYPE_LIST);
- g_hash_table_insert (request, TP_IFACE_CHANNEL ".TargetHandleType", value);
-
- /* org.freedesktop.Telepathy.Channel.TargetID */
- value = tp_g_value_slice_new_string ("stored");
- g_hash_table_insert (request, TP_IFACE_CHANNEL ".TargetID", value);
-
- tp_cli_connection_interface_requests_call_create_channel (priv->connection,
- -1, request, store_create_channel_cb, list, NULL, G_OBJECT (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,
+ 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,
+ -1, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));
+
+ /* Request the 'publish' list. */
+ tp_asv_set_static_string (request, TP_IFACE_CHANNEL ".TargetID", "publish");
+ tp_cli_connection_interface_requests_call_ensure_channel (priv->connection,
+ -1, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));
+
+ /* Request the 'subscribe' list. */
+ tp_asv_set_static_string (request, TP_IFACE_CHANNEL ".TargetID", "subscribe");
+ tp_cli_connection_interface_requests_call_ensure_channel (priv->connection,
+ -1, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));