[gnome-software/gnome-3-26] updates page: Fix flatpak updates inadvertently triggering a reboot

[Kalev Lember <klember src gnome org>]

commit fa9c93009aa8de537a7c3b2b384731cbf870a196
Author: Kalev Lember <klember redhat com>
Date:   Tue Nov 7 15:11:43 2017 +0100

    updates page: Fix flatpak updates inadvertently triggering a reboot
    
    Move the logic to decide if we need to reboot or not to run _before_
    scheduling an update. Previously we would do it _after_ having applied
    the updates, which didn't work because the app flags we were looking at
    to make the decision (AS_APP_STATE_UPDATABLE_LIVE) had already changed
    at that point (to AS_APP_STATE_INSTALLED).
    
    This fixes a long standing bug where flatpak updates done through
    "Update All" would inadvertently bring up the shell reboot dialog and
    then lead to a gnome-software crash after dismissing the dialog.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782618

 src/gs-updates-page.c |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/src/gs-updates-page.c b/src/gs-updates-page.c
index e1c2bb8..c7426d2 100644
--- a/src/gs-updates-page.c
+++ b/src/gs-updates-page.c
@@ -637,14 +637,14 @@ _reboot_failed_cb (GObject *source, GAsyncResult *res, gpointer user_data)
 
 typedef struct {
        GsUpdatesPage   *self;
-       GsAppList       *apps;
+       gboolean         do_reboot;
+       gboolean         do_reboot_notification;
 } GsUpdatesPageUpdateHelper;
 
 static void
 _update_helper_free (GsUpdatesPageUpdateHelper *helper)
 {
        g_object_unref (helper->self);
-       g_object_unref (helper->apps);
        g_free (helper);
 }
 
@@ -653,8 +653,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GsUpdatesPageUpdateHelper, _update_helper_free);
 static void
 _perform_update_cb (GsPluginLoader *plugin_loader, GAsyncResult *res, gpointer user_data)
 {
-       gboolean do_reboot = FALSE;
-       gboolean do_reboot_notification = FALSE;
        g_autoptr(GError) error = NULL;
        g_autoptr(GsUpdatesPageUpdateHelper) helper = (GsUpdatesPageUpdateHelper *) user_data;
 
@@ -670,17 +668,8 @@ _perform_update_cb (GsPluginLoader *plugin_loader, GAsyncResult *res, gpointer u
                return;
        }
 
-       /* look at each app in turn */
-       for (guint i = 0; helper->apps != NULL && i < gs_app_list_length (helper->apps); i++) {
-               GsApp *app = gs_app_list_index (helper->apps, i);
-               if (gs_app_get_state (app) != AS_APP_STATE_UPDATABLE_LIVE)
-                       do_reboot = TRUE;
-               if (gs_app_has_quirk (app, AS_APP_QUIRK_NEEDS_REBOOT))
-                       do_reboot_notification = TRUE;
-       }
-
        /* trigger reboot if any application was not updatable live */
-       if (do_reboot) {
+       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,
@@ -695,7 +684,7 @@ _perform_update_cb (GsPluginLoader *plugin_loader, GAsyncResult *res, gpointer u
 
        /* when we are not doing an offline update, show a notification
         * if any application requires a reboot */
-       } else if (do_reboot_notification) {
+       } else if (helper->do_reboot_notification) {
                g_autoptr(GNotification) n = NULL;
                /* TRANSLATORS: we've just live-updated some apps */
                n = g_notification_new (_("Updates have been installed"));
@@ -719,7 +708,16 @@ _update_all (GsUpdatesPage *self, GsAppList *apps)
        GsUpdatesPageUpdateHelper *helper = g_new0 (GsUpdatesPageUpdateHelper, 1);
 
        helper->self = g_object_ref (self);
-       helper->apps = g_object_ref (apps);
+
+       /* look at each app in turn */
+       for (guint i = 0; apps != NULL && i < gs_app_list_length (apps); i++) {
+               GsApp *app = gs_app_list_index (apps, i);
+               if (gs_app_get_state (app) != AS_APP_STATE_UPDATABLE_LIVE)
+                       helper->do_reboot = TRUE;
+               if (gs_app_has_quirk (app, AS_APP_QUIRK_NEEDS_REBOOT))
+                       helper->do_reboot_notification = TRUE;
+       }
+
        g_set_object (&self->cancellable, cancellable);
        plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_UPDATE,
                                         "list", apps,