Attachment 123879 Details for Bug 95350 – lib: Remove hidden singleton instance

[patch] lib: Remove hidden singleton instance

0003-lib-Remove-hidden-singleton-instance.patch (text/plain), 1.56 KB, created by Martin Pitt on 2016-05-18 13:00:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Pitt

Created: 2016-05-18 13:00:48 UTC

Size: 1.56 KB

patch

obsolete

>From 29c5c85f6bf2a163c8713641dba634910ee3cf49 Mon Sep 17 00:00:00 2001
>From: Martin Pitt <martin.pitt@ubuntu.com>
>Date: Wed, 18 May 2016 10:12:25 +0200
>Subject: [PATCH 3/3] lib: Remove hidden singleton instance
>
>GObject _new constructors should always return a new pointer and not do
>anything else than g_{object,initable}_new(). Drop the internal
>up_client_object singleton instance.
>
>This simplifies the code and makes the code robust with multiple threads.
>
>Side issue in https://bugs.freedesktop.org/show_bug.cgi?id=95350
>---
> libupower-glib/up-client.c | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
>diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c
>index adc0b9b..330c0ad 100644
>--- a/libupower-glib/up-client.c
>+++ b/libupower-glib/up-client.c
>@@ -72,7 +72,6 @@ enum {
> };
> 
> static guint signals [UP_CLIENT_LAST_SIGNAL] = { 0 };
>-static gpointer up_client_object = NULL;
> 
> G_DEFINE_TYPE_WITH_CODE (UpClient, up_client, G_TYPE_OBJECT,
>                          G_IMPLEMENT_INTERFACE(G_TYPE_INITABLE, up_client_initable_iface_init))
>@@ -511,14 +510,7 @@ up_client_finalize (GObject *object)
> UpClient *
> up_client_new_full (GCancellable *cancellable, GError **error)
> {
>-	if (up_client_object != NULL) {
>-		g_object_ref (up_client_object);
>-	} else {
>-		up_client_object = g_initable_new (UP_TYPE_CLIENT, cancellable, error, NULL);
>-		if (up_client_object)
>-			g_object_add_weak_pointer (up_client_object, &up_client_object);
>-	}
>-	return UP_CLIENT (up_client_object);
>+	return g_initable_new (UP_TYPE_CLIENT, cancellable, error, NULL);
> }
> 
> /**
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 95350: 123831 | 123832 | 123866 | 123867 | 123872 | 123878 | 123879

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.