Package: alacarte Version: 0.12.4-1 --- Please enter the report below this line. ---
Hi, the previously mentioned tab/space issue is not present in MainWindow.py anymore. But the attached patch fixes another space/tab issue in MenuEditor.py and additionally removes some trailing whitespaces. The bug can be closed anyway. thanks, Lars --- System information. --- Architecture: i386 Kernel: Linux 2.6.30-2-686 Debian Release: squeeze/sid 990 testing localhost --- Package information. --- Depends (Version) | Installed ===============================-+-============= python (>= 2.4) | 2.5.4-2 python-support (>= 0.90.0) | 1.0.6 python-gtk2 (>= 2.13.0) | 2.16.0-1 python-gmenu (>= 2.27.92) | 2.28.0.1-1 gnome-menus (>= 2.27.92) | 2.28.0.1-1 python-gobject (>= 2.15.1) | 2.20.0-1 Recommends (Version) | Installed ==========================-+-=========== gnome-panel | 2.28.0-3 Package's Suggests field is empty. -- gpg key: https://systemausfall.org/schluessel/lars-devel.0.asc
diff -ruN Alacarte.orig/MenuEditor.py Alacarte/MenuEditor.py --- Alacarte.orig/MenuEditor.py 2009-12-21 22:59:55.000000000 +0100 +++ Alacarte/MenuEditor.py 2009-12-22 16:47:32.000000000 +0100 @@ -48,16 +48,16 @@ self.applications.dom = xml.dom.minidom.parse(self.applications.path) self.__remove_whilespace_nodes(self.applications.dom) - self.settings = Menu() + self.settings = Menu() self.settings.tree = gmenu.lookup_tree('settings.menu', gmenu.FLAGS_SHOW_EMPTY|gmenu.FLAGS_INCLUDE_EXCLUDED|gmenu.FLAGS_INCLUDE_NODISPLAY|gmenu.FLAGS_SHOW_ALL_SEPARATORS) - self.settings.visible_tree = gmenu.lookup_tree('settings.menu') + self.settings.visible_tree = gmenu.lookup_tree('settings.menu') self.settings.tree.sort_key = gmenu.SORT_DISPLAY_NAME self.settings.visible_tree.sort_key = gmenu.SORT_DISPLAY_NAME - self.settings.path = os.path.join(util.getUserMenuPath(), self.settings.tree.get_menu_file()) - if not os.path.isfile(self.settings.path): - self.settings.dom = xml.dom.minidom.parseString(util.getUserMenuXml(self.settings.tree)) - else: - self.settings.dom = xml.dom.minidom.parse(self.settings.path) + self.settings.path = os.path.join(util.getUserMenuPath(), self.settings.tree.get_menu_file()) + if not os.path.isfile(self.settings.path): + self.settings.dom = xml.dom.minidom.parseString(util.getUserMenuXml(self.settings.tree)) + else: + self.settings.dom = xml.dom.minidom.parse(self.settings.path) self.__remove_whilespace_nodes(self.settings.dom) self.save(True) @@ -478,7 +478,7 @@ def __getPath(self, menu, path=None): if not path: - path = menu.tree.root.get_menu_id() + path = menu.tree.root.get_menu_id() if menu.get_parent(): path = self.__getPath(menu.get_parent(), path) path += '/'
signature.asc
Description: PGP signature