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/nm-firewall-manager.c | |
| parent | 46654959ce8acc3b92a92e931920365c3b2dab0d (diff) | |
| parent | 54f6333410ffd570e62717d9e77c5c987175e397 (diff) | |
Merge tag 'upstream/1.0.10'
Upstream version 1.0.10
Diffstat (limited to 'src/nm-firewall-manager.c')
| -rw-r--r-- | src/nm-firewall-manager.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 59520b3b..4d302e9d 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -337,18 +337,7 @@ name_owner_changed (NMDBusManager *dbus_mgr, /*******************************************************************/ -NMFirewallManager * -nm_firewall_manager_get (void) -{ - static NMFirewallManager *singleton = NULL; - - if (G_UNLIKELY (!singleton)) { - singleton = NM_FIREWALL_MANAGER (g_object_new (NM_TYPE_FIREWALL_MANAGER, NULL)); - g_assert (singleton); - } - - return singleton; -} +NM_DEFINE_SINGLETON_GETTER (NMFirewallManager, nm_firewall_manager_get, NM_TYPE_FIREWALL_MANAGER); static void nm_firewall_manager_init (NMFirewallManager * self) |