diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-04 20:20:15 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-04 20:20:15 +0800 |
| commit | bb4750da5ff85a61e8e9d4643fc63fbefe34a1c0 (patch) | |
| tree | 5104009c41478f4672ad3deab29c03b50e54df3b /src/empathy-chat-manager.c | |
| parent | 046792f3fd596574132fe1d6217dd1877bffe743 (diff) | |
| parent | 61de8fbbea5d8d096aafcaa8c2b8093d0f349c87 (diff) | |
| download | gsoc2013-empathy-bb4750da5ff85a61e8e9d4643fc63fbefe34a1c0.tar gsoc2013-empathy-bb4750da5ff85a61e8e9d4643fc63fbefe34a1c0.tar.gz gsoc2013-empathy-bb4750da5ff85a61e8e9d4643fc63fbefe34a1c0.tar.bz2 gsoc2013-empathy-bb4750da5ff85a61e8e9d4643fc63fbefe34a1c0.tar.lz gsoc2013-empathy-bb4750da5ff85a61e8e9d4643fc63fbefe34a1c0.tar.xz gsoc2013-empathy-bb4750da5ff85a61e8e9d4643fc63fbefe34a1c0.tar.zst gsoc2013-empathy-bb4750da5ff85a61e8e9d4643fc63fbefe34a1c0.zip | |
Merge branch 'timestamp-615976'
Diffstat (limited to 'src/empathy-chat-manager.c')
| -rw-r--r-- | src/empathy-chat-manager.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 01506f52e..97d210c84 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -199,10 +199,11 @@ connection_ready_cb (TpConnection *connection, if (error == NULL) { if (data->room) - empathy_dispatcher_join_muc (connection, data->id, NULL, NULL); + empathy_dispatcher_join_muc (connection, data->id, + EMPATHY_DISPATCHER_NON_USER_ACTION, NULL, NULL); else empathy_dispatcher_chat_with_contact_id (connection, data->id, - NULL, NULL); + EMPATHY_DISPATCHER_NON_USER_ACTION, NULL, NULL); g_signal_emit (self, signals[CHATS_CHANGED], 0, g_queue_get_length (priv->queue)); |