version 0.18

6 files changed, 21 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index f5375e2..cbbf143 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Version 0.18
 
+    * DesktopEntry.py: Add getMimeTypes() method, correctly returning strings
+    * DesktopEntry.py: Deprecated getMimeType() returning list of regex
+    * Menu.py: Add support for XDG_MENU_PREFIX
     * Mime.py: Add get_type_by_contents()
 
 Version 0.17
diff --git a/README b/README
index 3a64797..bb24d38 100644
--- a/README
+++ b/README
@@ -1,19 +1,20 @@
 The XDG Package contains:
 
 	- Implementation of the XDG-Base-Directory Standard
-	  http://www.freedesktop.org/standards/basedir-spec
+      http://standards.freedesktop.org/basedir-spec/
 
 	- Implementation of the XDG-Desktop Standard
-	  http://www.freedesktop.org/standards/desktop-entry-spec
+      http://standards.freedesktop.org/basedir-spec/
 
 	- Implementation of the XDG-Menu Standard
-	  http://www.freedesktop.org/standards/menu-spec
+      http://standards.freedesktop.org/basedir-spec/
 
 	- Implementation of the XDG-Icon-Theme Standard
-	  http://www.freedesktop.org/standards/icon-theme-spec
+      http://standards.freedesktop.org/basedir-spec/
 
 	- Implementation of the XDG-Shared MIME-info Database
-	  http://www.freedesktop.org/standards/shared-mime-info
+      http://standards.freedesktop.org/basedir-spec/
 
 	- Implementation of the XDG-Recent File Storage Specification
-	  http://www.freedesktop.org/standards/recent-file-spec
+    http://standards.freedesktop.org/basedir-spec/
+
diff --git a/setup.py b/setup.py
index 1eaf37c..e806723 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 setup( name = "pyxdg",
-       version = "0.17",
+       version = "0.18",
        description = "PyXDG contains implementations of freedesktop.org standards in python.",
        maintainer = "Heinrich Wendel",
        maintainer_email = "h_wendel@cojobo.net",
diff --git a/test/test-desktop.py b/test/test-desktop.py
index 0e3c823..831c368 100755
--- a/test/test-desktop.py
+++ b/test/test-desktop.py
@@ -16,7 +16,7 @@ def checkfiles(path):
             print e
             return
 
-        entry.setLocale("C")
+        #entry.setLocale("C")
         entry.getName()
 
         try:
diff --git a/xdg/DesktopEntry.py b/xdg/DesktopEntry.py
index 12befb4..5dd8e62 100644
--- a/xdg/DesktopEntry.py
+++ b/xdg/DesktopEntry.py
@@ -67,8 +67,11 @@ class DesktopEntry(IniFile):
         return self.get('SwallowExec')
     def getActions(self):
         return self.get('Actions', list=True)
+    """ @deprecated, use getMimeTypes instead """
     def getMimeType(self):
         return self.get('MimeType', list=True, type="regex")
+    def getMimeTypes(self):
+        return self.get('MimeType', list=True)
     def getSortOrder(self): 
         return self.get('SortOrder', list=True)
     def getDev(self):
@@ -362,7 +365,7 @@ class DesktopEntry(IniFile):
             self.errors.append("Invalid key: %s" % key)
 
     def checkType(self, key, type):
-        if not self.type == type:
+        if not self.getType() == type:
             self.errors.append("Key '%s' only allowed in Type=%s" % (key, type))
 
     def checkOnlyShowIn(self, value):
diff --git a/xdg/Menu.py b/xdg/Menu.py
index 240d157..d437ee4 100644
--- a/xdg/Menu.py
+++ b/xdg/Menu.py
@@ -498,11 +498,12 @@ def parse(filename=None):
         filename = __getFileName(filename)
 
     # use default if no filename given
+    if not filename: 
+        candidate = os.environ.get('XDG_MENU_PREFIX', '') + "applications.menu"
+        filename = __getFileName(candidate)
+        
     if not filename:
-        filename = __getFileName("applications.menu")
-
-    if not filename:
-        raise ParsingError('File not found', "/etc/xdg/menus/applications.menu")
+        raise ParsingError('File not found', "/etc/xdg/menus/%s" % candidate)
 
     # check if it is a .menu file
     if not os.path.splitext(filename)[1] == ".menu":