[alacarte] MenuEditor: Remove visible_tree mess
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [alacarte] MenuEditor: Remove visible_tree mess
- Date: Wed, 20 Jun 2012 23:01:31 +0000 (UTC)
commit 68c1527952d99394fba0bd6523ad9d4286fe2691
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Jun 19 15:02:43 2012 -0400
MenuEditor: Remove visible_tree mess
Alacarte/MenuEditor.py | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/Alacarte/MenuEditor.py b/Alacarte/MenuEditor.py
index 352379e..d599250 100644
--- a/Alacarte/MenuEditor.py
+++ b/Alacarte/MenuEditor.py
@@ -27,7 +27,6 @@ class Menu(object):
self.name = name
self.tree = GMenu.Tree.new(name, GMenu.TreeFlags.SHOW_EMPTY|GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.INCLUDE_NODISPLAY|GMenu.TreeFlags.SHOW_ALL_SEPARATORS|GMenu.TreeFlags.SORT_DISPLAY_NAME)
- self.visible_tree = GMenu.Tree.new(name, GMenu.TreeFlags.SORT_DISPLAY_NAME)
self.load()
self.path = os.path.join(util.getUserMenuPath(), self.tree.props.menu_basename)
@@ -43,8 +42,6 @@ class Menu(object):
def load(self):
if not self.tree.load_sync():
raise ValueError("can not load menu tree %r" % (self.name,))
- if not self.visible_tree.load_sync():
- raise ValueError("can not load menu tree %r" % (self.name,))
class MenuEditor(object):
def __init__(self):
@@ -356,11 +353,8 @@ class MenuEditor(object):
if isinstance(item, GMenu.TreeEntry):
app_info = item.get_app_info()
return not (item.get_is_excluded() or app_info.get_nodisplay())
-
- root = self.applications.visible_tree.get_root_directory()
- if isinstance(item, GMenu.TreeDirectory):
- if self.findMenu(item.get_menu_id(), root) is None:
- return False
+ elif isinstance(item, GMenu.TreeDirectory):
+ return not item.get_is_nodisplay()
return True
def getPath(self, menu):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]