summaryrefslogtreecommitdiffstats
path: root/src/preferences.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-11-26 01:17:02 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-11-26 01:17:02 +0000
commitbed3cc55fe40330718204c540b328d95407b00fa (patch)
treee4269aab0a32957163935ec6b828b25d00613d68 /src/preferences.cpp
parentAdd CMake file to find LCMS2 (diff)
parentUpdate to trunk r13766 (diff)
downloadinkscape-bed3cc55fe40330718204c540b328d95407b00fa.tar.gz
inkscape-bed3cc55fe40330718204c540b328d95407b00fa.zip
Merge inkscape-cppify branch
(bzr r13767)
Diffstat (limited to 'src/preferences.cpp')
-rw-r--r--src/preferences.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/preferences.cpp b/src/preferences.cpp
index d0c3783b5..e5a5fe7f0 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -91,11 +91,13 @@ Preferences::Preferences() :
_hasError(false)
{
// profile_path essentailly returns the argument prefixed by the profile directory.
- gchar *path = profile_path(NULL);
+ // \TODO this is kinda hackish, but the alternative (strrchr) is worse
+
+ gchar *path = Inkscape::Application::profile_path(NULL);
_prefs_dir = path;
g_free(path);
- path = profile_path(_prefs_basename.c_str());
+ path = Inkscape::Application::profile_path(_prefs_basename.c_str());
_prefs_filename = path;
g_free(path);
@@ -155,7 +157,7 @@ void Preferences::_load()
// create some subdirectories for user stuff
char const *user_dirs[] = {"keys", "templates", "icons", "extensions", "palettes", NULL};
for (int i=0; user_dirs[i]; ++i) {
- char *dir = profile_path(user_dirs[i]);
+ char *dir = Inkscape::Application::profile_path(user_dirs[i]);
g_mkdir(dir, 0755);
g_free(dir);
}