colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sleep-monitor: implement dispose() instead of finalize()

Browse Source 
To release resources, dispose() is preferred over finalize()
because it is called earlier.
This commit is contained in:
Thomas Haller
2016-04-25 12:52:03 +02:00
parent fc14d32e99
commit a7308bbe9c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nm-sleep-monitor-systemd.c
View File

@@ -241,16 +241,15 @@ nm_sleep_monitor_init (NMSleepMonitor *self)
} }
static void static void
finalize (GObject *object) dispose (GObject *object)
{ {
NMSleepMonitor *self = NM_SLEEP_MONITOR (object); NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
drop_inhibitor (self); drop_inhibitor (self);
if (self->sd_proxy)
g_object_unref (self->sd_proxy);
if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL) g_clear_object (&self->sd_proxy);
G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->dispose (object);
} }
static void static void
@@ -260,7 +259,7 @@ nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
gobject_class = G_OBJECT_CLASS (klass); gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = finalize; gobject_class->dispose = dispose;
signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING, signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
NM_TYPE_SLEEP_MONITOR, NM_TYPE_SLEEP_MONITOR,