Pulling in a more recent trunk

(bzr r8254.1.56)

3 files changed, 10 insertions, 4 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;
 }
 
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index 11e3a8d97..5dce0f9e3 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -26,11 +26,11 @@ namespace Extension {
 ParamFloat::ParamFloat (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml) :
         Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext), _value(0.0), _min(0.0), _max(10.0)
 {
-    const char * defaultval = NULL;
+    const gchar * defaultval = NULL;
     if (sp_repr_children(xml) != NULL)
         defaultval = sp_repr_children(xml)->content();
     if (defaultval != NULL) {
-        _value = atof(defaultval);
+        _value = g_ascii_strtod (defaultval,NULL);
     }
 
     const char * maxval = xml->attribute("max");