[empathy: 14/15] Not using the weak object anymore, get the dispatcher request data from request data
- From: Sjoerd Simons <sjoerds src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 14/15] Not using the weak object anymore, get the dispatcher request data from request data
- Date: Wed, 24 Feb 2010 20:17:53 +0000 (UTC)
commit 065307088d490e8f8bc4c04d3981b047c9fb408f
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date: Wed Feb 24 16:50:54 2010 +0000
Not using the weak object anymore, get the dispatcher request data from request data
libempathy/empathy-dispatcher.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 4227f9d..8577b6b 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]