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.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.c')
| -rw-r--r-- | src/empathy.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/empathy.c b/src/empathy.c index 637778d47..5dcf035e3 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -133,7 +133,8 @@ dispatch_cb (EmpathyDispatcher *dispatcher, * (a GtkNotebook) when we'll call empathy_chat_window_present_chat */ } - empathy_chat_window_present_chat (chat); + empathy_chat_window_present_chat (chat, + empathy_dispatch_operation_get_user_action_time (operation)); empathy_dispatch_operation_claim (operation); } @@ -481,7 +482,8 @@ account_status_changed_cb (TpAccount *account, return; empathy_dispatcher_join_muc (conn, - empathy_chatroom_get_room (room), NULL, NULL); + empathy_chatroom_get_room (room), EMPATHY_DISPATCHER_NON_USER_ACTION, + NULL, NULL); } static void @@ -529,7 +531,8 @@ account_manager_chatroom_ready_cb (GObject *source_object, else { empathy_dispatcher_join_muc (conn, - empathy_chatroom_get_room (room), NULL, NULL); + empathy_chatroom_get_room (room), + EMPATHY_DISPATCHER_NON_USER_ACTION, NULL, NULL); } } |