diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-04-25 00:19:50 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-04-25 02:44:09 +0800 |
| commit | a6748d5d5fd1f37cef6bf26a6256cd299a60a09c (patch) | |
| tree | 2c175c69ee287aa947800d27caefe7b7ace84d19 /src | |
| parent | 54ae82bdf32156387e3d720656bd361a859b8db6 (diff) | |
| download | gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar.gz gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar.bz2 gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar.lz gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar.xz gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar.zst gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.zip | |
add timestamp arg to empathy_dispatcher_join_muc
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-manager.c | 3 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 3 | ||||
| -rw-r--r-- | src/empathy-new-chatroom-dialog.c | 3 | ||||
| -rw-r--r-- | src/empathy.c | 6 |
4 files changed, 10 insertions, 5 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 35b23244c..97d210c84 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -199,7 +199,8 @@ 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, EMPATHY_DISPATCHER_NON_USER_ACTION, NULL, NULL); diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 51d0ec9ef..6826ee534 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -908,7 +908,8 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom) if (connection != NULL) { DEBUG ("Requesting channel for '%s'", room); - empathy_dispatcher_join_muc (connection, room, NULL, NULL); + empathy_dispatcher_join_muc (connection, room, + gtk_get_current_event_time (), NULL, NULL); } } diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 7c330b22c..50b5f5d82 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -732,7 +732,8 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog) } DEBUG ("Requesting channel for '%s'", room_name); - empathy_dispatcher_join_muc (connection, room_name, NULL, NULL); + empathy_dispatcher_join_muc (connection, room_name, + gtk_get_current_event_time (), NULL, NULL); g_free (room_name); } diff --git a/src/empathy.c b/src/empathy.c index 637778d47..3f1cc6504 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -481,7 +481,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 +530,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); } } |