summaryrefslogtreecommitdiffstats
path: root/src/inkscape.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2008-12-07 00:44:56 +0000
committertweenk <tweenk@users.sourceforge.net>2008-12-07 00:44:56 +0000
commit45335a6bcb990a2e8e481d6fd25679a795e8f928 (patch)
tree7540392f16fe52b820013a0d78685576f8d89cd5 /src/inkscape.cpp
parentRemoved duplication of menu items. (diff)
downloadinkscape-45335a6bcb990a2e8e481d6fd25679a795e8f928.tar.gz
inkscape-45335a6bcb990a2e8e481d6fd25679a795e8f928.zip
Change the way preferences are loaded to simplify unit testing
(bzr r6964)
Diffstat (limited to 'src/inkscape.cpp')
-rw-r--r--src/inkscape.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 49b92394e..2a7f31c3e 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -750,9 +750,8 @@ inkscape_application_init (const gchar *argv0, gboolean use_gui)
inkscape->argv0 = g_strdup(argv0);
/* Load the preferences and menus; Later menu layout should be merged into prefs */
- Inkscape::Preferences::use_gui = use_gui;
- Inkscape::Preferences::load();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ prefs->load(use_gui, false);
inkscape_load_menus(inkscape);
sp_input_load_from_preferences();