From 9c3931f429a368cf339f7e8d8fb2a24ecff6eae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= <olejorgenb@yahoo.no>
Date: Thu, 21 Sep 2017 16:44:57 +0200
Subject: [PATCH] Move set_action_handler

---
 extension.js | 28 ++++++++++++++++++++++++++++
 tiling.js    | 27 ---------------------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/extension.js b/extension.js
index a0480d8..9c07a3b 100644
--- a/extension.js
+++ b/extension.js
@@ -1,4 +1,5 @@
 const Extension = imports.misc.extensionUtils.getCurrentExtension();
+const convenience = Extension.imports.convenience;
 const Tiling = Extension.imports.tiling;
 const utils = Extension.utils;
 const Gio = imports.gi.Gio;
@@ -87,3 +88,30 @@ function enable() {
 
 function disable() {
 }
+
+function set_action_handler(action_name, handler) {
+    // Ripped from https://github.com/negesti/gnome-shell-extensions-negesti 
+    // Handles multiple gnome-shell versions
+
+    if (Main.wm.addKeybinding && Shell.ActionMode){ // introduced in 3.16
+        Main.wm.addKeybinding(action_name,
+                              convenience.getSettings(), Meta.KeyBindingFlags.NONE,
+                              Shell.ActionMode.NORMAL,
+                              handler
+                             );
+    } else if (Main.wm.addKeybinding && Shell.KeyBindingMode) { // introduced in 3.7.5
+        // Shell.KeyBindingMode.NORMAL | Shell.KeyBindingMode.MESSAGE_TRAY,
+        Main.wm.addKeybinding(action_name,
+                              convenience.getSettings(), Meta.KeyBindingFlags.NONE,
+                              Shell.KeyBindingMode.NORMAL,
+                              handler
+                             );
+    } else {
+        global.display.add_keybinding(
+            action_name,
+            convenience.getSettings(),
+            Meta.KeyBindingFlags.NONE,
+            handler
+        );
+    }
+}
diff --git a/tiling.js b/tiling.js
index 17ce0ac..89860b6 100644
--- a/tiling.js
+++ b/tiling.js
@@ -9,7 +9,6 @@ const Main = imports.ui.main;
 const Shell = imports.gi.Shell;
 const Gio = imports.gi.Gio;
 const utils = Extension.imports.utils;
-const convenience = Extension.imports.convenience;
 
 // Gap between windows
 window_gap = 10
@@ -626,30 +625,4 @@ preview_navigate = (display, screen, meta_window, binding) => {
     tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask())
 }
 
-set_action_handler = function(action_name, handler) {
-    // Ripped from https://github.com/negesti/gnome-shell-extensions-negesti 
-    // Handles multiple gnome-shell versions
-
-    if (Main.wm.addKeybinding && Shell.ActionMode){ // introduced in 3.16
-        Main.wm.addKeybinding(action_name,
-                              convenience.getSettings(), Meta.KeyBindingFlags.NONE,
-                              Shell.ActionMode.NORMAL,
-                              handler
-                             );
-    } else if (Main.wm.addKeybinding && Shell.KeyBindingMode) { // introduced in 3.7.5
-        // Shell.KeyBindingMode.NORMAL | Shell.KeyBindingMode.MESSAGE_TRAY,
-        Main.wm.addKeybinding(action_name,
-                              convenience.getSettings(), Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.NORMAL,
-                              handler
-                             );
-    } else {
-        global.display.add_keybinding(
-            action_name,
-            convenience.getSettings(),
-            Meta.KeyBindingFlags.NONE,
-            handler
-        );
-    }
-}