diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-18 23:20:23 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-07 19:00:14 +0800 |
| commit | 7b4c1e7640abf3abc27ce9d3f7b066b14557840e (patch) | |
| tree | c2d7a3891821a90a932471d38de43d124ca3a8c3 /src/empathy.c | |
| parent | cd6ab6adeb836cbda38abc502c39d14aedfef7f1 (diff) | |
| download | gsoc2013-empathy-7b4c1e7640abf3abc27ce9d3f7b066b14557840e.tar gsoc2013-empathy-7b4c1e7640abf3abc27ce9d3f7b066b14557840e.tar.gz gsoc2013-empathy-7b4c1e7640abf3abc27ce9d3f7b066b14557840e.tar.bz2 gsoc2013-empathy-7b4c1e7640abf3abc27ce9d3f7b066b14557840e.tar.lz gsoc2013-empathy-7b4c1e7640abf3abc27ce9d3f7b066b14557840e.tar.xz gsoc2013-empathy-7b4c1e7640abf3abc27ce9d3f7b066b14557840e.tar.zst gsoc2013-empathy-7b4c1e7640abf3abc27ce9d3f7b066b14557840e.zip | |
Join room where we have been invited when handling the channel rather than we we approve it
Diffstat (limited to 'src/empathy.c')
| -rw-r--r-- | src/empathy.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/empathy.c b/src/empathy.c index 5dcf035e3..9d59bba79 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -136,6 +136,13 @@ dispatch_cb (EmpathyDispatcher *dispatcher, empathy_chat_window_present_chat (chat, empathy_dispatch_operation_get_user_action_time (operation)); + if (empathy_tp_chat_is_invited (tp_chat)) + { + /* We have been invited to the room. Add ourself as member as this + * channel has been approved. */ + empathy_tp_chat_join (tp_chat); + } + empathy_dispatch_operation_claim (operation); } else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA) |