[Sugar-devel] [PATCH sugar] Only show DOCUMENTS folder when it is not $HOME

[Simon Schampijer]

'xdg-user-dir DOCUMENTS' will return $HOME when DOCUMENTS
does not exist, only display the DOCUMENTS folder
when the actual folder exists

Signed-off-by: Simon Schampijer <simon at laptop.org>
---
 src/jarabe/journal/volumestoolbar.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
index 84d9e31..1cc764f 100644
--- a/src/jarabe/journal/volumestoolbar.py
+++ b/src/jarabe/journal/volumestoolbar.py
@@ -67,8 +67,9 @@ def _get_documents_path():
     try:
         pipe = subprocess.Popen(['xdg-user-dir', 'DOCUMENTS'],
                                 stdout=subprocess.PIPE)
-        documents_path = pipe.communicate()[0].strip()
-        if os.path.exists(documents_path):
+        documents_path = os.path.normpath(pipe.communicate()[0].strip())
+        if os.path.exists(documents_path) and \
+                os.environ.get('HOME') != documents_path:
             return documents_path
     except OSError, exception:
         if exception.errno != errno.ENOENT:
-- 
1.7.4.4