diff options
author | Heinrich Wendel <h_wendel@cojobo.net> | 2005-06-01 14:19:56 +0000 |
---|---|---|
committer | Heinrich Wendel <h_wendel@cojobo.net> | 2005-06-01 14:19:56 +0000 |
commit | befa0eb824c56a6cbf59555b37d0b10466417937 (patch) | |
tree | 32ba6206b7cd332a08e5890a22ab8571db8366cb | |
parent | 6ea2cd8c44384992b7c3f512714608660c583bd3 (diff) |
root mode
-rw-r--r-- | xdg/Menu.py | 12 | ||||
-rw-r--r-- | xdg/MenuEditor.py | 10 |
2 files changed, 13 insertions, 9 deletions
diff --git a/xdg/Menu.py b/xdg/Menu.py index 563e4ad..598077a 100644 --- a/xdg/Menu.py +++ b/xdg/Menu.py @@ -413,10 +413,13 @@ class MenuEntry: self.__setFilename() # Can be one of System/User/Both - if xdg_data_dirs[0] in self.DesktopEntry.filename: - self.Type = "User" + if tmp["root"] == False: + if xdg_data_dirs[0] in self.DesktopEntry.filename: + self.Type = "User" + else: + self.Type = "System" else: - self.Type = "System" + self.Type = "User" def updateAttributes(self): if self.Type == "System": @@ -465,7 +468,7 @@ class Header: tmp = {} -def parse(filename=None): +def parse(filename=None, root=False): # if no file given, try default files if not filename: for dir in xdg_config_dirs: @@ -494,6 +497,7 @@ def parse(filename=None): tmp["mergeFiles"] = [] tmp["DirectoryDirs"] = [] tmp["cache"] = MenuEntryCache() + tmp["root"] = root __parse(doc, filename, tmp["Root"]) __parsemove(tmp["Root"]) diff --git a/xdg/MenuEditor.py b/xdg/MenuEditor.py index 5b81051..48bd514 100644 --- a/xdg/MenuEditor.py +++ b/xdg/MenuEditor.py @@ -28,17 +28,17 @@ class MenuEditor: # fix for creating two menus with the same name on the fly self.filenames = [] - def parse(self, menu=None, filename=None): + def parse(self, menu=None, filename=None, root=False): if isinstance(menu, Menu): self.menu = menu elif isinstance(menu, unicode): - self.menu = parse(menu) + self.menu = parse(parse_path, root) else: - self.menu = parse() + self.menu = parse(root) if filename: - self.filename = filename - elif os.access(self.menu.Filename, os.W_OK): + self.filename = save_path + elif root == True: self.filename = self.menu.Filename else: self.filename = os.path.join(xdg_config_dirs[0], "menus", os.path.split(self.menu.Filename)[1]) |