Merging in files from skeleton

[gc-dialer] / src / gtk_toolbox.py

diff --git a/src/gtk_toolbox.py b/src/gtk_toolbox.py
index f687e6b..769e19b 100644 (file)
--- a/src/gtk_toolbox.py
+++ b/src/gtk_toolbox.py
@@ -414,11 +414,11 @@ def safecall(f, errorDisplay=None, default=None, exception=Exception):
 
 class ErrorDisplay(object):
 
-       def __init__(self, widgetTree):
+       def __init__(self, errorBox, errorDescription, errorClose):
                super(ErrorDisplay, self).__init__()
-               self.__errorBox = widgetTree.get_widget("errorEventBox")
-               self.__errorDescription = widgetTree.get_widget("errorDescription")
-               self.__errorClose = widgetTree.get_widget("errorClose")
+               self.__errorBox = errorBox
+               self.__errorDescription = errorDescription
+               self.__errorClose = errorClose
                self.__parentBox = self.__errorBox.get_parent()
 
                self.__errorBox.connect("button_release_event", self._on_close)
@@ -751,18 +751,6 @@ class TapOrHold(object):
 
 
 if __name__ == "__main__":
-       if True:
-               win = gtk.Window()
-               win.set_title("Tap'N'Hold")
-               eventBox = gtk.EventBox()
-               win.add(eventBox)
-
-               context = ContextHandler(eventBox, coroutines.printer_sink())
-               context.enable()
-               win.connect("destroy", lambda w: gtk.main_quit())
-
-               win.show_all()
-
        if False:
                import datetime
                cal = PopupCalendar(None, datetime.datetime.now())