Attachment 36764 Details for Bug 28920 – Connect cancellable earlier in tp_contact_request_contact_info_async()

[patch] Connect cancellable earlier in tp_contact_request_contact_info_async()

0001-Connect-cancellable-earlier-in-tp_contact_request_co.patch (text/plain), 1.47 KB, created by Philip Withnall on 2010-07-05 09:30:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip Withnall

Created: 2010-07-05 09:30:48 UTC

Size: 1.47 KB

patch

obsolete

>From e3183d467aa1c5905ae62b92da60788c47c4964c Mon Sep 17 00:00:00 2001
>From: Philip Withnall <philip.withnall@collabora.co.uk>
>Date: Mon, 5 Jul 2010 17:11:34 +0100
>Subject: [PATCH] Connect cancellable earlier in tp_contact_request_contact_info_async()
>
>---
> telepathy-glib/contact.c |   11 +++++------
> 1 files changed, 5 insertions(+), 6 deletions(-)
>
>diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
>index 1622a81..ad5ef02 100644
>--- a/telepathy-glib/contact.c
>+++ b/telepathy-glib/contact.c
>@@ -2637,12 +2637,6 @@ tp_contact_request_contact_info_async (TpContact *self,
>   data->result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_contact_request_contact_info_finish);
> 
>-  data->call = tp_cli_connection_interface_contact_info_call_request_contact_info (
>-      self->priv->connection, 60*60*1000, self->priv->handle,
>-      contact_info_request_cb,
>-      data, (GDestroyNotify) contact_info_request_data_free,
>-      NULL);
>-
>   if (cancellable != NULL)
>     {
>       data->cancellable = g_object_ref (cancellable);
>@@ -2650,6 +2644,11 @@ tp_contact_request_contact_info_async (TpContact *self,
>           G_CALLBACK (contact_info_request_cancelled_cb), data, NULL);
>     }
> 
>+  data->call = tp_cli_connection_interface_contact_info_call_request_contact_info (
>+      self->priv->connection, 60*60*1000, self->priv->handle,
>+      contact_info_request_cb,
>+      data, (GDestroyNotify) contact_info_request_data_free,
>+      NULL);
> }
> 
> /**
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 28920: 36764 | 36783 | 36784

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.