diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2012-04-21 11:16:47 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2012-04-21 11:16:47 +0000 |
| commit | a8497a5cbf71936d60b16767e0ae22bd28ef0c8f (patch) | |
| tree | aba63462139820cae8abf626b507bee12be89b74 /src | |
| parent | Fixed non working cancel button in export dialog (diff) | |
| download | inkscape-a8497a5cbf71936d60b16767e0ae22bd28ef0c8f.tar.gz inkscape-a8497a5cbf71936d60b16767e0ae22bd28ef0c8f.zip | |
dropping some ghost code / probably fixing a memleak as well
(bzr r11273)
Diffstat (limited to 'src')
| -rw-r--r-- | src/color-profile.cpp | 15 | ||||
| -rw-r--r-- | src/extension/internal/svg.cpp | 4 |
2 files changed, 3 insertions, 16 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++ ) { diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp index 7d0b8299c..9b1098afd 100644 --- a/src/extension/internal/svg.cpp +++ b/src/extension/internal/svg.cpp @@ -230,8 +230,6 @@ Svg::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filena g_return_if_fail(doc != NULL); g_return_if_fail(filename != NULL); - gchar *save_path = g_path_get_dirname(filename); - bool const exportExtensions = ( !mod->get_id() || !strcmp (mod->get_id(), SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE) || !strcmp (mod->get_id(), SP_MODULE_KEY_OUTPUT_SVGZ_INKSCAPE)); @@ -257,8 +255,6 @@ Svg::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filena Inkscape::GC::release(rdoc); } - g_free(save_path); - return; } |