1. make it compile

(bzr r13341.5.1)

7 files changed, 11 insertions, 11 deletions

diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 913713e5c..3aad1a8a8 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -588,7 +588,7 @@ Glib::ustring Export::create_filepath_from_id (Glib::ustring id, const Glib::ust
     }
 
     if (directory.empty()) {
-        directory = homedir_path(NULL);
+        directory = INKSCAPE->homedir_path(NULL);
     }
 
     Glib::ustring filename = Glib::build_filename(directory, id+".png");
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 8ba3ad684..c4281babc 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -1044,7 +1044,7 @@ FileSaveDialogImplGtk::FileSaveDialogImplGtk(Gtk::Window &parentWindow, const Gl
     }
 
     // allow easy access to the user's own templates folder
-    gchar *templates = profile_path("templates");
+    gchar *templates = INKSCAPE->profile_path("templates");
     if (Inkscape::IO::file_test(templates, G_FILE_TEST_EXISTS) &&
         Inkscape::IO::file_test(templates, G_FILE_TEST_IS_DIR) && g_path_is_absolute(templates)) {
         add_shortcut_folder(templates);
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index f1a29e971..f1535175a 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1908,7 +1908,7 @@ void InkscapePreferences::initPageSystem()
 
         _page_system.add_group_header( _("System info"));
 
-        _sys_user_config.set_text((char const *)profile_path(""));
+        _sys_user_config.set_text((char const *)INKSCAPE->profile_path(""));
         _sys_user_config.set_editable(false);
         _page_system.add_line(true, _("User config: "), _sys_user_config, "", _("Location of users configuration"), true);
 
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 4f0cb211a..6dbb1d5e9 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -527,7 +527,7 @@ static void loadEmUp()
         beenHere = true;
 
         std::list<gchar *> sources;
-        sources.push_back( profile_path("palettes") );
+        sources.push_back( INKSCAPE->profile_path("palettes") );
         sources.push_back( g_strdup(INKSCAPE_PALETTESDIR) );
         sources.push_back( g_strdup(CREATE_PALETTESDIR) );
 
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index c58df864c..9e5e94498 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -572,9 +572,9 @@ void SymbolsDialog::get_symbols() {
       Inkscape::IO::file_test( INKSCAPE_SYMBOLSDIR, G_FILE_TEST_IS_DIR ) ) {
     directories.push_back( INKSCAPE_SYMBOLSDIR );
   }
-  if( Inkscape::IO::file_test( profile_path("symbols"), G_FILE_TEST_EXISTS ) &&
-      Inkscape::IO::file_test( profile_path("symbols"), G_FILE_TEST_IS_DIR ) ) {
-    directories.push_back( profile_path("symbols") );
+  if( Inkscape::IO::file_test( INKSCAPE->profile_path("symbols"), G_FILE_TEST_EXISTS ) &&
+      Inkscape::IO::file_test( INKSCAPE->profile_path("symbols"), G_FILE_TEST_IS_DIR ) ) {
+    directories.push_back( INKSCAPE->profile_path("symbols") );
   }
 
   std::list<Glib::ustring>::iterator it;
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index d75f81456..1bd9510dc 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -194,7 +194,7 @@ void TemplateLoadTab::_refreshTemplatesList()
 void TemplateLoadTab::_loadTemplates()
 {
     // user's local dir
-    _getTemplatesFromDir(profile_path("templates") + _loading_path);
+    _getTemplatesFromDir(INKSCAPE->profile_path("templates") + _loading_path);
 
     // system templates dir
     _getTemplatesFromDir(INKSCAPE_TEMPLATESDIR + _loading_path);
diff --git a/src/ui/view/view.cpp b/src/ui/view/view.cpp
index 72548e213..cfedb6921 100644
--- a/src/ui/view/view.cpp
+++ b/src/ui/view/view.cpp
@@ -85,7 +85,7 @@ void View::_close() {
     if (_doc) {
         _document_uri_set_connection.disconnect();
         _document_resized_connection.disconnect();
-        if (inkscape_remove_document(_doc)) {
+        if (INKSCAPE->remove_document(_doc)) {
             // this was the last view of this document, so delete it
             delete _doc;
         }
@@ -111,13 +111,13 @@ void View::setDocument(SPDocument *doc) {
     if (_doc) {
         _document_uri_set_connection.disconnect();
         _document_resized_connection.disconnect();
-        if (inkscape_remove_document(_doc)) {
+        if (INKSCAPE->remove_document(_doc)) {
             // this was the last view of this document, so delete it
             delete _doc;
         }
     }
 
-    inkscape_add_document(doc);
+    INKSCAPE->add_document(doc);
 
     _doc = doc;
     _document_uri_set_connection =