fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-31 00:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: use NM_DEFINE_SINGLETON_GETTER() macro

Browse source 
(cherry picked from commit eecc440351)
This commit is contained in:
Thomas Haller 2015-01-05 19:27:07 +01:00
parent 3f2d861614
commit be851ba0b2
2 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/dhcp-manager/nm-dhcp-listener.c
View file

@ -194,16 +194,7 @@ dis_connection_cb (NMDBusManager *mgr,
/***************************************************/
NMDhcpListener *
nm_dhcp_listener_get (void)
{
static NMDhcpListener *singleton = NULL;
if (G_UNLIKELY (singleton == NULL))
singleton = g_object_new (NM_TYPE_DHCP_LISTENER, NULL);
g_assert (singleton);
return singleton;
}
NM_DEFINE_SINGLETON_GETTER (NMDhcpListener, nm_dhcp_listener_get, NM_TYPE_DHCP_LISTENER);
static void
nm_dhcp_listener_init (NMDhcpListener *self)

14
src/nm-default-route-manager.c
View file

@ -60,7 +60,7 @@ typedef struct {
G_DEFINE_TYPE (NMDefaultRouteManager, nm_default_route_manager, G_TYPE_OBJECT)
static NMDefaultRouteManager *singleton_instance;
NM_DEFINE_SINGLETON_GETTER (NMDefaultRouteManager, nm_default_route_manager_get, NM_TYPE_DEFAULT_ROUTE_MANAGER);
#define _LOG(level, addr_family, ...) \
G_STMT_START { \
@ -1173,18 +1173,6 @@ static const VTableIP vtable_ip6 = {
/***********************************************************************************/
NMDefaultRouteManager *
nm_default_route_manager_get ()
{
if (G_UNLIKELY (!singleton_instance)) {
singleton_instance = NM_DEFAULT_ROUTE_MANAGER (g_object_new (NM_TYPE_DEFAULT_ROUTE_MANAGER, NULL));
g_object_add_weak_pointer (G_OBJECT (singleton_instance), (gpointer *) &singleton_instance);
}
return singleton_instance;
}
/***********************************************************************************/
static gboolean
_resync_idle_now (NMDefaultRouteManager *self)
{