Module: deluge Branch: master Commit: 249398489e13b156363471e64d1a5ee25b0f5453
Author: Pedro Algarvio <[email protected]> Date: Wed Dec 15 21:14:49 2010 +0000 Removed problematic code. GTK2Reactor takes care of all that. --- deluge/ui/gtkui/gtkui.py | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 1efbda3..1d0208d 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -205,10 +205,6 @@ class GtkUI(object): self.queuedtorrents = QueuedTorrents() self.ipcinterface = IPCInterface(args) - # Initialize gdk threading - gtk.gdk.threads_init() - gobject.threads_init() - # We make sure that the UI components start once we get a core URI client.set_disconnect_callback(self.__on_disconnect) @@ -238,11 +234,8 @@ class GtkUI(object): rpc_stats.start(10) reactor.callWhenRunning(self._on_reactor_start) - # Start the gtk main loop - gtk.gdk.threads_enter() + reactor.addSystemEventTrigger("before", "shutdown", self.shutdown) reactor.run() - self.shutdown() - gtk.gdk.threads_leave() def shutdown(self, *args, **kwargs): log.debug("gtkui shutting down..") -- 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.
