fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-10 08:10:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: declare nm_vpn_manager_get() using NM_DEFINE_SINGLETON_GETTER()

Browse source 
(cherry picked from commit e2739cfc1b)
This commit is contained in:
Thomas Haller 2015-01-05 19:32:36 +01:00 • committed by Jiří Klimeš
parent 4ab08c3e45
commit 6cb1cea4c1
3 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main.c
View file

@ -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);

2
src/nm-manager.c
View file

@ -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);

14
src/vpn-manager/nm-vpn-manager.c
View file

@ -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)