codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-17 13:56:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[GTKUI] Fix quitting bypassing password lock

Browse Source
This commit is contained in:
Calum Lind 2014-07-07 18:50:27 +01:00
parent 30e5fc83b2
commit 5fdaf73fdf
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deluge/ui/gtkui/mainwindow.py
View File

@ -236,6 +236,7 @@ class MainWindow(component.Component):
:param shutdown: whether or not to shutdown the daemon as well :param shutdown: whether or not to shutdown the daemon as well
:type shutdown: boolean :type shutdown: boolean
""" """
def quit_gtkui():
def stop_gtk_reactor(result=None): def stop_gtk_reactor(result=None):
try: try:
reactor.stop() reactor.stop()
@ -249,6 +250,16 @@ class MainWindow(component.Component):
else: else:
stop_gtk_reactor() stop_gtk_reactor()
if self.config["tray_password"] and not self.visible():
dialog = PasswordDialog("Enter your pasword to Quit Deluge...")
def on_dialog_response(response_id):
if response_id == gtk.RESPONSE_OK:
if self.config["tray_password"] == sha(dialog.get_password()).hexdigest():
quit_gtkui()
dialog.run().addCallback(on_dialog_response)
else:
quit_gtkui()
def load_window_state(self): def load_window_state(self):
x = self.config["window_x_pos"] x = self.config["window_x_pos"]
y = self.config["window_y_pos"] y = self.config["window_y_pos"]

6
deluge/ui/gtkui/systemtray.py
View File

@ -375,16 +375,10 @@ class SystemTray(component.Component):
def on_menuitem_quit_activate(self, menuitem): def on_menuitem_quit_activate(self, menuitem):
log.debug("on_menuitem_quit_activate") log.debug("on_menuitem_quit_activate")
if self.config["lock_tray"] and not self.window.visible():
self.window.present()
self.window.quit() self.window.quit()
def on_menuitem_quitdaemon_activate(self, menuitem): def on_menuitem_quitdaemon_activate(self, menuitem):
log.debug("on_menuitem_quitdaemon_activate") log.debug("on_menuitem_quitdaemon_activate")
if self.config["lock_tray"] and not self.window.visible():
self.window.present()
self.window.quit(shutdown=True) self.window.quit(shutdown=True)
def on_tray_setbwdown(self, widget, data=None): def on_tray_setbwdown(self, widget, data=None):