From 3dd19a7be7d59aecafaf496e4794afaf8fab542c Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Tue, 31 Jul 2018 22:07:32 +0200 Subject: Fixing tests broken --- src/main.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/main.cpp') 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")); } /** -- cgit v1.2.3