[gnome-software/gnome-3-12] update monitor: Set install-timestamp in a single place



commit aa26dd35d70ba59ef8f8ea8cf4dadcfc92a0c661
Author: Kalev Lember <kalevlember gmail com>
Date:   Thu Apr 10 23:33:57 2014 +0200

    update monitor: Set install-timestamp in a single place
    
    Instead of setting it both when triggering an offline update and after
    the reboot, only do the latter. This makes sure we have one code path no
    matter if it was gnome-software or gnome-shell triggering the update.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=728000

 src/gs-offline-updates.c |    9 ---------
 src/gs-update-monitor.c  |   13 ++++++-------
 2 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/src/gs-offline-updates.c b/src/gs-offline-updates.c
index 0a196fc..df04bc2 100644
--- a/src/gs-offline-updates.c
+++ b/src/gs-offline-updates.c
@@ -75,8 +75,6 @@ gs_offline_updates_trigger (void)
 {
        gboolean ret;
        GError *error = NULL;
-       GDateTime *now;
-       GSettings *settings;
 
        ret = gs_spawn_pkexec (LIBEXECDIR "/pk-trigger-offline-update", NULL, &error);
        if (!ret) {
@@ -84,13 +82,6 @@ gs_offline_updates_trigger (void)
                           error->message);
                g_error_free (error);
        }
-
-       now = g_date_time_new_now_local ();
-       settings = g_settings_new ("org.gnome.software");
-       g_settings_set (settings, "install-timestamp", "x",
-                       g_date_time_to_unix (now));
-       g_date_time_unref (now);
-       g_object_unref (settings);
 }
 
 void
diff --git a/src/gs-update-monitor.c b/src/gs-update-monitor.c
index b085799..c308136 100644
--- a/src/gs-update-monitor.c
+++ b/src/gs-update-monitor.c
@@ -145,13 +145,6 @@ show_installed_updates_notification (GsUpdateMonitor *monitor)
                return;
 
        if (success) {
-               guint64 time_completed;
-
-               if (gs_offline_updates_get_time_completed (&time_completed)) {
-                       g_settings_set (monitor->settings,
-                                       "install-timestamp", "x", time_completed);
-               }
-
                title = ngettext ("Software Update Installed",
                                  "Software Updates Installed",
                                  num_packages);
@@ -185,6 +178,12 @@ static gboolean
 check_offline_update_cb (gpointer user_data)
 {
        GsUpdateMonitor *monitor = user_data;
+       guint64 time_update_completed;
+
+       if (gs_offline_updates_get_time_completed (&time_update_completed)) {
+               g_settings_set (monitor->settings,
+                               "install-timestamp", "x", time_update_completed);
+       }
 
        show_installed_updates_notification (monitor);
        start_monitoring_offline_updates (monitor);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]