From e8845e56eb26305ca1f2fa4efc5b5c20879664b4 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Tue, 31 Jul 2018 00:53:20 +0200 Subject: First try co fix icons bugs --- src/main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main.cpp') 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")); -- cgit v1.2.3