diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-01-05 19:32:36 +0100 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-12-01 13:10:28 +0100 |
| commit | 6cb1cea4c1b4ca40c5a0ea32774ee1027e53032b (patch) | |
| tree | b2b4f28f45b296a2b2970a6eb1928060513412a4 | |
| parent | 4ab08c3e450ea86de90b26e8dbca31a5a3526110 (diff) | |
| download | NetworkManager-6cb1cea4c1b4ca40c5a0ea32774ee1027e53032b.tar.gz | |
core: declare nm_vpn_manager_get() using NM_DEFINE_SINGLETON_GETTER()
(cherry picked from commit e2739cfc1b635363bf442be84a45b333afde81b1)
| -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 c01d33f4d4..b13c608133 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-session-monitor.h" @@ -292,7 +291,6 @@ main (int argc, char *argv[]) gboolean wifi_enabled = TRUE, net_enabled = TRUE, wwan_enabled = TRUE, wimax_enabled = TRUE; gboolean success = FALSE; NMManager *manager = NULL; - gs_unref_object NMVpnManager *vpn_manager = NULL; gs_unref_object NMSupplicantManager *sup_mgr = NULL; gs_unref_object NMFirewallManager *fw_mgr = NULL; gs_unref_object NMSettings *settings = NULL; @@ -480,9 +478,6 @@ main (int argc, char *argv[]) nm_auth_manager_setup (nm_config_get_auth_polkit (config)); - 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 a0254f8c09..a1e4fb4f17 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4880,7 +4880,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) |