Fix crash when pressing keys and cleanup frame instantiation a bit.

2 files changed, 12 insertions, 4 deletions

diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py
index 48c7696..1c33f44 100644
--- a/src/jarabe/view/keyhandler.py
+++ b/src/jarabe/view/keyhandler.py
@@ -94,7 +94,7 @@ class KeyHandler(object):
         self._key_grabber.connect('key-released',
                                   self._key_released_cb)
 
-        self._tabbing_handler = TabbingHandler(_TABBING_MODIFIER)
+        self._tabbing_handler = TabbingHandler(self._frame, _TABBING_MODIFIER)
 
         self._key_grabber.grab_keys(_actions_table.keys())
 
@@ -322,3 +322,12 @@ class KeyHandler(object):
             return True
         return False
 
+_instance = None
+
+def setup(frame):
+    global _instance
+
+    if _instance:
+        del _instance
+
+    _instance = KeyHandler(frame)    
diff --git a/src/jarabe/view/tabbinghandler.py b/src/jarabe/view/tabbinghandler.py
index e86d0de..87a36a1 100644
--- a/src/jarabe/view/tabbinghandler.py
+++ b/src/jarabe/view/tabbinghandler.py
@@ -18,17 +18,16 @@ import logging
 import gtk
 import gobject
 
-from jarabe.frame import frame
 from jarabe.model import shell
 
 _RAISE_DELAY = 250
 
 class TabbingHandler(object):
-    def __init__(self, modifier):
+    def __init__(self, frame, modifier):
+        self._frame = frame
         self._tabbing = False
         self._modifier = modifier
         self._timeout = None
-        self._frame = frame.get_instance()
 
     def _start_tabbing(self):
         if not self._tabbing: