diff options
| author | Heinrich Wendel <h_wendel@cojobo.net> | 2008-08-07 17:05:45 +0000 |
|---|---|---|
| committer | Heinrich Wendel <h_wendel@cojobo.net> | 2008-08-07 17:05:45 +0000 |
| commit | d162ff582ba8684caeedac1c6bdff38b8767e934 (patch) | |
| tree | 00f07fba237ebfb696ca3fe19abb50fef5e3ea2d | |
| parent | d8ad5ee28409ead94cb2667ac96c729a8aadcd33 (diff) | |
do not only search in /usr/share/pixmaps but also in all xdg_data_dirs, although that does not correspond to the specification it makes sense
| -rw-r--r-- | xdg/IconTheme.py | 2 | ||||
| -rw-r--r-- | xdg/IniFile.py | 2 | ||||
| -rw-r--r-- | xdg/Menu.py | 2 | ||||
| -rw-r--r-- | xdg/__init__.py | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/xdg/IconTheme.py b/xdg/IconTheme.py index 41172c2..1f1fa18 100644 --- a/xdg/IconTheme.py +++ b/xdg/IconTheme.py @@ -215,7 +215,7 @@ class IconData(IniFile): icondirs = [] for basedir in xdg_data_dirs: icondirs.append(os.path.join(basedir, "icons")) -icondirs.append("/usr/share/pixmaps") + icondirs.append(os.path.join(basedir, "pixmaps")) icondirs.append(os.path.expanduser("~/.icons")) # just cache variables, they give a 10x speed improvement diff --git a/xdg/IniFile.py b/xdg/IniFile.py index 9508a5e..161e885 100644 --- a/xdg/IniFile.py +++ b/xdg/IniFile.py @@ -1,7 +1,5 @@ """ Base Class for DesktopEntry, IconTheme and IconData - -TODO: parse string """ import re, os.path, codecs diff --git a/xdg/Menu.py b/xdg/Menu.py index fd62f12..c31e7a5 100644 --- a/xdg/Menu.py +++ b/xdg/Menu.py @@ -445,7 +445,7 @@ class MenuEntry: def __cmp__(self, other): return locale.strcoll(self.DesktopEntry.getName(), other.DesktopEntry.getName()) - def __eq__(self,other): + def __eq__(self, other): if self.DesktopFileID == str(other): return True else: diff --git a/xdg/__init__.py b/xdg/__init__.py index 01191c1..870cd00 100644 --- a/xdg/__init__.py +++ b/xdg/__init__.py @@ -1 +1 @@ -__all__ = [ "BaseDirectory", "DesktopEntry", "Menu", "Exceptions", "IniFile", "IconTheme", "Locale", "Config", "Mime", "RecentFile", "MenuEditor" ] +__all__ = [ "BaseDirectory", "DesktopEntry", "Menu", "Exceptions", "IniFile", "IconTheme", "Locale", "Config", "Mime", "RecentFiles", "MenuEditor" ] |