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

manager: downgrade assertions to g_critical() in manager's singleton getters

Browse source
This commit is contained in:
Thomas Haller 2016-01-25 16:29:51 +01:00
parent bb78d14467
commit 858e4bca45
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nm-manager.c
View file

@ -5036,16 +5036,20 @@ NM_DEFINE_SINGLETON_REGISTER (NMManager);
NMManager *
nm_manager_get (void)
{
g_assert (singleton_instance);
g_return_val_if_fail (singleton_instance, NULL);
return singleton_instance;
}
NMConnectionProvider *
nm_connection_provider_get (void)
{
g_assert (singleton_instance);
g_assert (NM_MANAGER_GET_PRIVATE (singleton_instance)->settings);
return NM_CONNECTION_PROVIDER (NM_MANAGER_GET_PRIVATE (singleton_instance)->settings);
NMConnectionProvider *p;
g_return_val_if_fail (singleton_instance, NULL);
p = NM_CONNECTION_PROVIDER (NM_MANAGER_GET_PRIVATE (singleton_instance)->settings);
g_return_val_if_fail (p, NULL);
return p;
}
NMManager *
@ -5056,7 +5060,7 @@ nm_manager_setup (const char *state_file,
{
NMManager *self;
g_assert (singleton_instance == NULL);
g_return_val_if_fail (!singleton_instance, singleton_instance);
self = g_object_new (NM_TYPE_MANAGER,
NM_MANAGER_NETWORKING_ENABLED, initial_net_enabled,