diff options
| author | Heinrich Wendel <h_wendel@cojobo.net> | 2005-08-04 08:42:56 +0000 |
|---|---|---|
| committer | Heinrich Wendel <h_wendel@cojobo.net> | 2005-08-04 08:42:56 +0000 |
| commit | d5d5778b8f89d5a4e5d6cd96931b5eef376d48d1 (patch) | |
| tree | 3e722f638553b7508aaf5ccbf3e8035dbb9ce798 | |
| parent | 80b1c332b0718d7c8f41da36999f901556942184 (diff) | |
small bugfixes
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | xdg/IconTheme.py | 4 | ||||
| -rw-r--r-- | xdg/Menu.py | 6 |
3 files changed, 8 insertions, 5 deletions
@@ -1,3 +1,6 @@ +2005-08-04 Heinrich Wendel <h_wendel@cojobo.net> + * Menu.py, IconTheme.py: Bugfixes... + Versinon 0.14 2005-06-02 Heinrich Wendel <h_wendel@cojobo.net> diff --git a/xdg/IconTheme.py b/xdg/IconTheme.py index 99dce99..ab5b460 100644 --- a/xdg/IconTheme.py +++ b/xdg/IconTheme.py @@ -237,8 +237,8 @@ def getIconPath(iconname, size = None, theme = None, extensions = ["png", "svg", return iconname # check if it has an extension and strip it - if re.match("(.*)\.([^.]*)", iconname): - iconname = re.sub("(.*)\.([^.]*)", "\\1", iconname) + if os.path.splitext(iconname)[1] in extensions: + iconname = os.path.splitext(iconname)[0] # parse theme files try: diff --git a/xdg/Menu.py b/xdg/Menu.py index 13b6b62..3a8c93e 100644 --- a/xdg/Menu.py +++ b/xdg/Menu.py @@ -4,7 +4,7 @@ http://standards.freedesktop.org/menu-spec/ """ from __future__ import generators -import os, xml.dom.minidom +import locale, os, xml.dom.minidom from xdg.BaseDirectory import * from xdg.DesktopEntry import * @@ -82,7 +82,7 @@ class Menu: # FIXME: Performance: cache getName() def __cmp__(self, other): - return cmp(self.getName(), other.getName()) + return locale.strcoll(self.getName(), other.getName()) def __eq__(self, other): if self.Name == str(other): @@ -443,7 +443,7 @@ class MenuEntry: self.DesktopEntry.filename = os.path.join(dir, self.Filename) def __cmp__(self, other): - return cmp(self.DesktopEntry.getName(), other.DesktopEntry.getName()) + return locale.strcoll(self.DesktopEntry.getName(), other.DesktopEntry.getName()) def __eq__(self,other): if self.DesktopFileID == str(other): |