From 3f24b99e8620aed79903f8604ed0dcacae11775b Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Tue, 2 Apr 2024 22:08:12 +0200
Subject: [PATCH] power-monitor: simplify signal handling

Remove intermediate functions that only change the arguments order.
---
 src/core/nm-power-monitor.c | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/core/nm-power-monitor.c b/src/core/nm-power-monitor.c
index c25f9b9c48..a9a70c39eb 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)
 {
@@ -163,18 +157,6 @@ take_inhibitor(NMPowerMonitor *self)
                                         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, gboolean is_about_to_shutdown, gpointer data)
-{
-    shutdown_signal(data);
-}
-
 static void
 name_owner_cb(GObject *object, GParamSpec *pspec, gpointer user_data)
 {
@@ -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));