Ticket #2086: 0001-Remove-workaround-for-LP-608219-now-that-it-s-fixed.patch

File 0001-Remove-workaround-for-LP-608219-now-that-it-s-fixed.patch, 1.9 KB (added by Andareed, 12 years ago)

  • deluge/ui/gtkui/systemtray.py 

    From 334985cf3b4b7fef4118276bb578c4d91dbddb1c Mon Sep 17 00:00:00 2001
From: David Bartley <andareed@gmail.com>
Date: Sun, 15 Apr 2012 12:46:35 -0700
Subject: [PATCH] Remove workaround for LP #608219 now that it's fixed.

---
 deluge/ui/gtkui/systemtray.py |   14 --------------
 1 file changed, 14 deletions(-)

diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py
index 3aaf3fc..948b70a 100644
    a b def __start(self):  
    157157                self.builder.get_object("menuitem_quitdaemon").hide()
    158158                self.builder.get_object("separatormenuitem4").hide()
    159159
    160             # These do not work with appindicator currently and can crash Deluge.
    161             # Related to Launchpad bug #608219
    162             if appindicator and self.config["enable_appindicator"]:
    163                 self.hide_widget_list.remove("menuitem_download_limit")
    164                 self.hide_widget_list.remove("menuitem_upload_limit")
    165                 self.hide_widget_list.remove("separatormenuitem3")
    166                 self.builder.get_object("menuitem_download_limit").hide()
    167                 self.builder.get_object("menuitem_upload_limit").hide()
    168                 self.builder.get_object("separatormenuitem3").hide()
    169 
    170160            # Show widgets in the hide list because we've connected to a host
    171161            for widget in self.hide_widget_list:
    172162                self.builder.get_object(widget).show()
    … … def build_tray_bwsetsubmenu(self):  
    281271        submenu_bwdownset.show_all()
    282272        submenu_bwupset.show_all()
    283273
    284         # Re-set the menu to partly work around Launchpad bug #608219
    285         if appindicator and self.config["enable_appindicator"]:
    286             self.indicator.set_menu(self.tray_menu)
    287 
    288274    def disable(self,invert_app_ind_conf=False):
    289275        """Disables the system tray icon or appindicator."""
    290276        try: