[Label] Fix gtk warnings when removing menu

This commit is contained in:
Calum Lind 2015-11-30 22:51:16 +00:00
commit c619f05f94

View file

@ -30,25 +30,21 @@ class GtkUI(GtkPluginBase):
def enable(self): def enable(self):
self.plugin = component.get("PluginManager") self.plugin = component.get("PluginManager")
self.torrentmenu = component.get("MenuBar").torrentmenu
self.label_menu = None self.label_menu = None
self.labelcfg = None self.labelcfg = None
self.sidebar_menu = None self.sidebar_menu = None
self.load_interface() self.load_interface()
def disable(self): def disable(self):
try: if self.label_menu in self.torrentmenu.get_children():
torrentmenu = component.get("MenuBar").torrentmenu self.torrentmenu.remove(self.label_menu)
torrentmenu.remove(self.label_menu) # ok
self.labelcfg.unload() # ok self.labelcfg.unload()
self.sidebar_menu.unload() self.sidebar_menu.unload()
del self.sidebar_menu del self.sidebar_menu
component.get("TorrentView").remove_column(_("Label")) component.get("TorrentView").remove_column(_("Label"))
log.debug(1.1)
except Exception as ex:
log.debug(ex)
def load_interface(self): def load_interface(self):
# sidebar # sidebar
@ -59,9 +55,8 @@ class GtkUI(GtkPluginBase):
# menu: # menu:
log.debug("add items to torrentview-popup menu.") log.debug("add items to torrentview-popup menu.")
torrentmenu = component.get("MenuBar").torrentmenu
self.label_menu = submenu.LabelMenu() self.label_menu = submenu.LabelMenu()
torrentmenu.append(self.label_menu) self.torrentmenu.append(self.label_menu)
self.label_menu.show_all() self.label_menu.show_all()
# columns: # columns: