diff options
| author | Ted Gould <ted@gould.cx> | 2010-05-15 18:08:17 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-05-15 18:08:17 +0000 |
| commit | 2d8c2dfd832ce207aef3895e702bff4098ab7136 (patch) | |
| tree | 642a37c6e3ca05d5e991ffe868f03c9cc58e51bc /src/inkscape.cpp | |
| parent | Merge from trunk (diff) | |
| parent | Minor tweaks to text toolbar. (diff) | |
| download | inkscape-2d8c2dfd832ce207aef3895e702bff4098ab7136.tar.gz inkscape-2d8c2dfd832ce207aef3895e702bff4098ab7136.zip | |
Updating to trunk
(bzr r8254.1.54)
Diffstat (limited to 'src/inkscape.cpp')
| -rw-r--r-- | src/inkscape.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 8506f05de..d0f9a11fc 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -49,7 +49,7 @@ using Inkscape::Extension::Internal::PrintWin32; #include "application/editor.h" #include "desktop.h" #include "desktop-handles.h" -#include "dialogs/input.h" +#include "device-manager.h" #include "document.h" #include "event-context.h" #include "extension/db.h" @@ -807,7 +807,7 @@ inkscape_application_init (const gchar *argv0, gboolean use_gui) if (use_gui) { inkscape_load_menus(inkscape); - sp_input_load_from_preferences(); + Inkscape::DeviceManager::getManager().loadConfig(); } /* set language for user interface according setting in preferences */ |