[gnome-shell] modalDialog: Fix invalid argument 'timestamp' for pushModal
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] modalDialog: Fix invalid argument 'timestamp' for pushModal
- Date: Thu, 14 Apr 2016 09:11:40 +0000 (UTC)
commit a23b293fe2d1b0bb4921ef63b62a19672e98b833
Author: Heiher <r hev cc>
Date: Wed Jan 22 10:39:52 2014 +0800
modalDialog: Fix invalid argument 'timestamp' for pushModal
https://bugzilla.gnome.org/show_bug.cgi?id=722752
js/ui/modalDialog.js | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 960e0dc..ac77305 100644
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -259,7 +259,7 @@ const ModalDialog = new Lang.Class({
if (this.state == State.OPENED || this.state == State.OPENING)
return true;
- if (!this.pushModal({ timestamp: timestamp }))
+ if (!this.pushModal(timestamp))
return false;
this._fadeOpen(onPrimary);
@@ -318,8 +318,11 @@ const ModalDialog = new Lang.Class({
pushModal: function (timestamp) {
if (this._hasModal)
return true;
- if (!Main.pushModal(this._group, { timestamp: timestamp,
- actionMode: this._actionMode }))
+
+ let params = { actionMode: this._actionMode };
+ if (timestamp)
+ params['timestamp'] = timestamp;
+ if (!Main.pushModal(this._group, params))
return false;
this._hasModal = true;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]