diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-30 21:37:27 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-04-08 18:34:57 +0800 |
| commit | 2a6a15152ede1372f283b87fc9db0c50cec0955e (patch) | |
| tree | d1897a004a253a570f887bd07f5af87073c7704e | |
| parent | 9cf5ae7ff275a02cd8560b252e4d36d16eb20617 (diff) | |
| download | gsoc2013-empathy-2a6a15152ede1372f283b87fc9db0c50cec0955e.tar gsoc2013-empathy-2a6a15152ede1372f283b87fc9db0c50cec0955e.tar.gz gsoc2013-empathy-2a6a15152ede1372f283b87fc9db0c50cec0955e.tar.bz2 gsoc2013-empathy-2a6a15152ede1372f283b87fc9db0c50cec0955e.tar.lz gsoc2013-empathy-2a6a15152ede1372f283b87fc9db0c50cec0955e.tar.xz gsoc2013-empathy-2a6a15152ede1372f283b87fc9db0c50cec0955e.tar.zst gsoc2013-empathy-2a6a15152ede1372f283b87fc9db0c50cec0955e.zip | |
Call EnsureChannel with an 'infinite' timeout so we don't have to catch list channels in NewChannels any more
| -rw-r--r-- | libempathy/empathy-tp-contact-list.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index 645371f74..ef0d53212 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -812,7 +812,6 @@ new_channels_cb (TpConnection *conn, GValueArray *arr = g_ptr_array_index (channels, i); const gchar *path; GHashTable *properties; - TpChannel *channel; TpHandleType handle_type; path = g_value_get_boxed (g_value_array_get_nth (arr, 0)); @@ -829,13 +828,7 @@ new_channels_cb (TpConnection *conn, handle_type = tp_asv_get_uint32 (properties, TP_IFACE_CHANNEL ".TargetHandleType", NULL); - if (handle_type == TP_HANDLE_TYPE_LIST) { - channel = tp_channel_new_from_properties (conn, path, - properties, NULL); - got_list_channel (list, channel); - g_object_unref (channel); - } - else if (handle_type == TP_HANDLE_TYPE_GROUP) { + if (handle_type == TP_HANDLE_TYPE_GROUP) { tp_contact_list_group_add_channel (list, path, properties); } } @@ -912,17 +905,17 @@ conn_ready_cb (TpConnection *connection, /* 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)); + G_MAXINT, 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)); + G_MAXINT, 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)); + G_MAXINT, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list)); g_hash_table_unref (request); out: |