[Pkg-owncloud-commits] [owncloud-client] 01/103: respect XDG_CONFIG_HOME for getting user config dir.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 4e0496f74d9847a18421e0bd3352d76c4e8eb5a1
Author: hefee <hefee at netzguerilla.net>
Date:   Tue Dec 31 02:10:44 2013 +0100

    respect XDG_CONFIG_HOME for getting user config dir.
    
    Under linux the XDG Base Directory Specification define different
    enviroment variables where to store what.
---
 src/mirall/utility_unix.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/mirall/utility_unix.cpp b/src/mirall/utility_unix.cpp
index 9ad786f..62d6d37 100644
--- a/src/mirall/utility_unix.cpp
+++ b/src/mirall/utility_unix.cpp
@@ -26,17 +26,30 @@ static void setupFavLink_private(const QString &folder) {
     }
 }
 
+// returns the autostart directory the linux way
+// and respects the XDG_CONFIG_HOME env variable
+// can be replaces for qt5 with QStandardPaths
+QString getUserAutostartDir_private()
+{
+    QString config = QLatin1String(qgetenv("XDG_CONFIG_HOME"));
+
+    if (config.isEmpty()) {
+        config = QDir::homePath()+QLatin1String("/.config");
+    }
+    config += QLatin1String("/autostart/");
+    return config;
+}
+
 bool hasLaunchOnStartup_private(const QString &appName)
 {
-    QString userAutoStartPath = QDir::homePath()+QLatin1String("/.config/autostart/");
-    QString desktopFileLocation = userAutoStartPath+appName+QLatin1String(".desktop");
+    QString desktopFileLocation = getUserAutostartDir_private()+appName+QLatin1String(".desktop");
     return QFile::exists(desktopFileLocation);
 }
 
 
 void setLaunchOnStartup_private(const QString &appName, const QString& guiName, bool enable)
 {
-    QString userAutoStartPath = QDir::homePath()+QLatin1String("/.config/autostart/");
+    QString userAutoStartPath = getUserAutostartDir_private();
     QString desktopFileLocation = userAutoStartPath+appName+QLatin1String(".desktop");
     if (enable) {
         if (!QDir().exists(userAutoStartPath) && !QDir().mkdir(userAutoStartPath)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git