Author: andar
Revision: 6013
Log:
Fix #692 no longer require tray password when quitting from the tray
icon while the window is
visible.
Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog 2009-12-12 15:56:49 UTC (rev 6012)
+++ branches/1.2_RC/ChangeLog 2009-12-12 21:22:51 UTC (rev 6013)
@@ -20,6 +20,8 @@
* Fix crash in Windows when creating a torrent
* Add button to Other preferences to associate magnet links with Deluge
* Fix uploading plugins when the daemon is not localhost
+ * Fix #692 no longer require tray password when quitting from the tray
icon
+ while the window is visible.
==== Console ====
* Fix using the console in Windows, but only in command-line mode
Modified: branches/1.2_RC/deluge/ui/gtkui/systemtray.py
===================================================================
--- branches/1.2_RC/deluge/ui/gtkui/systemtray.py 2009-12-12 15:56:49 UTC
(rev 6012)
+++ branches/1.2_RC/deluge/ui/gtkui/systemtray.py 2009-12-12 21:22:51 UTC
(rev 6013)
@@ -321,7 +321,7 @@
def on_menuitem_quit_activate(self, menuitem):
log.debug("on_menuitem_quit_activate")
- if self.config["lock_tray"]:
+ if self.config["lock_tray"] and not self.window.visible():
if not self.unlock_tray():
return
@@ -332,7 +332,7 @@
def on_menuitem_quitdaemon_activate(self, menuitem):
log.debug("on_menuitem_quitdaemon_activate")
- if self.config["lock_tray"]:
+ if self.config["lock_tray"] and not self.window.visible():
if not self.unlock_tray():
return
Modified: trunk/deluge/ui/gtkui/systemtray.py
===================================================================
--- trunk/deluge/ui/gtkui/systemtray.py 2009-12-12 15:56:49 UTC (rev 6012)
+++ trunk/deluge/ui/gtkui/systemtray.py 2009-12-12 21:22:51 UTC (rev 6013)
@@ -321,7 +321,7 @@
def on_menuitem_quit_activate(self, menuitem):
log.debug("on_menuitem_quit_activate")
- if self.config["lock_tray"]:
+ if self.config["lock_tray"] and not self.window.visible():
if not self.unlock_tray():
return
@@ -332,7 +332,7 @@
def on_menuitem_quitdaemon_activate(self, menuitem):
log.debug("on_menuitem_quitdaemon_activate")
- if self.config["lock_tray"]:
+ if self.config["lock_tray"] and not self.window.visible():
if not self.unlock_tray():
return
--
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.
