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

sleep-monitor: handle early destruction of NMSleepMonitor instance

Browse source 
When destroing the sleep monitor before the D-Bus proxy is created,
we must cancel creation of the proxy.
This commit is contained in:
Thomas Haller 2016-04-25 13:00:37 +02:00
parent 2919b9271d
commit 3fa3dba1b1
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/nm-sleep-monitor-systemd.c
View file

@ -55,6 +55,7 @@ struct _NMSleepMonitor {
GObject parent_instance;
GDBusProxy *sd_proxy;
GCancellable *cancellable;
gint inhibit_fd;
};
@ -205,13 +206,17 @@ on_proxy_acquired (GObject *object,
{
GError *error = NULL;
char *owner;
GDBusProxy *sd_proxy;
self->sd_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
if (!self->sd_proxy) {
_LOGW ("Failed to acquire logind proxy: %s", error->message);
sd_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
if (!sd_proxy) {
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
_LOGW ("Failed to acquire logind proxy: %s", error->message);
g_clear_error (&error);
return;
}
self->sd_proxy = sd_proxy;
g_clear_object (&self->cancellable);
g_signal_connect (self->sd_proxy, "notify::g-name-owner", G_CALLBACK (name_owner_cb), self);
_nm_dbus_signal_connect (self->sd_proxy, "PrepareForSleep", G_VARIANT_TYPE ("(b)"),
@ -227,12 +232,13 @@ static void
nm_sleep_monitor_init (NMSleepMonitor *self)
{
self->inhibit_fd = -1;
self->cancellable = g_cancellable_new ();
g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
NULL,
SUSPEND_DBUS_NAME, SUSPEND_DBUS_PATH, SUSPEND_DBUS_INTERFACE,
NULL,
self->cancellable,
(GAsyncReadyCallback) on_proxy_acquired, self);
}
@ -243,6 +249,8 @@ dispose (GObject *object)
drop_inhibitor (self);
nm_clear_g_cancellable (&self->cancellable);
g_clear_object (&self->sd_proxy);
G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->dispose (object);