diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-02-27 21:40:07 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-02-27 21:40:44 +0100 |
| commit | f3ad60b4347612cf03717d3a283cb05f32d99d15 (patch) | |
| tree | 52a1704d0ae2afec2c4c0bd4101f43dddc23d7fe | |
| parent | ea0d0b3086bde66f66647e251ba34575377c1073 (diff) | |
| download | NetworkManager-f3ad60b4347612cf03717d3a283cb05f32d99d15.tar.gz | |
route-manager: define singelton using NM_DEFINE_SINGLETON_GETTER()
Fixes: 874e4a7595ac11e53e333dcdd0ad988a47391cc9
| -rw-r--r-- | src/nm-route-manager.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c index 925de7760f..3f9eb1be2d 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) { @@ -338,15 +336,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) |