Module: deluge Branch: 1.3-stable Commit: de85e1dcdc7402b0d91fbb3b32c5f74c9c6dec45
Author: Damien Churchill <[email protected]> Date: Sun Jul 18 23:11:02 2010 +0100 a couple of fixes to stop the webui crashing when running within the gtkui --- deluge/ui/web/json_api.py | 5 ++++- deluge/ui/web/server.py | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py index f917c88..6ec567b 100644 --- a/deluge/ui/web/json_api.py +++ b/deluge/ui/web/json_api.py @@ -410,7 +410,10 @@ class WebApi(JSONComponent): self.host_list = ConfigManager("hostlist.conf.1.2", DEFAULT_HOSTS) self.core_config = CoreConfig() self.event_queue = EventQueue() - self.sessionproxy = SessionProxy() + try: + self.sessionproxy = component.get("SessionProxy") + except KeyError: + self.sessionproxy = SessionProxy() def get_host(self, host_id): """ diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index f6a4d13..ba2c3d6 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -188,7 +188,13 @@ class Render(resource.Resource): return compress(template.render(), request) class Tracker(resource.Resource): - tracker_icons = TrackerIcons() + + def __init__(self): + resource.Resource.__init__(self) + try: + self.tracker_icons = component.get("TrackerIcons") + except KeyError: + self.tracker_icons = TrackerIcons() def getChild(self, path, request): request.tracker_name = path -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
