diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-09-30 09:38:37 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-09-30 09:38:37 +0000 |
| commit | acf5c7612afc02aee6ddf079d2ea77e13bb82e1b (patch) | |
| tree | 8af7a0de9007c10f5e3a8d00676b162e35a74929 /src/inkscape.cpp | |
| parent | update to trunk (diff) | |
| parent | Reduce tools-switcher code, add description for node and select toos. (diff) | |
| download | inkscape-acf5c7612afc02aee6ddf079d2ea77e13bb82e1b.tar.gz inkscape-acf5c7612afc02aee6ddf079d2ea77e13bb82e1b.zip | |
Update to trunk
(bzr r11950.1.156)
Diffstat (limited to 'src/inkscape.cpp')
| -rw-r--r-- | src/inkscape.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index e1cabd2d5..228841362 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -502,7 +502,7 @@ inkscape_init (SPObject * object) new (&inkscape->document_set) std::map<SPDocument *, int>(); new (&inkscape->selection_models) std::map<SPDocument *, AppSelectionModel *>(); - inkscape->menus = sp_repr_read_mem (_(menus_skeleton), MENUS_SKELETON_SIZE, NULL); + inkscape->menus = NULL; inkscape->desktops = NULL; inkscape->dialogs_toggle = TRUE; inkscape->mapalt = GDK_MOD1_MASK; @@ -1483,7 +1483,9 @@ profile_path(const char *filename) } if (prefdir) { - prefdir = g_build_filename(prefdir, INKSCAPE_PROFILE_DIR, NULL); + const char *prefdir_profile = g_build_filename(prefdir, INKSCAPE_PROFILE_DIR, NULL); + g_free((void *)prefdir); + prefdir = prefdir_profile; } } #endif |