summaryrefslogtreecommitdiffstats
path: root/src/extension/implementation
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-05-15 19:05:39 +0000
committerTed Gould <ted@gould.cx>2010-05-15 19:05:39 +0000
commit672afd6dd148c167ce8f5df23e35d15f888b9473 (patch)
tree0d47f7e475daad3eedd7d89fbc5d183598044782 /src/extension/implementation
parentMaking an enable/disable flag for building with dbus (diff)
parentFix tooltip error in the preferences (Bug #446723). (diff)
downloadinkscape-672afd6dd148c167ce8f5df23e35d15f888b9473.tar.gz
inkscape-672afd6dd148c167ce8f5df23e35d15f888b9473.zip
Pulling in a more recent trunk
(bzr r8254.1.56)
Diffstat (limited to 'src/extension/implementation')
-rw-r--r--src/extension/implementation/script.cpp8
-rw-r--r--src/extension/implementation/xslt.cpp2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 53a666e25..e075feb91 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -835,7 +835,13 @@ void Script::checkStderr (const Glib::ustring &data,
textview->set_wrap_mode(Gtk::WRAP_WORD);
textview->show();
- textview->get_buffer()->set_text(data.c_str());
+ // Remove the last character
+ char *errormsg = (char*) data.c_str();
+ while (*errormsg != '\0') errormsg++;
+ errormsg -= 1;
+ *errormsg = '\0';
+
+ textview->get_buffer()->set_text(_(data.c_str()));
Gtk::ScrolledWindow * scrollwindow = new Gtk::ScrolledWindow();
scrollwindow->add(*textview);
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index f34fea64a..143d72362 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -132,7 +132,7 @@ XSLT::unload(Inkscape::Extension::Extension *module)
{
if (!module->loaded()) { return; }
xsltFreeStylesheet(_stylesheet);
- xmlFreeDoc(_parsedDoc);
+ // No need to use xmlfreedoc(_parsedDoc), it's handled by xsltFreeStylesheet(_stylesheet);
return;
}