effects don't need to merge into menus if we're running without gui; with this we can purge a redundant reading of menus skeleton, which leaked its xml tree

(bzr r12616)

3 files changed, 2 insertions, 4 deletions

diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index dcccf3d7d..1575c2b10 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -89,7 +89,7 @@ Effect::Effect (Inkscape::XML::Node * in_repr, Implementation::Implementation *
         } // children of "inkscape-extension"
     } // if we have an XML file
 
-    if (INKSCAPE != NULL) {
+    if (INKSCAPE != NULL && inkscape_use_gui()) {
         if (_effects_list == NULL)
             _effects_list = find_menu(inkscape_get_menus(INKSCAPE), EFFECTS_LIST);
         if (_filters_list == NULL)
diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 2dde9eeb8..0ff4b79c4 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -109,8 +109,6 @@
 
 #include "init.h"
 
-extern gboolean inkscape_app_use_gui( Inkscape::Application const *app );
-
 namespace Inkscape {
 namespace Extension {
 
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index cce4ca5b9..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;