aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-dispatcher.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-06 22:18:39 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-07 16:03:00 +0800
commit26110eb9baef0ef58e8daebff9c3373485da3e50 (patch)
tree19b1bde418cb00b3d73c02a5f792fe06224861d8 /libempathy/empathy-dispatcher.c
parent817f3db6bb903c509b55a194425a1ccb350192fa (diff)
downloadgsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar
gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar.gz
gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar.bz2
gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar.lz
gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar.xz
gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar.zst
gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.zip
empathy_dispatcher_join_muc: remove callback arg
We always want to let the text handler handle the channel.
Diffstat (limited to 'libempathy/empathy-dispatcher.c')
-rw-r--r--libempathy/empathy-dispatcher.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 778d3be62..82ae343c1 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -1360,9 +1360,7 @@ dispatcher_request_handles_cb (TpConnection *connection,
void
empathy_dispatcher_join_muc (TpConnection *connection,
const gchar *roomname,
- gint64 timestamp,
- EmpathyDispatcherRequestCb *callback,
- gpointer user_data)
+ gint64 timestamp)
{
EmpathyDispatcher *self;
EmpathyDispatcherPriv *priv;
@@ -1383,7 +1381,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, timestamp,
- NULL, callback, user_data);
+ NULL, NULL, NULL);
request_data->should_ensure = TRUE;
connection_data->outstanding_requests = g_list_prepend