diff options
| author | Michael Biebl <biebl@debian.org> | 2015-12-24 00:25:15 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-12-24 00:25:15 +0100 |
| commit | 95fc418c29eaf71c43ee0dddc4515580b9ec1461 (patch) | |
| tree | c785190da048e63173bd573d7e8c565f3d28488d /src/supplicant-manager | |
| parent | 46654959ce8acc3b92a92e931920365c3b2dab0d (diff) | |
| parent | 54f6333410ffd570e62717d9e77c5c987175e397 (diff) | |
Merge tag 'upstream/1.0.10'
Upstream version 1.0.10
Diffstat (limited to 'src/supplicant-manager')
| -rw-r--r-- | src/supplicant-manager/nm-supplicant-manager.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c index 6358c180..083f2ebc 100644 --- a/src/supplicant-manager/nm-supplicant-manager.c +++ b/src/supplicant-manager/nm-supplicant-manager.c @@ -318,19 +318,7 @@ on_proxy_acquired (GObject *object, GAsyncResult *result, gpointer user_data) /*******************************************************************/ -NMSupplicantManager * -nm_supplicant_manager_get (void) -{ - static NMSupplicantManager *singleton = NULL; - - if (!singleton) - singleton = NM_SUPPLICANT_MANAGER (g_object_new (NM_TYPE_SUPPLICANT_MANAGER, NULL)); - else - g_object_ref (singleton); - - g_assert (singleton); - return singleton; -} +NM_DEFINE_SINGLETON_GETTER (NMSupplicantManager, nm_supplicant_manager_get, NM_TYPE_SUPPLICANT_MANAGER); static void nm_supplicant_manager_init (NMSupplicantManager *self) |