summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2015-09-18 09:39:49 +0200
committerFlorent Le Coz <louiz@louiz.org>2015-09-18 21:50:54 +0200
commit33fa1dcd5a87035de1d9b8df65e5c7551b4bbd1b (patch)
tree4aed271a59ee3ce6967c56e68388fc711a21dd38 /src
parentea0b2f2bb871e7760d1936bb9b193655682df413 (diff)
downloadbiboumi-33fa1dcd5a87035de1d9b8df65e5c7551b4bbd1b.tar.gz
biboumi-33fa1dcd5a87035de1d9b8df65e5c7551b4bbd1b.tar.bz2
biboumi-33fa1dcd5a87035de1d9b8df65e5c7551b4bbd1b.tar.xz
biboumi-33fa1dcd5a87035de1d9b8df65e5c7551b4bbd1b.zip
Also a xdg_data_path
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp2
-rw-r--r--src/test.cpp7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 5c9e071..a160df9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -69,7 +69,7 @@ int main(int ac, char** av)
if (ac > 1)
Config::filename = av[1];
else
- Config::filename = xdg_path("biboumi.cfg");
+ Config::filename = xdg_config_path("biboumi.cfg");
Config::file_must_exist = true;
std::cerr << "Using configuration file: " << Config::filename << std::endl;
diff --git a/src/test.cpp b/src/test.cpp
index b8737e6..3ac0332 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -13,6 +13,7 @@
#include <utils/revstr.hpp>
#include <irc/irc_user.hpp>
#include <utils/split.hpp>
+#include <utils/xdg.hpp>
#include <xmpp/jid.hpp>
#include <irc/iid.hpp>
#include <string.h>
@@ -423,6 +424,12 @@ int main()
res = xdg_config_path("coucou.txt");
std::cout << res << std::endl;
assert(res == "/some_weird_dir/biboumi/coucou.txt");
+
+ ::setenv("XDG_DATA_HOME", "/datadir", 1);
+ res = xdg_data_path("bonjour.txt");
+ std::cout << res << std::endl;
+ assert(res == "/datadir/biboumi/bonjour.txt");
+
}
return 0;