diff options
| author | Heinrich Wendel <h_wendel@cojobo.net> | 2005-06-02 20:00:09 +0000 |
|---|---|---|
| committer | Heinrich Wendel <h_wendel@cojobo.net> | 2005-06-02 20:00:09 +0000 |
| commit | 6eed0f10efe9abe80333821af019444e36b2b5a1 (patch) | |
| tree | b5bbadce24d48151ed5170267e9939ee39236c38 | |
| parent | 88be0020f80df817f966ff4c09cdd947f9b97870 (diff) | |
bug fix relesae
| -rw-r--r-- | xdg/Menu.py | 6 | ||||
| -rw-r--r-- | xdg/MenuEditor.py | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/xdg/Menu.py b/xdg/Menu.py index cd76aa4..39415a9 100644 --- a/xdg/Menu.py +++ b/xdg/Menu.py @@ -476,7 +476,11 @@ class Header: tmp = {} def __getFileName(filename): - for dir in xdg_config_dirs: + dirs = xdg_config_dirs[:] + if xdg.Config.root_mode == True: + dirs.pop(0) + + for dir in dirs: menuname = os.path.join (dir, "menus" , filename) if os.path.isdir(dir) and os.path.isfile(menuname): return menuname diff --git a/xdg/MenuEditor.py b/xdg/MenuEditor.py index 9061834..4e2df56 100644 --- a/xdg/MenuEditor.py +++ b/xdg/MenuEditor.py @@ -30,6 +30,9 @@ class MenuEditor: self.filenames = [] def parse(self, menu=None, filename=None, root=False): + if root == True: + setRootMode(True) + if isinstance(menu, Menu): self.menu = menu elif menu: @@ -39,9 +42,8 @@ class MenuEditor: if root == True: self.filename = self.menu.Filename - setRootMode(True) elif filename: - self.filename = save_path + self.filename = filename else: self.filename = os.path.join(xdg_config_dirs[0], "menus", os.path.split(self.menu.Filename)[1]) |