diff options
author | Thomas Haller <thaller@redhat.com> | 2015-01-05 19:32:36 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2015-01-08 15:46:21 +0100 |
commit | 1d420c4bd296bad04bfa2465c70c65f665699b43 (patch) | |
tree | f1856f360877f1978799e0f2634c038768a6daa7 | |
parent | 7de3e176caa03c0f2099cd10361583f7fb70cb49 (diff) | |
download | NetworkManager-1d420c4bd296bad04bfa2465c70c65f665699b43.tar.gz |
core: declare nm_vpn_manager_get() using NM_DEFINE_SINGLETON_GETTER()
-rw-r--r-- | src/main.c | 5 | ||||
-rw-r--r-- | src/nm-manager.c | 2 | ||||
-rw-r--r-- | src/vpn-manager/nm-vpn-manager.c | 14 |
3 files changed, 2 insertions, 19 deletions
diff --git a/src/main.c b/src/main.c index ba1de09a7b..2754e73c17 100644 --- a/src/main.c +++ b/src/main.c @@ -50,7 +50,6 @@ #include "nm-supplicant-manager.h" #include "nm-dhcp-manager.h" #include "nm-firewall-manager.h" -#include "nm-vpn-manager.h" #include "nm-logging.h" #include "nm-config.h" #include "nm-posix-signals.h" @@ -202,7 +201,6 @@ main (int argc, char *argv[]) gboolean wifi_enabled = TRUE, net_enabled = TRUE, wwan_enabled = TRUE, wimax_enabled = TRUE; gboolean success, show_version = FALSE; NMManager *manager = NULL; - gs_unref_object NMVpnManager *vpn_manager = NULL; gs_unref_object NMDBusManager *dbus_mgr = NULL; gs_unref_object NMSupplicantManager *sup_mgr = NULL; gs_unref_object NMFirewallManager *fw_mgr = NULL; @@ -396,9 +394,6 @@ main (int argc, char *argv[]) dbus_mgr = nm_dbus_manager_get (); g_assert (dbus_mgr != NULL); - vpn_manager = nm_vpn_manager_get (); - g_assert (vpn_manager != NULL); - nm_dispatcher_init (); settings = nm_settings_new (&error); diff --git a/src/nm-manager.c b/src/nm-manager.c index 5fe1834dd7..9b9db4f217 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4809,7 +4809,7 @@ nm_manager_init (NMManager *manager) G_CALLBACK (dbus_connection_changed_cb), manager); - priv->vpn_manager = nm_vpn_manager_get (); + priv->vpn_manager = g_object_ref (nm_vpn_manager_get ()); g_connection = nm_dbus_manager_get_connection (priv->dbus_mgr); diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 1f3798c7fc..1de9b753f3 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -200,19 +200,7 @@ vpn_dir_changed (GFileMonitor *monitor, /******************************************************************************/ -NMVpnManager * -nm_vpn_manager_get (void) -{ - static NMVpnManager *singleton = NULL; - - if (!singleton) - singleton = NM_VPN_MANAGER (g_object_new (NM_TYPE_VPN_MANAGER, NULL)); - else - g_object_ref (singleton); - - g_assert (singleton); - return singleton; -} +NM_DEFINE_SINGLETON_GETTER (NMVpnManager, nm_vpn_manager_get, NM_TYPE_VPN_MANAGER); static void nm_vpn_manager_init (NMVpnManager *self) |