diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-09 19:52:05 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-09 19:52:05 +0800 |
| commit | 03635afd3d842f27d1e64d9e056b0a810b38f0e2 (patch) | |
| tree | 2ecf0d3c6245dc0b0eeaa0c092021d2ccd1994b9 /src | |
| parent | f5d81f3c9dd74a9c53fcbe53375acf99e9387f79 (diff) | |
| parent | 5b580ca6e7e87b15f829a621cf60556f1ce4942e (diff) | |
| download | gsoc2013-empathy-03635afd3d842f27d1e64d9e056b0a810b38f0e2.tar gsoc2013-empathy-03635afd3d842f27d1e64d9e056b0a810b38f0e2.tar.gz gsoc2013-empathy-03635afd3d842f27d1e64d9e056b0a810b38f0e2.tar.bz2 gsoc2013-empathy-03635afd3d842f27d1e64d9e056b0a810b38f0e2.tar.lz gsoc2013-empathy-03635afd3d842f27d1e64d9e056b0a810b38f0e2.tar.xz gsoc2013-empathy-03635afd3d842f27d1e64d9e056b0a810b38f0e2.tar.zst gsoc2013-empathy-03635afd3d842f27d1e64d9e056b0a810b38f0e2.zip | |
Merge branch 'auto-approve'
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-event-manager.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 00f958304..35d71f943 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -888,6 +888,7 @@ approve_channels (TpSimpleApprover *approver, /* We are not invited, approve the channel right now */ tp_add_dispatch_operation_context_accept (context); + approval->auto_approved = TRUE; event_manager_approval_approve (approval); return; } |