[kupfer] browser, data: No need to use singleton code for DataController



commit ed910a86316aee1ff8272a2139d7895b8bbd3d27
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Sun Aug 23 02:22:33 2009 +0200

    browser, data: No need to use singleton code for DataController
    
    The WindowController creates the DataController which will be the only
    instance.

 kupfer/browser.py |    2 +-
 kupfer/data.py    |    7 -------
 2 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/kupfer/browser.py b/kupfer/browser.py
index 83c1438..54eedcd 100644
--- a/kupfer/browser.py
+++ b/kupfer/browser.py
@@ -1139,7 +1139,7 @@ class WindowController (pretty.OutputMixin):
 		self.icon_name = gtk.STOCK_FIND
 		self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
 
-		data_controller = data.GetDataController()
+		data_controller = data.DataController()
 		data_controller.connect("launched-action", self.launch_callback)
 
 		self.interface = Interface(data_controller, self.window)
diff --git a/kupfer/data.py b/kupfer/data.py
index 40a675a..93a4fb0 100644
--- a/kupfer/data.py
+++ b/kupfer/data.py
@@ -1008,10 +1008,3 @@ gobject.signal_new("launched-action", DataController, gobject.SIGNAL_RUN_LAST,
 		gobject.TYPE_BOOLEAN, (gobject.TYPE_INT, gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT))
 
 
-_data_controller = None
-def GetDataController():
-	global _data_controller
-	if _data_controller is None:
-		_data_controller = DataController()
-	return _data_controller
-



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]