Merge lp:~3v1n0/sni-qt/use-xdg-runtime-dir into lp:sni-qt

[Marco Trevisan (Treviño)]

fsutils: always use $XDG_RUNTIME_DIR if it's set for saving icons

Now that also $SNAP supports it, we can just be less hackish

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'src/fsutils.cpp'
--- src/fsutils.cpp	2016-11-16 17:00:33 +0000
+++ src/fsutils.cpp	2017-01-12 15:23:22 +0000
@@ -33,13 +33,16 @@
 QString generateTempDir(const QString& prefix)
 {
     QDir dir;
+    QString path = QString::fromUtf8(getenv("XDG_RUNTIME_DIR"));
 
-    if (!getenv("SNAP")) {
+    if (!path.isEmpty()) {
+        dir.setPath(path);
+    } else if (!getenv("SNAP")) {
         dir = QDir::temp();
     } else {
         // Try to get the .cache from $XDG_CACHE_HOME, if it's not set,
         // it has to be in ~/.cache as per XDG standard
-        QString path = QString::fromUtf8(getenv("XDG_CACHE_HOME"));
+        path = QString::fromUtf8(getenv("XDG_CACHE_HOME"));
         if (path.isEmpty()) {
             path = QDir::cleanPath(QDir::homePath() + "/.cache");
         }

=== modified file 'tests/auto/fsutilstest.cpp'
--- tests/auto/fsutilstest.cpp	2011-10-15 12:32:18 +0000
+++ tests/auto/fsutilstest.cpp	2017-01-12 15:23:22 +0000
@@ -49,6 +49,7 @@
     {
         QDir::setCurrent(m_baseDirName);
         m_sandBoxDirName = m_baseDirName + "/sandbox";
+        setenv("XDG_RUNTIME_DIR", m_sandBoxDirName.toLocal8Bit().constData(), 1 /*overwrite*/);
         setenv("TMPDIR", m_sandBoxDirName.toLocal8Bit().constData(), 1 /*overwrite*/);
     }