diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-01-06 11:45:14 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-01-12 12:10:03 +0100 |
| commit | 22409e0481dcaf5a288ad73553cbef5e2da05207 (patch) | |
| tree | 5974f31f86bdfd750f03740985b65660824f1a4b | |
| parent | f4bf50bf4a19797df6db4f91813ea06fce9fbc02 (diff) | |
| download | NetworkManager-22409e0481dcaf5a288ad73553cbef5e2da05207.tar.gz | |
core: declare nm_firewall_manager_get() using NM_DEFINE_SINGLETON_GETTER()
| -rw-r--r-- | src/main.c | 6 | ||||
| -rw-r--r-- | src/nm-firewall-manager.c | 13 |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/main.c b/src/main.c index 2754e73c17..5a2934bd7b 100644 --- a/src/main.c +++ b/src/main.c @@ -49,7 +49,6 @@ #include "nm-dbus-manager.h" #include "nm-supplicant-manager.h" #include "nm-dhcp-manager.h" -#include "nm-firewall-manager.h" #include "nm-logging.h" #include "nm-config.h" #include "nm-posix-signals.h" @@ -203,7 +202,6 @@ main (int argc, char *argv[]) NMManager *manager = NULL; gs_unref_object NMDBusManager *dbus_mgr = NULL; gs_unref_object NMSupplicantManager *sup_mgr = NULL; - gs_unref_object NMFirewallManager *fw_mgr = NULL; gs_unref_object NMSettings *settings = NULL; gs_unref_object NMConfig *config = NULL; GError *error = NULL; @@ -420,10 +418,6 @@ main (int argc, char *argv[]) sup_mgr = nm_supplicant_manager_get (); g_assert (sup_mgr != NULL); - /* Initialize Firewall manager */ - fw_mgr = nm_firewall_manager_get (); - g_assert (fw_mgr != NULL); - if (!nm_dbus_manager_get_connection (dbus_mgr)) { #if HAVE_DBUS_GLIB_100 nm_log_warn (LOGD_CORE, "Failed to connect to D-Bus; only private bus is available"); diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 59520b3b44..4d302e9d2f 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) |