aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-24 19:40:26 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-24 19:42:20 +0800
commit5c7c725365a5892334f3e90083e59096d311fae7 (patch)
tree1810a128d32c26e0bef1eee9a38fa81e1b0ff46b /src
parent1371d08976f21ed34079aad293adbe827127cae8 (diff)
downloadgsoc2013-empathy-5c7c725365a5892334f3e90083e59096d311fae7.tar
gsoc2013-empathy-5c7c725365a5892334f3e90083e59096d311fae7.tar.gz
gsoc2013-empathy-5c7c725365a5892334f3e90083e59096d311fae7.tar.bz2
gsoc2013-empathy-5c7c725365a5892334f3e90083e59096d311fae7.tar.lz
gsoc2013-empathy-5c7c725365a5892334f3e90083e59096d311fae7.tar.xz
gsoc2013-empathy-5c7c725365a5892334f3e90083e59096d311fae7.tar.zst
gsoc2013-empathy-5c7c725365a5892334f3e90083e59096d311fae7.zip
Approve right away group text channels if we are not invited
If we have not been invited, that means the channel is spawned by the CM (when using IRC proxy for example) so we want to display it right away.
Diffstat (limited to 'src')
-rw-r--r--src/empathy-event-manager.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 9dabb5407..6e4526189 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -832,7 +832,11 @@ approve_channels (TpSimpleApprover *approver,
goto out;
}
- /* if we are not invited, let's wait for the first message */
+ /* We are not invited, approve the channel right now */
+ tp_add_dispatch_operation_context_accept (context);
+
+ event_manager_approval_approve (approval);
+ return;
}
/* 1-1 text channel, wait for the first message */