diff options
| author | Michael Biebl <biebl@debian.org> | 2015-05-05 17:49:11 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-05-05 17:49:11 +0200 |
| commit | e847e3cc3e4eded45a358bf838e1edcf4c12fcb5 (patch) | |
| tree | 9db16e390931b9b800a174c7117b9297b351283f /src/settings/nm-inotify-helper.c | |
| parent | 1cd35b49de89f65c386ae2ff98a8e08342c080b0 (diff) | |
| parent | f408e27bccfacf347605a8d98649975a68f38a17 (diff) | |
Merge tag 'upstream/1.0.2'
Upstream version 1.0.2
Diffstat (limited to 'src/settings/nm-inotify-helper.c')
| -rw-r--r-- | src/settings/nm-inotify-helper.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/settings/nm-inotify-helper.c b/src/settings/nm-inotify-helper.c index 85b3c400..41f0268d 100644 --- a/src/settings/nm-inotify-helper.c +++ b/src/settings/nm-inotify-helper.c @@ -148,20 +148,20 @@ init_inotify (NMInotifyHelper *self) NMInotifyHelper * nm_inotify_helper_get (void) { - static NMInotifyHelper *singleton = NULL; + static NMInotifyHelper *singleton_instance = NULL; - if (!singleton) { - singleton = (NMInotifyHelper *) g_object_new (NM_TYPE_INOTIFY_HELPER, NULL); + if (!singleton_instance) { + singleton_instance = (NMInotifyHelper *) g_object_new (NM_TYPE_INOTIFY_HELPER, NULL); - if (!init_inotify (singleton)) { - g_clear_object (&singleton); + if (!init_inotify (singleton_instance)) { + g_clear_object (&singleton_instance); return NULL; } } else - g_object_ref (singleton); + g_object_ref (singleton_instance); - g_assert (singleton); - return singleton; + g_assert (singleton_instance); + return singleton_instance; } static void |