Author: andar
Revision: 6014
Log:
Fix #782 do not ask for tray password when window is not minimized to
tray
Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog 2009-12-12 21:22:51 UTC (rev 6013)
+++ branches/1.2_RC/ChangeLog 2009-12-12 22:38:26 UTC (rev 6014)
@@ -22,6 +22,7 @@
* 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.
+ * Fix #782 do not ask for tray password when window is not minimized to
tray
==== 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 21:22:51 UTC
(rev 6013)
+++ branches/1.2_RC/deluge/ui/gtkui/systemtray.py 2009-12-12 22:38:26 UTC
(rev 6014)
@@ -274,7 +274,7 @@
"""Called when the tray icon is left clicked."""
self.blink(False)
- if self.window.active():
+ if self.window.active() or self.window.visible():
self.window.hide()
else:
if self.config["lock_tray"]:
Modified: trunk/deluge/ui/gtkui/systemtray.py
===================================================================
--- trunk/deluge/ui/gtkui/systemtray.py 2009-12-12 21:22:51 UTC (rev 6013)
+++ trunk/deluge/ui/gtkui/systemtray.py 2009-12-12 22:38:26 UTC (rev 6014)
@@ -274,7 +274,7 @@
"""Called when the tray icon is left clicked."""
self.blink(False)
- if self.window.active():
+ if self.window.active() or self.window.visible():
self.window.hide()
else:
if self.config["lock_tray"]:
--
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.
