Refactored preferences handling into a new version of

the Inkscape::Preferences class. Removed all use of 
prefs_get_string_attribute(), pref_path_get_nth_child() and 
create_pref() in favor of the new API. Replaced some "0 or 1" integer 
preferences with booleans.

(bzr r6823)

1 files changed, 2 insertions, 5 deletions

diff --git a/src/application/application.cpp b/src/application/application.cpp
index 4b1ea03df..c7aa28971 100644
--- a/src/application/application.cpp
+++ b/src/application/application.cpp
@@ -41,8 +41,7 @@ Application::Application(int argc, char **argv, bool use_gui, bool new_gui)
     if (argv != NULL) {
         _argv = argv;   // TODO:  Is this correct?
     }
-
-    Inkscape::Preferences::loadSkeleton();
+    
     if (new_gui) {
         _gtk_main = new Gtk::Main(argc, argv, true);
 
@@ -105,8 +104,6 @@ Application::run()
      */
     if (_gtk_main != NULL) {
         g_assert(_app_impl != NULL);
-
-        Inkscape::Preferences::load();
         g_warning("Running main window");
         Gtk::Window *win = static_cast<Gtk::Window*>(_app_impl->getWindow());
         g_assert(win != NULL);
@@ -126,7 +123,7 @@ Application::run()
 void
 Application::exit()
 {
-    Inkscape::Preferences::save();
+    Inkscape::Preferences::unload();
 
     if (_gtk_main != NULL) {
         _gtk_main->quit();