aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-dispatcher.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-02-25 00:50:54 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-02-25 00:50:54 +0800
commit065307088d490e8f8bc4c04d3981b047c9fb408f (patch)
treea01e1de5b351baafafb67434f577df8b1b1adc27 /libempathy/empathy-dispatcher.c
parent1e878d27797a90e0602180972f1727caed6c87eb (diff)
downloadgsoc2013-empathy-065307088d490e8f8bc4c04d3981b047c9fb408f.tar
gsoc2013-empathy-065307088d490e8f8bc4c04d3981b047c9fb408f.tar.gz
gsoc2013-empathy-065307088d490e8f8bc4c04d3981b047c9fb408f.tar.bz2
gsoc2013-empathy-065307088d490e8f8bc4c04d3981b047c9fb408f.tar.lz
gsoc2013-empathy-065307088d490e8f8bc4c04d3981b047c9fb408f.tar.xz
gsoc2013-empathy-065307088d490e8f8bc4c04d3981b047c9fb408f.tar.zst
gsoc2013-empathy-065307088d490e8f8bc4c04d3981b047c9fb408f.zip
Not using the weak object anymore, get the dispatcher request data from request data
Diffstat (limited to 'libempathy/empathy-dispatcher.c')
-rw-r--r--libempathy/empathy-dispatcher.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 4227f9df5..8577b6bb7 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -1666,11 +1666,11 @@ dispatcher_create_channel_cb (TpChannelDispatcher *proxy,
gpointer user_data,
GObject *weak_object)
{
- EmpathyDispatcher *self = EMPATHY_DISPATCHER (weak_object);
+ DispatcherRequestData *request_data = (DispatcherRequestData *) user_data;
+ EmpathyDispatcher *self = EMPATHY_DISPATCHER (request_data->dispatcher);
EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
TpChannelRequest *request;
GError *err = NULL;
- DispatcherRequestData *request_data = (DispatcherRequestData *) user_data;
request_data->pending_call = NULL;
@@ -1687,7 +1687,7 @@ dispatcher_create_channel_cb (TpChannelDispatcher *proxy,
dispatcher_channel_request_failed_cb, request_data,
NULL, G_OBJECT (self), &err) == NULL)
{
- dispatcher_request_failed (dispatcher, request_data, err);
+ dispatcher_request_failed (self, request_data, err);
g_error_free (err);
return;
}