From 6e867cb6aa8b44a3bb9f2dec4361c67cefc8ca8f Mon Sep 17 00:00:00 2001 From: buliabyak <> Date: Sat, 28 Sep 2013 16:20:27 -0300 Subject: 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) --- src/extension/effect.cpp | 2 +- src/extension/init.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/extension') 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 { -- cgit v1.2.3 From fec897e5f419344560c2b5e7691fcc207147c5bf Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 30 Sep 2013 22:28:33 +0200 Subject: memleak! (bzr r12636) --- src/extension/dbus/document-interface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/extension') diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp index ccc39fbef..221a3e879 100644 --- a/src/extension/dbus/document-interface.cpp +++ b/src/extension/dbus/document-interface.cpp @@ -268,7 +268,7 @@ dbus_call_verb (DocumentInterface *doc_interface, int verbid, GError **error) if ( action ) { sp_action_perform( action, NULL ); if (doc_interface->updates) - Inkscape::DocumentUndo::done(doc_interface->target.getDocument(), verb->get_code(), g_strdup(verb->get_tip())); + Inkscape::DocumentUndo::done(doc_interface->target.getDocument(), verb->get_code(), verb->get_tip()); return TRUE; } } @@ -357,7 +357,7 @@ document_interface_call_verb (DocumentInterface *doc_interface, gchar *verbid, G if ( action ) { sp_action_perform( action, NULL ); if (doc_interface->updates) { - Inkscape::DocumentUndo::done(doc_interface->target.getDocument(), verb->get_code(), g_strdup(verb->get_tip())); + Inkscape::DocumentUndo::done(doc_interface->target.getDocument(), verb->get_code(), verb->get_tip()); } return TRUE; } -- cgit v1.2.3 From 1c5f7de99f4da6e945c3c72bcd7a6efc1df37762 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 1 Oct 2013 01:40:28 +0100 Subject: Fix mismatched tags (bzr r12644) --- src/extension/internal/metafile-print.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/extension') diff --git a/src/extension/internal/metafile-print.h b/src/extension/internal/metafile-print.h index cba4d564d..a21f9de58 100644 --- a/src/extension/internal/metafile-print.h +++ b/src/extension/internal/metafile-print.h @@ -26,8 +26,8 @@ #include "splivarot.h" #include "display/canvas-bpath.h" -struct SPGradient; -struct SPObject; +class SPGradient; +class SPObject; namespace Inkscape { class Pixbuf; -- cgit v1.2.3