diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-01-14 22:15:02 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-01-14 22:15:02 +0300 |
commit | 5170fcc8693352970b2e2fcb9a13c896654c955b (patch) | |
tree | 8cd22437cb620dd94bcadda13efcc176f98486cc | |
parent | 24a5939846bf593e17e09f3564d941a7c2a5bf27 (diff) | |
download | manaplus-5170fcc8693352970b2e2fcb9a13c896654c955b.tar.gz manaplus-5170fcc8693352970b2e2fcb9a13c896654c955b.tar.bz2 manaplus-5170fcc8693352970b2e2fcb9a13c896654c955b.tar.xz manaplus-5170fcc8693352970b2e2fcb9a13c896654c955b.zip |
Change default screenshot path from XDG_DESKTOP_DIR into XDG_PICTURES_DIR.
-rw-r--r-- | src/client.cpp | 2 | ||||
-rw-r--r-- | src/utils/paths.cpp | 4 | ||||
-rw-r--r-- | src/utils/paths.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/client.cpp b/src/client.cpp index cd0030f3a..daa2d83a2 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2315,7 +2315,7 @@ void Client::initScreenshotDir() if (!configScreenshotDir.empty()) mScreenshotDir = configScreenshotDir; else - mScreenshotDir = getDesktopDir(); + mScreenshotDir = getPicturesDir(); #endif // config.setValue("screenshotDirectory", mScreenshotDir); diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index 4599efb16..a3f61bde3 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -151,7 +151,7 @@ std::string getSelfName() #endif -std::string getDesktopDir() +std::string getPicturesDir() { #ifdef WIN32 std::string dir = getSpecialFolderLocation(CSIDL_MYPICTURES); @@ -176,7 +176,7 @@ std::string getDesktopDir() FOR_EACH (StringVectCIter, it, arr) { std::string str = *it; - if (findCutFirst(str, "XDG_DESKTOP_DIR=\"")) + if (findCutFirst(str, "XDG_PICTURES_DIR=\"")) { str = str.substr(0, str.size() - 1); // use hack to replace $HOME var. diff --git a/src/utils/paths.h b/src/utils/paths.h index 8ed1fd3d9..a31716dcc 100644 --- a/src/utils/paths.h +++ b/src/utils/paths.h @@ -37,7 +37,7 @@ std::string removeLast(const std::string &str) A_WARN_UNUSED; std::string getSelfName() A_WARN_UNUSED; -std::string getDesktopDir() A_WARN_UNUSED; +std::string getPicturesDir() A_WARN_UNUSED; #ifdef ANDROID std::string getSdStoragePath() A_WARN_UNUSED; |