diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-31 20:07:32 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-31 20:07:32 +0000 |
| commit | 3dd19a7be7d59aecafaf496e4794afaf8fab542c (patch) | |
| tree | 811d07d064c4b7e0bece85e59af9ff32e44595c9 | |
| parent | First try co fix icons bugs (diff) | |
| download | inkscape-3dd19a7be7d59aecafaf496e4794afaf8fab542c.tar.gz inkscape-3dd19a7be7d59aecafaf496e4794afaf8fab542c.zip | |
Fixing tests broken
| -rw-r--r-- | src/inkscape.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 798f4b487..228ba599b 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -464,7 +464,7 @@ Application::Application(const char* argv, bool use_gui) : g_object_get(settings ,"gtk-icon-theme-name", >kIconThemeName, NULL); prefs->setString("/theme/defaultIconTheme", Glib::ustring(gtkIconThemeName)); bool gtkApplicationPreferDarkTheme; - g_object_get(settings ,"gtk-application-prefer-dark-theme", >kApplicationPreferDarkTheme, NULL); + g_object_get(settings ,"gtk-application-prefer-dark-theme", gtkApplicationPreferDarkTheme, NULL); if (prefs->getString("/theme/gtkTheme") != "") { g_object_set(settings, "gtk-theme-name", prefs->getString("/theme/gtkTheme").c_str(), NULL); } else { 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")); } /** |