From 4ceb0fc2d9240f203a310bb72a6fea3c83cae3c7 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <charlesg99@outlook.com>
Date: Sun, 14 Oct 2018 23:23:15 -0400
Subject: [PATCH] Remove function shorthand for older gnome-shell versions

---
 panel.js     | 2 +-
 proximity.js | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/panel.js b/panel.js
index f8e54d1..f2302b6 100644
--- a/panel.js
+++ b/panel.js
@@ -772,7 +772,7 @@ var dtpPanelWrapper = new Lang.Class({
 var dtpSecondaryPanel = new Lang.Class({
     Name: 'DashToPanel.SecondaryPanel',
 
-    _init : function(settings, monitor) {
+    _init: function(settings, monitor) {
         this._dtpSettings = settings;
    	
         this.actor = new Shell.GenericContainer({ name: 'panel', reactive: true });
diff --git a/proximity.js b/proximity.js
index bf457f6..16c996b 100644
--- a/proximity.js
+++ b/proximity.js
@@ -103,7 +103,7 @@ var ProximityManager = new Lang.Class({
         }
     },
 
-    update() {
+    update: function() {
         this._queueUpdate(true);
     },
 
@@ -173,10 +173,11 @@ var ProximityManager = new Lang.Class({
     },
 
     _disconnectFocusedWindow: function() {
-        if (this._focusedWindowInfo) {
+        if (this._focusedWindowInfo && this._focusedWindowInfo.window) {
             this._focusedWindowInfo.window.disconnect(this._focusedWindowInfo.id);
-            this._focusedWindowInfo = null;
         }
+
+        this._focusedWindowInfo = null;
     },
 
     _getHandledWindows: function() {