From 449a5c28bab16e6e6c16702170065b52bcdf2344 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 27 Feb 2015 21:40:07 +0100 Subject: [PATCH] route-manager: define singelton using NM_DEFINE_SINGLETON_GETTER() Fixes: 874e4a7595ac11e53e333dcdd0ad988a47391cc9 (cherry picked from commit f3ad60b4347612cf03717d3a283cb05f32d99d15) --- src/nm-route-manager.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c index 7730d2ec3c..a8a38d4658 100644 --- a/src/nm-route-manager.c +++ b/src/nm-route-manager.c @@ -37,8 +37,6 @@ typedef struct { G_DEFINE_TYPE (NMRouteManager, nm_route_manager, G_TYPE_OBJECT) -static NMRouteManager *_instance; - static const NMPlatformIP4Route * array_get_ip4_route (const GArray *routes, int ifindex, const NMPlatformIP4Route *route) { @@ -344,15 +342,7 @@ nm_route_manager_route_flush (NMRouteManager *self, int ifindex) && nm_route_manager_ip6_route_sync (self, ifindex, NULL); } -NMRouteManager * -nm_route_manager_get () -{ - if (G_UNLIKELY (!_instance)) { - _instance = NM_ROUTE_MANAGER (g_object_new (NM_TYPE_ROUTE_MANAGER, NULL)); - g_object_add_weak_pointer (G_OBJECT (_instance), (gpointer *) &_instance); - } - return _instance; -} +NM_DEFINE_SINGLETON_GETTER (NMRouteManager, nm_route_manager_get, NM_TYPE_ROUTE_MANAGER); static void nm_route_manager_init (NMRouteManager *self)