diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-08-04 11:40:35 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-08-05 11:20:59 +0200 |
| commit | eaae7c13ab2b9fe745349d4ef6e47d4a6caa98ea (patch) | |
| tree | 252e19287da4826a3e3bec224dfa15b0980406c5 | |
| parent | 867be324dfc8c0b12ad4aa6a7f541616b71a11a8 (diff) | |
| download | NetworkManager-eaae7c13ab2b9fe745349d4ef6e47d4a6caa98ea.tar.gz | |
fixup! core: order destruction of singleton instances
| -rw-r--r-- | src/NetworkManagerUtils.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index 04de174005..777319e287 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -49,14 +49,6 @@ nm_singleton_instance_weak_ref_register (void) \ g_object_weak_ref (G_OBJECT (singleton_instance), _singleton_instance_weak_ref_cb, NULL); \ } -/* NM_DEFINE_SINGLETON_GETTER() by default registers the instance for - * destruction via nm_singleton_instance_register_destruction(). - * Define %NM_DEFINE_SINGLETON_REGISTER_DESTRUCTION as %FALSE - * to disable that behavior. */ -#ifndef NM_DEFINE_SINGLETON_REGISTER_DESTRUCTION -#define NM_DEFINE_SINGLETON_REGISTER_DESTRUCTION TRUE -#endif - /* By default, the getter will assert that the singleton will be created only once. You can * change this by redefining NM_DEFINE_SINGLETON_ALLOW_MULTIPLE. */ #ifndef NM_DEFINE_SINGLETON_ALLOW_MULTIPLE @@ -77,8 +69,7 @@ GETTER (void) \ singleton_instance = (g_object_new (GTYPE, ##__VA_ARGS__, NULL)); \ g_assert (singleton_instance); \ nm_singleton_instance_weak_ref_register (); \ - if ((NM_DEFINE_SINGLETON_REGISTER_DESTRUCTION)) \ - nm_singleton_instance_register_destruction (); \ + nm_singleton_instance_register_destruction (); \ nm_log_dbg (LOGD_CORE, "create %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \ } \ return singleton_instance; \ |