-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hello,
I've just made a fix for xdg directory.
Currently I try to fix a few annoying bugs in launchy. They can be found in:

https://github.com/wofwofwof/Launchy

- -- 
cheers

wof


commit 5d7967a258921f67ed8014f7b78cf2ea048263af
Author: wof <m...@stachelkaktus.net>
Date:   Fri Oct 30 18:16:38 2015 +0100

    honor XDGBaseDirectorySpecification from debian for config directories

diff --git a/trunk/Launchy_QT/platforms/unix/platform_unix.cpp 
b/trunk/Launchy_QT/platforms/unix/platform_unix.cpp
index a5394d2..75d0d30 100644
- --- a/trunk/Launchy_QT/platforms/unix/platform_unix.cpp
+++ b/trunk/Launchy_QT/platforms/unix/platform_unix.cpp
@@ -96,23 +96,29 @@ QList<Directory> 
PlatformUnix::getDefaultCatalogDirectories() {
 QHash<QString, QList<QString> > PlatformUnix::getDirectories() {
     QHash<QString, QList<QString> > out;
     QDir d;
- -    d.mkdir(QDir::homePath() + "/.launchy");
+
+    QString xdg_config_home = qgetenv("XDG_CONFIG_HOME").constData();
+    if (xdg_config_home.isEmpty()) {
+        xdg_config_home = QDir::homePath() + "/.config/launchy";
+    }
+
+    d.mkdir(xdg_config_home);
     
     out["skins"] += qApp->applicationDirPath() + "/skins";
- -    out["skins"] += QDir::homePath() + "/.launchy/skins";
+    out["skins"] += xdg_config_home + "/skins";
     out["skins"] += SKINS_PATH;
 
     out["plugins"] += qApp->applicationDirPath() + "/plugins";
- -    out["plugins"] += QDir::homePath() + "/.launchy/plugins";
+    out["plugins"] += xdg_config_home + "/plugins";
     out["plugins"] += PLUGINS_PATH;
 
- -    out["config"] += QDir::homePath() + "/.launchy";
+    out["config"] += xdg_config_home;
     out["portableConfig"] += qApp->applicationDirPath();
     
     if (QFile::exists(out["skins"].last() + "/Default"))
- -       out["defSkin"] += out["skins"].last() + "/Default";
+        out["defSkin"] += out["skins"].last() + "/Default";
     else
- -      out["defSkin"] += out["skins"].first() + "/Default";
+        out["defSkin"] += out["skins"].first() + "/Default";
 
     out["platforms"] += qApp->applicationDirPath();
     out["platforms"] += PLATFORMS_PATH;


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWNJUpAAoJEG77w815zV8viCcP/RGlyUp8I6C8t1E6KSKvJseM
dbad4Z1oP9xybvGzLvKX5pVCV7XreT7bHb2GGqOaRaNY27PnwmO841wq29CIS+o+
RzOec15zu+pTpMUC2osoxRy6cJ4Oz6rcH7T0zI60XgvYJlpdwDu3kuH8KyD0jheV
lhrp27JjEwKfkk3rtFJ9QDxVUUJZZqbGOTk9W9bo7H9iC/Fbu09/AqFtjv3Pau1L
ooN9j3lrDVMlzbu8VBzSp4lQepW2WkUR7cLxDEsosLEKlnZHQRqOeq1SQQtfq3gt
z8erWQCkR4eCdP8HnyF0mjR4/nzyNoqegQ6VyELlOoHfr7oRiex+WhAS5Eu+26wV
I48U7bp5OAKThHDIE0iioUoErGW+nPHBa5vD2tVZgw3o+gbH4R9t9CzJl7Co3oZm
H6F6sze89l7F0rNv0P+N6QSSFAy+5oX9yX072+a2/FsfBm5Mv8eUSCKGwD98mcwO
ItHhFu2h57HXA7NpTL/PjQHtvBkRXtKhFOIFXD+YMZswZqmKglR1sS0aRq5shOii
oalVwzSRGb8qK/RsvgIOpCzG9TLxG0fs9l15xkuNX8FdZwMBSZHf62LA1gY0BM3d
d7PDKwG0HNARjH6Rh2YDuejDdYOjkK6O8FdJUVoKUdhLUZl4ibnlaXIzM6Ho5BO5
2n1y/U5w36NPA12RHI2X
=a3X3
-----END PGP SIGNATURE-----

Reply via email to