diff options
author | Will Thompson <will.thompson@collabora.co.uk> | 2011-06-27 18:03:36 +0100 |
---|---|---|
committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-06-27 18:03:36 +0100 |
commit | 901577fd23a6e7f7e639be6c8d8b086a3531a091 (patch) | |
tree | 4d6081cd2a49030492a564e3719796f332cf1bdd /src/conn-olpc.c | |
parent | 0f00b08488ef0459fdb6d8f85d55b049d4dc0245 (diff) | |
download | telepathy-gabble-901577fd23a6e7f7e639be6c8d8b086a3531a091.tar.gz |
Remove TpBaseConnection.connected callback.
This OLPC-specific function can just be called from the ::status-changed
signal handler. I've called it at the end of that function because the
'connected' vfunc is called just after ::status-changed is emitted, so
this shouldn't change the order of operations in the OLPC code.
Fixes: <https://bugs.freedesktop.org/show_bug.cgi?id=12041>
Diffstat (limited to 'src/conn-olpc.c')
-rw-r--r-- | src/conn-olpc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/conn-olpc.c b/src/conn-olpc.c index 655a5cc9f..cac0413a2 100644 --- a/src/conn-olpc.c +++ b/src/conn-olpc.c @@ -409,7 +409,7 @@ invitees_quark (void) return q; } -void +static void gabble_connection_connected_olpc (GabbleConnection *conn) { GHashTable *preload = g_object_steal_qdata ((GObject *) conn, @@ -2203,6 +2203,8 @@ connection_status_changed_cb (GabbleConnection *conn, DEBUG ("Failed to send PEP activity props reset in response to " "initial connection"); } + + gabble_connection_connected_olpc (conn); } } |