From 0953fca37b29550edab11da5994c5f9fa5436ba9 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Tue, 11 Aug 2009 00:20:00 +0100 Subject: [PATCH] move the instance creation to after definition, remove dependency on window.py --- terminatorlib/newterminator.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/terminatorlib/newterminator.py b/terminatorlib/newterminator.py index 772d9fee..fa5703e1 100755 --- a/terminatorlib/newterminator.py +++ b/terminatorlib/newterminator.py @@ -6,11 +6,6 @@ from util import dbg, err from version import APP_NAME, APP_VERSION -_terminator = _Terminator() -def Terminator(): - """Return the instance""" - return(_terminator) - class _Terminator(object): """master object for the application""" @@ -26,9 +21,6 @@ class _Terminator(object): self.terminals = [] self.groups = [] - self.window = Window(self.config) - self.windowtitle = WindowTitle() - def new_terminal(self): """Create and register a new terminal widget""" @@ -59,4 +51,10 @@ class _Terminator(object): for group in todestroy: self.groups.remove(group) + +_terminator = _Terminator() +def Terminator(): + """Return the instance""" + return(_terminator) + # vim: set expandtab ts=4 sw=4: