remove misplaced and unnecessary code

This commit is contained in:
Marcos Pinto 2007-10-01 01:52:25 +00:00
commit 4d4b2de7c3

View file

@ -112,34 +112,11 @@ class MenuBar:
def on_menuitem_quitdaemon_activate(self, data=None): def on_menuitem_quitdaemon_activate(self, data=None):
log.debug("on_menuitem_quitdaemon_activate") log.debug("on_menuitem_quitdaemon_activate")
# Tell the core to shutdown # Tell the core to shutdown
if self.window.visible():
self.window.hide()
self.window.quit()
functions.shutdown()
else:
from deluge.configmanager import ConfigManager
if self.config.get("lock_tray") == True:
from deluge.ui.gtk.systemtray import SystemTray
SystemTray.unlock_tray("quitdaemon")
else:
self.window.hide()
self.window.quit() self.window.quit()
functions.shutdown() functions.shutdown()
def on_menuitem_quit_activate(self, data=None): def on_menuitem_quit_activate(self, data=None):
log.debug("on_menuitem_quit_activate") log.debug("on_menuitem_quit_activate")
if self.window.visible():
self.window.hide()
self.window.quit()
else:
from deluge.configmanager import ConfigManager
self.config = ConfigManager("gtkui.conf")
if self.config.get("lock_tray") == True:
log.debug("trying to import")
from deluge.ui.gtk.systemtray import SystemTray
SystemTray.unlock_tray("quitui")
else:
self.window.hide()
self.window.quit() self.window.quit()
## Edit Menu ## ## Edit Menu ##