diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-10-08 19:33:15 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-05 14:56:15 +0100 |
| commit | 8198d1ec4a318338d02800cf6d021734e7590daa (patch) | |
| tree | edd4afe6bc3cb0be57ed4b80cdd0d0753d9894ca /src/mcd-connection-service-points.c | |
| parent | edf39cf46747c269dcd1470b92185601fb898f99 (diff) | |
| download | telepathy-mission-control-8198d1ec4a318338d02800cf6d021734e7590daa.tar.gz | |
McdConnection: build up our sets of emergency numbers over time
To facilitate this, use nicer data structures.
Most importantly, this means we don't critical whenever we get more
than one distinct service point, as Jonny noticed while porting to
Telepathy 1.0. It might slightly defeat the intention of the
ServicePointsChanged signal, but in practice the list is probably
never going to shrink, and if it does, it's probably wise to
keep considering its old members to be an emergency number (the effect
that that has is that plugins aren't allowed to influence channel
requests).
Also, don't leak the sets of emergency numbers when finalized.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55773
Reviewed-by: Marco Barisione <marco.barisione@collabora.co.uk>
Diffstat (limited to 'src/mcd-connection-service-points.c')
| -rw-r--r-- | src/mcd-connection-service-points.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mcd-connection-service-points.c b/src/mcd-connection-service-points.c index 0e690056..4ab6dc07 100644 --- a/src/mcd-connection-service-points.c +++ b/src/mcd-connection-service-points.c @@ -83,8 +83,6 @@ parse_services_list (McdConnection *connection, GSList *service; TpConnection *tp_conn = mcd_connection_get_tp_connection (connection); - _mcd_connection_clear_emergency_data (connection); - for (service = e_numbers; service != NULL; service =g_slist_next (service)) { if (service->data != NULL) |