[gnome-online-accounts] telepathy: Remove the unused GCancellable
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts] telepathy: Remove the unused GCancellable
- Date: Tue, 7 Jun 2016 15:05:49 +0000 (UTC)
commit 6ecc29f79aa3849652d9eba5f2452db6ed581b0d
Author: Debarshi Ray <debarshir gnome org>
Date: Fri Jun 3 19:44:45 2016 +0200
telepathy: Remove the unused GCancellable
https://bugzilla.gnome.org/show_bug.cgi?id=767299
src/goabackend/goatelepathyprovider.c | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/src/goabackend/goatelepathyprovider.c b/src/goabackend/goatelepathyprovider.c
index 19d2896..a5f0c97 100644
--- a/src/goabackend/goatelepathyprovider.c
+++ b/src/goabackend/goatelepathyprovider.c
@@ -270,7 +270,6 @@ get_provider_features (GoaProvider *provider)
typedef struct
{
GMainLoop *loop;
- GCancellable *cancellable;
GoaObject *ret;
GError *error;
@@ -401,7 +400,6 @@ add_account (GoaProvider *provider,
}
memset (&data, 0, sizeof (AddAccountData));
- data.cancellable = g_cancellable_new ();
data.loop = g_main_loop_new (NULL, FALSE);
data.error = NULL;
data.provider = GOA_TELEPATHY_PROVIDER (provider);
@@ -445,7 +443,7 @@ add_account (GoaProvider *provider,
goto out;
}
- if (data.ret == NULL && !g_cancellable_is_cancelled (data.cancellable))
+ if (data.ret == NULL)
{
/* We wait for the account to be created */
g_main_loop_run (data.loop);
@@ -457,12 +455,6 @@ out:
else
g_assert (data.ret != NULL);
- if (data.cancellable != NULL)
- {
- g_cancellable_cancel (data.cancellable);
- g_object_unref (data.cancellable);
- }
-
if (data.goa_account_added_id)
g_signal_handler_disconnect (data.goa_client, data.goa_account_added_id);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]