aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-30 20:35:38 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-04-08 18:34:57 +0800
commit08a935de1ab0f4f63b8d2c7704d1ebf98b228a65 (patch)
tree7ffe9fa24feca50c8c6efab2ade54941b5ed1c26
parentd94b3a1b1ee4359882f0773f7e9c379ca05bd362 (diff)
downloadgsoc2013-empathy-08a935de1ab0f4f63b8d2c7704d1ebf98b228a65.tar
gsoc2013-empathy-08a935de1ab0f4f63b8d2c7704d1ebf98b228a65.tar.gz
gsoc2013-empathy-08a935de1ab0f4f63b8d2c7704d1ebf98b228a65.tar.bz2
gsoc2013-empathy-08a935de1ab0f4f63b8d2c7704d1ebf98b228a65.tar.lz
gsoc2013-empathy-08a935de1ab0f4f63b8d2c7704d1ebf98b228a65.tar.xz
gsoc2013-empathy-08a935de1ab0f4f63b8d2c7704d1ebf98b228a65.tar.zst
gsoc2013-empathy-08a935de1ab0f4f63b8d2c7704d1ebf98b228a65.zip
tp-contact-list: stop disconnecting NewChannels
We are going to use it to get group channels as well.
-rw-r--r--libempathy/empathy-tp-contact-list.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index c49033c94..39892132b 100644
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -70,8 +70,6 @@ typedef struct {
GHashTable *add_to_group;
EmpathyContactListFlags flags;
-
- TpProxySignalConnection *new_channels_sig;
} EmpathyTpContactListPriv;
typedef enum {
@@ -794,15 +792,6 @@ tp_contact_list_finalize (GObject *object)
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)
@@ -837,12 +826,6 @@ got_list_channel (EmpathyTpContactList *list,
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
@@ -930,8 +913,7 @@ conn_ready_cb (TpConnection *connection,
/* 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 (
+ tp_cli_connection_interface_requests_connect_to_new_channels (
priv->connection, new_channels_cb, NULL, NULL, G_OBJECT (list), NULL);
/* Request the 'stored' list. */