diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-01-05 19:32:36 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-01-12 12:10:03 +0100 |
| commit | e2739cfc1b635363bf442be84a45b333afde81b1 (patch) | |
| tree | 36cc98ea17d9288b17edefe4549d9f6da3f3a1ce | |
| parent | fc575d678302e079ce6122697e4d7c8824335fe5 (diff) | |
| download | NetworkManager-e2739cfc1b635363bf442be84a45b333afde81b1.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 34105ae9b0..f3c508180a 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4824,7 +4824,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) |