From 58a733dc93a0545d58e1d3e6d920d506bbefe2c6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 14 Mar 2016 23:55:03 +0100 Subject: [PATCH] endSessionDialog: Use new PackageKit DBus API https://bugzilla.gnome.org/show_bug.cgi?id=763611 --- js/ui/endSessionDialog.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js index 93a927605..4467a54db 100644 --- a/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js @@ -163,7 +163,7 @@ const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface); const PkOfflineIface = ' \ \ \ - \ + \ \ \ \ @@ -699,7 +699,7 @@ const EndSessionDialog = new Lang.Class({ this._type = type; if (this._type == DialogType.RESTART && - this._pkOfflineProxy.TriggerAction == 'reboot') + this._pkOfflineProxy.UpdateTriggered) this._type = DialogType.UPDATE_RESTART; this._applications = []; @@ -727,19 +727,19 @@ const EndSessionDialog = new Lang.Class({ if (dialogContent.showOtherSessions) this._loadSessions(); - let updateAlreadyTriggered = this._pkOfflineProxy.TriggerAction == 'power-off' || this._pkOfflineProxy.TriggerAction == 'reboot'; + let updateTriggered = this._pkOfflineProxy.UpdateTriggered; let updatePrepared = this._pkOfflineProxy.UpdatePrepared; let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed; _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText); this._checkBox.actor.visible = (dialogContent.checkBoxText && updatePrepared && updatesAllowed); - this._checkBox.actor.checked = (updatePrepared && updateAlreadyTriggered); + this._checkBox.actor.checked = (updatePrepared && updateTriggered); // We show the warning either together with the checkbox, or when // updates have already been triggered, but the user doesn't have // enough permissions to cancel them. this._batteryWarning.visible = (dialogContent.showBatteryWarning && - (this._checkBox.actor.visible || updatePrepared && updateAlreadyTriggered && !updatesAllowed)); + (this._checkBox.actor.visible || updatePrepared && updateTriggered && !updatesAllowed)); this._updateButtons();