add timestamp arg to empathy_dispatcher_join_muc

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 06ee4bbe7658e43bc0151eb5981b1e6196b3f875..57cf626327a58f15f0160d31cd164f1da7cb0a99 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -268,7 +268,7 @@ reconnected_connection_ready_cb (TpConnection *connection,
                        break;
                case TP_HANDLE_TYPE_ROOM:
                        empathy_dispatcher_join_muc (connection,
-                               priv->id,
+                               priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION,
                                chat_connect_channel_reconnected,
                                chat);
                        break;
@@ -743,6 +743,7 @@ chat_command_join (EmpathyChat *chat,
 
                        connection = empathy_tp_chat_get_connection (priv->tp_chat);
                        empathy_dispatcher_join_muc (connection, rooms[i],
+                                                    gtk_get_current_event_time (),
                                                     chat_command_join_cb,
                                                     chat);
                }

diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 40ee5dd88c30fbd2dc7663b61a5d6273cf39e8f5..a8bc25838420fa6cf100c7f5baa62508da683b54 100644 (file)
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -1445,6 +1445,7 @@ dispatcher_request_handles_cb (TpConnection *connection,
 void
 empathy_dispatcher_join_muc (TpConnection *connection,
                              const gchar *roomname,
+                             gint64 timestamp,
                              EmpathyDispatcherRequestCb *callback,
                              gpointer user_data)
 {
@@ -1466,8 +1467,7 @@ empathy_dispatcher_join_muc (TpConnection *connection,
 
   /* Don't know the room handle yet */
   request_data  = new_dispatcher_request_data (self, connection,
-    TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_ROOM, 0, NULL,
-    EMPATHY_DISPATCHER_NON_USER_ACTION,
+    TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_ROOM, 0, NULL, timestamp,
     NULL, callback, user_data);
   request_data->should_ensure = TRUE;
 

diff --git a/libempathy/empathy-dispatcher.h b/libempathy/empathy-dispatcher.h
index b3e9e1dda0df767223d6f301b4cc3465062a8c6c..846fdefeeb0a0e0b4d1218b0b163ff959389b736 100644 (file)
--- a/libempathy/empathy-dispatcher.h
+++ b/libempathy/empathy-dispatcher.h
@@ -89,7 +89,9 @@ void empathy_dispatcher_send_file_to_contact (EmpathyContact *contact,
 
 /* Request a muc channel */
 void empathy_dispatcher_join_muc (TpConnection *connection,
-  const gchar *roomname, EmpathyDispatcherRequestCb *callback,
+  const gchar *roomname,
+  gint64 timestamp,
+  EmpathyDispatcherRequestCb *callback,
   gpointer user_data);
 
 void empathy_dispatcher_find_requestable_channel_classes_async

diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 35b23244c3db9c490b5ccc84f5987d65000df993..97d210c84f5205a0339e2df5459bcd13af3274ec 100644 (file)
--- 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 51d0ec9efd4f665bea97f1fa8f57b65a447678ba..6826ee534eda3720eea38d1682437689adec4c1c 100644 (file)
--- 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 7c330b22c69166f0ba70fd27dc53a8e0c07770f7..50b5f5d82b7ec13c315c32c1c02e2297f046f370 100644 (file)
--- 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 637778d4714e38a84adfbd966cc0828f191ce732..3f1cc650420a8a95dc4b933a7a214cd3cfc7a0a9 100644 (file)
--- 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);
             }
         }