merge: branch 'bg/fix-shutdown-crash'

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1910

2 files changed, 5 insertions, 24 deletions

diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index c30a2ff632..198b7e14c4 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -7488,7 +7488,7 @@ shutdown_cb(NMPowerMonitor *monitor, gpointer user_data)
         NMSettingConnection *s_con;
         gboolean             take_down = FALSE;
 
-        s_con = nm_device_get_applied_setting(device, NM_META_SETTING_TYPE_CONNECTION);
+        s_con = nm_device_get_applied_setting(device, NM_TYPE_SETTING_CONNECTION);
         if (!s_con)
             continue;
 
diff --git a/src/core/nm-power-monitor.c b/src/core/nm-power-monitor.c
index ac1430f018..289b0ff001 100644
--- a/src/core/nm-power-monitor.c
+++ b/src/core/nm-power-monitor.c
@@ -83,12 +83,6 @@ G_DEFINE_TYPE(NMPowerMonitor, nm_power_monitor, G_TYPE_OBJECT);
 
 /*****************************************************************************/
 
-static void sleep_signal(NMPowerMonitor *self, gboolean is_about_to_suspend);
-
-static void shutdown_signal(NMPowerMonitor *self);
-
-/*****************************************************************************/
-
 static void
 drop_inhibitor(NMPowerMonitor *self, gboolean force)
 {
@@ -164,18 +158,6 @@ take_inhibitor(NMPowerMonitor *self)
 }
 
 static void
-prepare_for_sleep_cb(GDBusProxy *proxy, gboolean is_about_to_suspend, gpointer data)
-{
-    sleep_signal(data, is_about_to_suspend);
-}
-
-static void
-prepare_for_shutdown_cb(GDBusProxy *proxy, gpointer data)
-{
-    shutdown_signal(data);
-}
-
-static void
 name_owner_cb(GObject *object, GParamSpec *pspec, gpointer user_data)
 {
     GDBusProxy     *proxy = G_DBUS_PROXY(object);
@@ -193,7 +175,7 @@ name_owner_cb(GObject *object, GParamSpec *pspec, gpointer user_data)
 }
 
 static void
-sleep_signal(NMPowerMonitor *self, gboolean is_about_to_suspend)
+prepare_for_sleep_cb(GDBusProxy *proxy, gboolean is_about_to_suspend, NMPowerMonitor *self)
 {
     g_return_if_fail(NM_IS_POWER_MONITOR(self));
 
@@ -209,7 +191,7 @@ sleep_signal(NMPowerMonitor *self, gboolean is_about_to_suspend)
 }
 
 static void
-shutdown_signal(NMPowerMonitor *self)
+prepare_for_shutdown_cb(GDBusProxy *proxy, gboolean is_about_to_shutdown, NMPowerMonitor *self)
 {
     g_return_if_fail(NM_IS_POWER_MONITOR(self));
 
@@ -372,8 +354,7 @@ nm_power_monitor_class_init(NMPowerMonitorClass *klass)
                                      0,
                                      NULL,
                                      NULL,
-                                     g_cclosure_marshal_VOID__BOOLEAN,
+                                     NULL,
                                      G_TYPE_NONE,
-                                     1,
-                                     G_TYPE_BOOLEAN);
+                                     0);
 }