diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-30 22:53:20 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-31 19:45:21 +0000 |
| commit | e8845e56eb26305ca1f2fa4efc5b5c20879664b4 (patch) | |
| tree | d82f89e296d9b55c4c37b50a1089c2d0fcc4a864 /src/main.cpp | |
| parent | Merge branch 'improve-snap-packaging' of gitlab.com:Lin-Buo-Ren/inkscape (diff) | |
| download | inkscape-e8845e56eb26305ca1f2fa4efc5b5c20879664b4.tar.gz inkscape-e8845e56eb26305ca1f2fa4efc5b5c20879664b4.zip | |
First try co fix icons bugs
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp index d9a1d37df..04fa4ec37 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -621,17 +621,17 @@ static void set_extensions_env() static void set_datadir_env() { gchar const *xgd = g_getenv("XDG_DATA_DIRS"); - Glib::ustring datadir = get_datadir_path(); - datadir += ":"; - datadir += INKSCAPE_DATADIR; -#ifdef WIN32 - datadir += g_win32_locale_filename_from_utf8("/inkscape"); +#ifdef _WIN32 + Glib::ustring pathwraper = "'"; #else - datadir += "/inkscape"; + Glib::ustring pathwraper = ""; #endif + Glib::ustring datadir = pathwraper + get_datadir_path() + pathwraper; + datadir += ":"; + datadir += pathwraper + append_inkscape_datadir("inkscape") + pathwraper; if (xgd) { datadir += ":"; - datadir += xgd; + datadir += pathwraper + xgd + pathwraper; } g_setenv("XDG_DATA_DIRS", datadir.c_str(), TRUE); // printf("XDG_DATA_DIRS = %s\n", g_getenv("XDG_DATA_DIRS")); |