summaryrefslogtreecommitdiffstats
path: root/src/file.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/file.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/file.cpp')
-rw-r--r--src/file.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/file.cpp b/src/file.cpp
index 307944001..2afb932b8 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -177,7 +177,7 @@ SPDesktop *sp_file_new(const std::string &templ)
Glib::ustring sp_file_default_template_uri()
{
std::list<gchar *> sources;
- sources.push_back( profile_path("templates") ); // first try user's local dir
+ sources.push_back( Inkscape::Application::profile_path("templates") ); // first try user's local dir
sources.push_back( g_strdup(INKSCAPE_TEMPLATESDIR) ); // then the system templates dir
std::list<gchar const*> baseNames;
gchar const* localized = _("default.svg");
@@ -316,7 +316,7 @@ bool sp_file_open(const Glib::ustring &uri,
sp_file_add_recent( doc->getURI() );
}
- if ( inkscape_use_gui() ) {
+ if ( INKSCAPE.use_gui() ) {
// Perform a fixup pass for hrefs.
if ( Inkscape::ResourceManager::getManager().fixupBrokenLinks(doc) ) {
Glib::ustring msg = _("Broken links have been changed to point to existing files.");