summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2018-07-31 20:07:32 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2018-07-31 20:07:32 +0000
commit3dd19a7be7d59aecafaf496e4794afaf8fab542c (patch)
tree811d07d064c4b7e0bece85e59af9ff32e44595c9 /src/main.cpp
parentFirst try co fix icons bugs (diff)
downloadinkscape-3dd19a7be7d59aecafaf496e4794afaf8fab542c.tar.gz
inkscape-3dd19a7be7d59aecafaf496e4794afaf8fab542c.zip
Fixing tests broken
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 04fa4ec37..5a6f04d44 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -622,19 +622,20 @@ static void set_datadir_env()
{
gchar const *xgd = g_getenv("XDG_DATA_DIRS");
#ifdef _WIN32
- Glib::ustring pathwraper = "'";
+ Glib::ustring datadir = "'" + get_datadir_path() + "'";
+ datadir += ":";
+ datadir += "'" + append_inkscape_datadir("inkscape") + "'";
#else
- Glib::ustring pathwraper = "";
-#endif
- Glib::ustring datadir = pathwraper + get_datadir_path() + pathwraper;
+ Glib::ustring datadir = get_datadir_path();
datadir += ":";
- datadir += pathwraper + append_inkscape_datadir("inkscape") + pathwraper;
+ datadir += append_inkscape_datadir("inkscape");
+#endif
if (xgd) {
datadir += ":";
- datadir += pathwraper + xgd + pathwraper;
+ datadir += xgd;
}
g_setenv("XDG_DATA_DIRS", datadir.c_str(), TRUE);
- // printf("XDG_DATA_DIRS = %s\n", g_getenv("XDG_DATA_DIRS"));
+ printf("XDG_DATA_DIRS = %s\n", g_getenv("XDG_DATA_DIRS"));
}
/**