diff options
Diffstat (limited to 'src/nm-manager.c')
| -rw-r--r-- | src/nm-manager.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 3f6648b912..56a7959a7c 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4017,21 +4017,12 @@ impl_manager_sleep (NMManager *self, } static void -sleeping_cb (NMSleepMonitor *monitor, gpointer user_data) +sleep_signal_cb (NMSleepMonitor *monitor, gboolean is_about_to_suspend, gpointer user_data) { NMManager *self = user_data; - _LOGD (LOGD_SUSPEND, "Received sleeping signal"); - _internal_sleep (self, TRUE); -} - -static void -resuming_cb (NMSleepMonitor *monitor, gpointer user_data) -{ - NMManager *self = user_data; - - _LOGD (LOGD_SUSPEND, "Received resuming signal"); - _internal_sleep (self, FALSE); + _LOGD (LOGD_SUSPEND, "Received %s signal", is_about_to_suspend ? "sleeping" : "resuming"); + _internal_sleep (self, is_about_to_suspend); } static void @@ -5198,10 +5189,8 @@ nm_manager_init (NMManager *self) /* sleep/wake handling */ priv->sleep_monitor = g_object_ref (nm_sleep_monitor_get ()); - g_signal_connect (priv->sleep_monitor, NM_SLEEP_MONITOR_SLEEPING, - G_CALLBACK (sleeping_cb), self); - g_signal_connect (priv->sleep_monitor, NM_SLEEP_MONITOR_RESUMING, - G_CALLBACK (resuming_cb), self); + g_signal_connect (priv->sleep_monitor, NM_SLEEP_MONITOR_SLEEP_SIGNAL, + G_CALLBACK (sleep_signal_cb), self); /* Listen for authorization changes */ g_signal_connect (nm_auth_manager_get (), @@ -5437,8 +5426,7 @@ dispose (GObject *object) _set_prop_filter (manager, NULL); if (priv->sleep_monitor) { - g_signal_handlers_disconnect_by_func (priv->sleep_monitor, sleeping_cb, manager); - g_signal_handlers_disconnect_by_func (priv->sleep_monitor, resuming_cb, manager); + g_signal_handlers_disconnect_by_func (priv->sleep_monitor, sleep_signal_cb, manager); g_clear_object (&priv->sleep_monitor); } |