[Telepathy-commits] [telepathy-qt4/master] ManagerFile: Proper check for XDG_DATA_DIRS.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Wed Feb 11 09:52:46 PST 2009
---
TelepathyQt4/manager-file.cpp | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/TelepathyQt4/manager-file.cpp b/TelepathyQt4/manager-file.cpp
index bb71146..0fcd5da 100644
--- a/TelepathyQt4/manager-file.cpp
+++ b/TelepathyQt4/manager-file.cpp
@@ -74,14 +74,13 @@ void ManagerFile::Private::init()
configDirs << xdgDataHome + QLatin1String("/telepathy/managers/");
}
- QStringList xdgDataDirs = QString::fromLocal8Bit(
- qgetenv("XDG_DATA_DIRS")).split(QLatin1Char(':'));
-
- if (xdgDataDirs.isEmpty()) {
+ QString xdgDataDirsEnv = QString::fromLocal8Bit(qgetenv("XDG_DATA_DIRS"));
+ if (xdgDataDirsEnv.isEmpty()) {
configDirs << "/usr/local/share/telepathy/managers/";
configDirs << "/usr/share/telepathy/managers/";
}
else {
+ QStringList xdgDataDirs = xdgDataDirsEnv.split(QLatin1Char(':'));
Q_FOREACH (const QString xdgDataDir, xdgDataDirs) {
configDirs << xdgDataDir + QLatin1String("/telepathy/managers/");
}
--
1.5.6.5
More information about the telepathy-commits
mailing list