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 /libempathy | |
| 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 'libempathy')
| -rw-r--r-- | libempathy/empathy-dispatcher.c | 4 | ||||
| -rw-r--r-- | libempathy/empathy-dispatcher.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index 40ee5dd88..a8bc25838 100644 --- 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 b3e9e1dda..846fdefee 100644 --- 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 |