diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-10-02 22:35:52 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-10-02 22:35:52 +0000 |
| commit | 9240dbde4547c7e7529f31645ea916faae72bafa (patch) | |
| tree | 82c7e2e222dd3bd92dea9a21ed60c0479f0149b8 /src/extension | |
| parent | update to trunk (diff) | |
| parent | Fix segment welding in the node tool hanging when a two-point segment (diff) | |
| download | inkscape-9240dbde4547c7e7529f31645ea916faae72bafa.tar.gz inkscape-9240dbde4547c7e7529f31645ea916faae72bafa.zip | |
update to trunk
(bzr r12588.1.10)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/dbus/document-interface.cpp | 4 | ||||
| -rw-r--r-- | src/extension/effect.cpp | 2 | ||||
| -rw-r--r-- | src/extension/init.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/metafile-print.h | 4 |
4 files changed, 5 insertions, 7 deletions
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; } 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/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; |