[gnome-software/135-restart-and-install-update-button-does-not-trigger-reboot-when-using-lxde] gs-updates-section: Use gs_utils_invoke_reboot_async() to request reboot

[Milan Crha <mcrha src gnome org>]

commit c9e2c97ec8ebb21c8d8f6bd4089841136a0db703
Author: Milan Crha <mcrha redhat com>
Date:   Tue Jun 21 08:56:57 2022 +0200

    gs-updates-section: Use gs_utils_invoke_reboot_async() to request reboot

 src/gs-updates-section.c | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/src/gs-updates-section.c b/src/gs-updates-section.c
index ca39e6fab..c2615bdb1 100644
--- a/src/gs-updates-section.c
+++ b/src/gs-updates-section.c
@@ -259,17 +259,15 @@ _reboot_failed_cb (GObject *source, GAsyncResult *res, gpointer user_data)
        g_autoptr(GError) error = NULL;
        GsApp *app = NULL;
        g_autoptr(GsPluginJob) plugin_job = NULL;
-       g_autoptr(GVariant) retval = NULL;
 
        /* get result */
-       retval = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), res, &error);
-       if (retval != NULL)
+       if (gs_utils_invoke_reboot_finish (source, res, &error))
                return;
 
-       if (error != NULL) {
-               g_warning ("Calling org.gnome.SessionManager.Reboot failed: %s",
-                          error->message);
-       }
+       if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+               g_debug ("Calling reboot had been cancelled");
+       else if (error != NULL)
+               g_warning ("Calling reboot failed: %s", error->message);
 
        /* cancel trigger */
        app = gs_app_list_index (self->list, 0);
@@ -366,17 +364,7 @@ _perform_update_cb (GsPluginLoader *plugin_loader, GAsyncResult *res, gpointer u
 
        /* trigger reboot if any application was not updatable live */
        if (helper->do_reboot) {
-               g_autoptr(GDBusConnection) bus = NULL;
-               bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
-               g_dbus_connection_call (bus,
-                                       "org.gnome.SessionManager",
-                                       "/org/gnome/SessionManager",
-                                       "org.gnome.SessionManager",
-                                       "Reboot",
-                                       NULL, NULL, G_DBUS_CALL_FLAGS_NONE,
-                                       G_MAXINT, NULL,
-                                       _reboot_failed_cb,
-                                       self);
+               gs_utils_invoke_reboot_async (NULL, _reboot_failed_cb, self);
 
        /* when we are not doing an offline update, show a notification
         * if any application requires a reboot */