summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Wendel <h_wendel@cojobo.net>2005-05-30 11:53:52 +0000
committerHeinrich Wendel <h_wendel@cojobo.net>2005-05-30 11:53:52 +0000
commit8b5afbeb35885fa7faa637e6328edd9faeaf998f (patch)
tree1cfaa6e73ff5f21a4a8ab31b13efbd57c470cd24
parent4c923c98f75354c0cfc3ab224dd0a03e3ce371d7 (diff)
fix getaction
-rw-r--r--xdg/MenuEditor.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/xdg/MenuEditor.py b/xdg/MenuEditor.py
index 7291b4b..d52c517 100644
--- a/xdg/MenuEditor.py
+++ b/xdg/MenuEditor.py
@@ -198,7 +198,7 @@ class MenuEditor:
return menu
def deleteMenuEntry(self, menuentry):
- if "delete" in self.getActions(menuentry):
+ if self.getActions(menuentry) == "delete":
self.__deleteFile(menuentry.DesktopEntry.filename)
for parent in menuentry.Parents:
self.__deleteEntry(parent, menuentry)
@@ -206,7 +206,7 @@ class MenuEditor:
return menuentry
def revertMenuEntry(self, menuentry):
- if "revert" in self.getActions(menuentry):
+ if self.getAction(menuentry) == "revert":
self.__deleteFile(menuentry.DesktopEntry.filename)
for parent in menuentry.Parents:
index = parent.Entries.index(menuentry)
@@ -217,7 +217,7 @@ class MenuEditor:
return menuentry
def deleteMenu(self, menu):
- if "delete" in self.getActions(menu):
+ if self.getAction(menu) == "delete":
self.__deleteFile(menu.Directory.DesktopEntry.filename)
self.__deleteEntry(menu.Parent, menu)
xml_menu = self.__getXmlMenu(menu.getPath(True, True))
@@ -226,7 +226,7 @@ class MenuEditor:
return menu
def revertMenu(self, menu):
- if "revert" in self.getActions(menu):
+ if self.getAction(menu) == "revert":
self.__deleteFile(menu.Directory.DesktopEntry.filename)
menu.Directory = menu.Directory.Original
sort(self.menu)
@@ -240,7 +240,7 @@ class MenuEditor:
return separator
""" Private Stuff """
- def getActions(self, entry):
+ def getAction(self, entry):
if isinstance(entry, Menu):
if not isinstance(entry.Directory, MenuEntry):
return "none"
@@ -252,8 +252,8 @@ class MenuEditor:
return "revert"
else:
for node in self.__getXmlNodesByName("Directory", xml_menu):
- return ["delete", "revert"]
- return "delete"
+ return "delete"
+ return "revert"
elif isinstance(entry, MenuEntry):
if entry.Type == "Both":