[empathy] Approve right away group text channels if we are not invited
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Approve right away group text channels if we are not invited
- Date: Thu, 24 Jun 2010 11:44:44 +0000 (UTC)
commit 5c7c725365a5892334f3e90083e59096d311fae7
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Thu Jun 24 13:40:26 2010 +0200
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.
src/empathy-event-manager.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 9dabb54..6e45261 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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]