From 007820b7c119d4cdb6d1a5bfb2d695ebc532bd5e Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sat, 6 Apr 2013 10:28:47 -0400 Subject: [PATCH] Revert "modalDialog: Destroy dialogs on close" This reverts commit 3dd6113a0a694d1deb444bafd16996a292772abb. --- js/ui/endSessionDialog.js | 3 +-- js/ui/modalDialog.js | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js index d3225819a..b7850a484 100644 --- a/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js @@ -225,8 +225,7 @@ const EndSessionDialog = new Lang.Class({ Extends: ModalDialog.ModalDialog, _init: function() { - this.parent({ styleClass: 'end-session-dialog', - destroyOnClose: false }); + this.parent({ styleClass: 'end-session-dialog' }); this._user = AccountsService.UserManager.get_default().get_user(GLib.get_user_name()); diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js index beac7fe09..304733efb 100644 --- a/js/ui/modalDialog.js +++ b/js/ui/modalDialog.js @@ -38,15 +38,13 @@ const ModalDialog = new Lang.Class({ styleClass: null, parentActor: Main.uiGroup, keybindingMode: Shell.KeyBindingMode.SYSTEM_MODAL, - shouldFadeIn: true, - destroyOnClose: true }); + shouldFadeIn: true }); this.state = State.CLOSED; this._hasModal = false; this._keybindingMode = params.keybindingMode; this._shellReactive = params.shellReactive; this._shouldFadeIn = params.shouldFadeIn; - this._destroyOnClose = params.destroyOnClose; this._group = new St.Widget({ visible: false, x: 0, @@ -279,9 +277,6 @@ const ModalDialog = new Lang.Class({ this.state = State.CLOSED; this._group.hide(); this.emit('closed'); - - if (this._destroyOnClose) - this.destroy(); }) }); },