diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-27 18:08:57 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-28 16:29:18 +0100 |
| commit | 7ffc20512ac6a81e9465622ec692a622bf7ebf8d (patch) | |
| tree | 8902a2e38a717feebae9b05b492fb985a23bc142 | |
| parent | 9da0c6c713c9cba1ddef33d599888fce16b79482 (diff) | |
Master: Always bind connection to a transport
Previously, when a connection was brought online in response to
an event other than a transport becoming connected, it would always be
bound to a transport (if any transport plugins are loaded, obviously),
regardless of whether the dictionary o' conditions was empty or not.
However, when a transport coming online caused a connection to be
brought up, that connection would not be bound to the transport that
caused it to come online if the conditions were empty (which they
generally are).
For reasons I can't quite fathom, this actually doesn't seem to have
affected anything: it could be because monitor_state_changed_cb in
McdKludgeTransport also binds waiting connections to the transport that
came online. But this seems like a sensible change for sanity and
consistency reasons.
| -rw-r--r-- | src/mcd-master.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mcd-master.c b/src/mcd-master.c index 5ea3384e..06bb60ce 100644 --- a/src/mcd-master.c +++ b/src/mcd-master.c @@ -156,8 +156,7 @@ mcd_master_transport_connected (McdMaster *master, McdTransportPlugin *plugin, { DEBUG ("conditions matched"); _mcd_account_connect_with_auto_presence (account, FALSE); - if (g_hash_table_size (conditions) > 0) - mcd_account_connection_bind_transport (account, transport); + mcd_account_connection_bind_transport (account, transport); } g_hash_table_unref (conditions); } |