diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-09-16 10:07:30 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-09-16 10:07:30 +0100 |
| commit | d4166414a95a4a7596f522d5def62dc0897af309 (patch) | |
| tree | 382bb8b674a302797ac0b3eae63e1deebe994a24 | |
| parent | 1ea8cf99f98399c0404b610e7364b267637640b4 (diff) | |
| download | ayatana-indicator-session-d4166414a95a4a7596f522d5def62dc0897af309.tar.gz ayatana-indicator-session-d4166414a95a4a7596f522d5def62dc0897af309.tar.bz2 ayatana-indicator-session-d4166414a95a4a7596f522d5def62dc0897af309.zip | |
removed startup rebootrequired query, it must have been returning true
| -rw-r--r-- | src/apt-watcher.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/apt-watcher.c b/src/apt-watcher.c index 2c5ed0b..5d4f083 100644 --- a/src/apt-watcher.c +++ b/src/apt-watcher.c @@ -177,8 +177,6 @@ apt_watcher_on_name_appeared (GDBusConnection *connection, "the system bus", name_owner); - apt_watcher_query_reboot_status (user_data); - g_dbus_proxy_call (watcher->proxy, "UpgradeSystem", g_variant_new("(b)", TRUE), @@ -299,6 +297,15 @@ apt_watcher_transaction_state_real_update_cb (AptTransaction* trans, if (self->current_state != UPGRADE_IN_PROGRESS){ query_again = TRUE; } + else{ + if (self->reboot_query != 0){ + g_source_remove (self->reboot_query); + self->reboot_query = 0; + } + self->reboot_query = g_timeout_add_seconds (1, + apt_watcher_query_reboot_status, + self); + } self->current_state = state; g_object_unref (G_OBJECT(self->current_transaction)); @@ -383,7 +390,7 @@ apt_watcher_query_reboot_status (gpointer data) GVariant* reboot_result = g_dbus_proxy_get_cached_property (self->proxy, "RebootRequired"); - gboolean reboot; + gboolean reboot = FALSE; g_variant_get (reboot_result, "b", &reboot); g_debug ("apt_watcher_query_reboot_status: reboot prop = %i", reboot); if (reboot == FALSE){ |