From dbf06c1f7f357e7d6018fa3090cb07cd65e65664 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 30 Oct 2015 14:29:18 +0100
Subject: [PATCH] modalDialog: fix on 32bit

modalDialog.pushModal() expects an integer, not an object. If the timestamp
happens to be something non-sensible the XIGrabDevice() fails to grab the
devices for the modal dialogs.

https://bugs.centos.org/view.php?id=8834
---
 js/ui/main.js        | 2 ++
 js/ui/modalDialog.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/ui/main.js b/js/ui/main.js
index 6865c41..88a0100 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -343,6 +343,8 @@ function pushModal(actor, params) {
     params = Params.parse(params, { timestamp: global.get_current_time(),
                                     options: 0,
                                     keybindingMode: Shell.KeyBindingMode.NONE });
+    if (!params.timestamp)
+        params.timestamp = global.get_current_time();
 
     if (modalCount == 0) {
         if (!global.begin_modal(params.timestamp, params.options)) {
diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index a0369e6..e7fea35 100644
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -302,7 +302,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);
-- 
1.8.3.1