diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-26 14:51:10 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-26 14:51:10 +0000 |
| commit | f2a0226cb35bb6e9682c661daccff1826f86d13a (patch) | |
| tree | fa41512daf0b947246b89d8f4ba09dbabd01b34c /src/io | |
| parent | Fix symbolic icon color width (diff) | |
| download | inkscape-f2a0226cb35bb6e9682c661daccff1826f86d13a.tar.gz inkscape-f2a0226cb35bb6e9682c661daccff1826f86d13a.zip | |
Fixing paths to allow themes and icons inside main inkscape instalation not only at home
Diffstat (limited to 'src/io')
| -rw-r--r-- | src/io/resource.cpp | 8 | ||||
| -rw-r--r-- | src/io/resource.h | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/io/resource.cpp b/src/io/resource.cpp index 83772dd5d..d90f329d9 100644 --- a/src/io/resource.cpp +++ b/src/io/resource.cpp @@ -54,7 +54,7 @@ gchar *_get_path(Domain domain, Type type, char const *filename) case FILTERS: temp = INKSCAPE_FILTERDIR; break; case FONTS: temp = INKSCAPE_FONTSDIR; break; case GRADIENTS: temp = INKSCAPE_GRADIENTSDIR; break; - case ICONS: temp = INKSCAPE_PIXMAPDIR; break; + case ICONS: temp = INKSCAPE_ICONSDIR; break; case KEYS: temp = INKSCAPE_KEYSDIR; break; case MARKERS: temp = INKSCAPE_MARKERSDIR; break; case NONE: g_assert_not_reached(); break; @@ -66,6 +66,10 @@ gchar *_get_path(Domain domain, Type type, char const *filename) case THEMES: temp = INKSCAPE_THEMEDIR; break; case TUTORIALS: temp = INKSCAPE_TUTORIALSDIR; break; case UIS: temp = INKSCAPE_UIDIR; break; + case PIXMAPS: temp = INKSCAPE_PIXMAPSDIR; break; +#ifdef INKSCAPE_DATADIR + case DATADIR: temp = INKSCAPE_DATADIR; break; +#endif default: temp = ""; } path = g_strdup(temp); @@ -100,6 +104,8 @@ gchar *_get_path(Domain domain, Type type, char const *filename) case TEMPLATES: name = "templates"; break; case THEMES: name = "icons"; break; case UIS: name = "ui"; break; + case PIXMAPS: name = "pixmaps"; break; + case DATADIR: name = ""; break; default: return _get_path(SYSTEM, type, filename); } path = profile_path(name); diff --git a/src/io/resource.h b/src/io/resource.h index d86eda51a..7a11fd8fa 100644 --- a/src/io/resource.h +++ b/src/io/resource.h @@ -47,7 +47,9 @@ enum Type { SYMBOLS, FILTERS, THEMES, - UIS + UIS, + PIXMAPS, + DATADIR }; enum Domain { |