From a739a92eb44c34fe31c8293fe63dfd74350aa842 Mon Sep 17 00:00:00 2001 From: xSmurf Date: Sat, 6 Jan 2018 11:56:24 +0000 Subject: [PATCH] Push_modal failure tentative three... --- gnome-shell/firewall@subgraph.com/dialog.js | 12 ++++++------ gnome-shell/firewall@subgraph.com/extension.js | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gnome-shell/firewall@subgraph.com/dialog.js b/gnome-shell/firewall@subgraph.com/dialog.js index 0c35343..b0ead3d 100644 --- a/gnome-shell/firewall@subgraph.com/dialog.js +++ b/gnome-shell/firewall@subgraph.com/dialog.js @@ -603,17 +603,17 @@ const PromptDialog = new Lang.Class({ }, onAllow: function() { - if (this.cbClose !== undefined && this.cbClose !== null) { - this.cbClose(); - } + //if (this.cbClose !== undefined && this.cbClose !== null) { + // this.cbClose(); + //} this.close(); this.sendReturnValue(true); }, onDeny: function() { - if (this.cbClose !== undefined && this.cbClose !== null) { - this.cbClose(); - } + //if (this.cbClose !== undefined && this.cbClose !== null) { + // this.cbClose(); + //} this.close(); this.sendReturnValue(false); }, diff --git a/gnome-shell/firewall@subgraph.com/extension.js b/gnome-shell/firewall@subgraph.com/extension.js index 425ac6e..e5a0db7 100644 --- a/gnome-shell/firewall@subgraph.com/extension.js +++ b/gnome-shell/firewall@subgraph.com/extension.js @@ -182,6 +182,7 @@ const FirewallPromptHandler = new Lang.Class({ this._dialog = new Dialog.PromptDialog(invocation, (pid >= 0), (sandbox != ""), tlsguard, cbfn); this._dialog.update(app, icon, path, address, port, ip, origin, uid, gid, user, group, pid, proto, tlsguard, optstring, sandbox, expanded, expert, action); + this._dialog.connect("closed", Lang.bind(this, this.onCloseDialog)); this._dialog.open(); } catch (err) { log("SGFW: Error while creating prompt: " + err); @@ -194,7 +195,7 @@ const FirewallPromptHandler = new Lang.Class({ this._dialog.close(); this._dialog.destroy(); } catch (err) { - log("SGFW: Unable to close/destroy modal..."); + log("SGFW: Error unable to close/destroy modal..."); } this._dialog = null; if (this._dialogs.length > 0) {