diff options
| author | Denis Declara <declara91@gmail.com> | 2012-04-26 11:14:34 +0000 |
|---|---|---|
| committer | Denis Declara <declara91@gmail.com> | 2012-04-26 11:14:34 +0000 |
| commit | 95a8ad7bfec98f7cede15c4e8856ce547aaf4aa4 (patch) | |
| tree | 506de5a8437cb39917a66d74b68d78692d10a993 /src/color-profile.cpp | |
| parent | Added first support for elliptical arrangements (diff) | |
| parent | powerstroke: cautious fix. (diff) | |
| download | inkscape-95a8ad7bfec98f7cede15c4e8856ce547aaf4aa4.tar.gz inkscape-95a8ad7bfec98f7cede15c4e8856ce547aaf4aa4.zip | |
Trunk merge
(bzr r11073.1.20)
Diffstat (limited to 'src/color-profile.cpp')
| -rw-r--r-- | src/color-profile.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index c4855543c..0ee3ed787 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -774,19 +774,10 @@ std::vector<Glib::ustring> ColorProfile::getBaseProfileDirs() { #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) std::vector<Glib::ustring> sources; - gchar* base = profile_path("XXX"); - { - gchar* base2 = g_path_get_dirname(base); - g_free(base); - base = base2; - base2 = g_path_get_dirname(base); - g_free(base); - base = base2; - } - // first try user's local dir - sources.push_back( g_build_filename(g_get_user_data_dir(), "color", "icc", NULL) ); - + gchar* path = g_build_filename(g_get_user_data_dir(), "color", "icc", NULL); + sources.push_back(path); + g_free(path); const gchar* const * dataDirs = g_get_system_data_dirs(); for ( int i = 0; dataDirs[i]; i++ ) { |
