From 9ac7b450103b39c438a508c5c52b675cb37afa16 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Tue, 2 Aug 2011 01:21:34 +0000 Subject: [PATCH] Don't use dialog window type for integration windows on Linux --- chrome/content/zotero/xpcom/integration.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js index 76dbf63cd..621b0dc2d 100644 --- a/chrome/content/zotero/xpcom/integration.js +++ b/chrome/content/zotero/xpcom/integration.js @@ -1070,9 +1070,15 @@ Zotero.Integration.Session.prototype.setData = function(data) { */ Zotero.Integration.Session.prototype._displayDialog = function(url, options, io) { if(this.doc) this.doc.cleanup(); + + var allOptions = 'chrome,centerscreen'; + // without this, Firefox gets raised with our windows under Compiz + if(Zotero.isLinux) allOptions += ',dialog=no'; + if(options) allOptions += ','+options; + var window = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] .getService(Components.interfaces.nsIWindowWatcher) - .openWindow(null, url, '', 'chrome,centerscreen'+(options ? ','+options : ""), (io ? io : null)); + .openWindow(null, url, '', allOptions, (io ? io : null)); Zotero.Integration.activate(window); while(!window.closed) { Zotero.mainThread.processNextEvent(true);