summaryrefslogtreecommitdiffstats
path: root/src/io/resource.cpp
diff options
context:
space:
mode:
authorSylvain Chiron <chironsylvain@orange.fr>2017-07-01 12:08:02 +0000
committerSylvain Chiron <chironsylvain@orange.fr>2017-07-01 12:08:02 +0000
commitb311d097b148a2cf5213ca86a45cb562bdd02986 (patch)
tree56b5c507727a852325a093ddedd2c3f44793c4ce /src/io/resource.cpp
parentUpdated libs from the Adaptagrams project: libavoid, libcola and libvspc; cha... (diff)
parentFix a compiling error on debian testing (diff)
downloadinkscape-b311d097b148a2cf5213ca86a45cb562bdd02986.tar.gz
inkscape-b311d097b148a2cf5213ca86a45cb562bdd02986.zip
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/io/resource.cpp')
-rw-r--r--src/io/resource.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index ffe612e43..73dc7117e 100644
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -20,7 +20,6 @@
#include "config.h"
#endif
-#include <glib.h> // g_assert()
#include "path-prefix.h"
#include "io/sys.h"
#include "io/resource.h"
@@ -49,6 +48,7 @@ gchar *_get_path(Domain domain, Type type, char const *filename)
case ICONS: temp = INKSCAPE_PIXMAPDIR; break;
case KEYS: temp = INKSCAPE_KEYSDIR; break;
case MARKERS: temp = INKSCAPE_MARKERSDIR; break;
+ case NONE: g_assert_not_reached(); break;
case PALETTES: temp = INKSCAPE_PALETTESDIR; break;
case PATTERNS: temp = INKSCAPE_PATTERNSDIR; break;
case SCREENS: temp = INKSCAPE_SCREENSDIR; break;
@@ -71,6 +71,9 @@ gchar *_get_path(Domain domain, Type type, char const *filename)
}
path = g_strdup(temp);
} break;
+ case CACHE: {
+ path = g_build_filename(g_get_user_cache_dir(), "inkscape", NULL);
+ } break;
case USER: {
char const *name=NULL;
switch (type) {
@@ -80,6 +83,7 @@ gchar *_get_path(Domain domain, Type type, char const *filename)
case ICONS: name = "icons"; break;
case KEYS: name = "keys"; break;
case MARKERS: name = "markers"; break;
+ case NONE: name = ""; break;
case PALETTES: name = "palettes"; break;
case PATTERNS: name = "patterns"; break;
case SYMBOLS: name = "symbols"; break;