diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-10-08 12:47:58 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-10-08 12:48:01 +0100 |
| commit | 827a53e95c75adba77092d5bcf5a6ca901bad533 (patch) | |
| tree | 0e566c0c67e8c713848c4436db26ffba3f509563 | |
| parent | 22520d70f1c6834054be4d66f0fb8de2fafd1def (diff) | |
| parent | c725b70255e0d87079e7cf91d553071403746501 (diff) | |
Merge branch '52-errors-are-missed' into telepathy-mission-control-5.2
Reviewed-by: Alberto Mardegan <alberto.mardegan@nokia.com>
| -rw-r--r-- | src/mcd-channel.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mcd-channel.c b/src/mcd-channel.c index ec2e6d3b..4c8dd322 100644 --- a/src/mcd-channel.c +++ b/src/mcd-channel.c @@ -176,7 +176,9 @@ on_members_changed (TpChannel *proxy, const gchar *message, } if (removed && removed->len > 0 && - (actor == 0 || (actor != self_handle && actor != conn_self_handle))) + (actor == 0 || + reason == TP_CHANNEL_GROUP_CHANGE_REASON_ERROR || + (actor != self_handle && actor != conn_self_handle))) { for (i = 0; i < removed->len; i++) { |