Author: andar
Revision: 5939
Log:
Fix exception on startup when the system tray icon is not enabled
Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog 2009-11-18 19:02:05 UTC (rev 5938)
+++ branches/1.2_RC/ChangeLog 2009-11-19 02:29:37 UTC (rev 5939)
@@ -10,6 +10,7 @@
* Fix #1071 issue where Deluge will fail to start if there is a stale
ipc lockfile
* Fix autoconnecting to the next host in the list if the selected one
isn't available
* Fix endless loop when trying to autoconnect to an offline daemon
+ * Fix exception on startup when the system tray icon is not enabled
==== Web ====
* Fix installing the deluge-web manpage
Modified: branches/1.2_RC/deluge/ui/gtkui/systemtray.py
===================================================================
--- branches/1.2_RC/deluge/ui/gtkui/systemtray.py 2009-11-18 19:02:05 UTC
(rev 5938)
+++ branches/1.2_RC/deluge/ui/gtkui/systemtray.py 2009-11-19 02:29:37 UTC
(rev 5939)
@@ -165,7 +165,7 @@
self.tray.set_tooltip(_("Deluge\nNot Connected.."))
def shutdown(self):
- if self.config["enable_system_tray"]:
+ if self.config["enable_system_tray"]:
self.tray.set_visible(False)
def send_status_request(self):
@@ -196,6 +196,9 @@
self.upload_rate = deluge.common.fsize(upload_rate)
def update(self):
+ if not self.config["enable_system_tray"]:
+ return
+
# Set the tool tip text
max_download_speed = self.max_download_speed
max_upload_speed = self.max_upload_speed
Modified: trunk/deluge/ui/gtkui/systemtray.py
===================================================================
--- trunk/deluge/ui/gtkui/systemtray.py 2009-11-18 19:02:05 UTC (rev 5938)
+++ trunk/deluge/ui/gtkui/systemtray.py 2009-11-19 02:29:37 UTC (rev 5939)
@@ -165,7 +165,7 @@
self.tray.set_tooltip(_("Deluge\nNot Connected.."))
def shutdown(self):
- if self.config["enable_system_tray"]:
+ if self.config["enable_system_tray"]:
self.tray.set_visible(False)
def send_status_request(self):
@@ -196,6 +196,9 @@
self.upload_rate = deluge.common.fsize(upload_rate)
def update(self):
+ if not self.config["enable_system_tray"]:
+ return
+
# Set the tool tip text
max_download_speed = self.max_download_speed
max_upload_speed = self.max_upload_speed
--
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=.
