Update to current trunk

(bzr r11804.1.8)

2 files changed, 2 insertions, 2 deletions

diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index f554d314d..4c339ad5a 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -312,7 +312,7 @@ void sp_repr_css_set(Node *repr, SPCSSAttr *css, gchar const *attr)
     /*
      * If the new value is different from the old value, this will sometimes send a signal via
      * CompositeNodeObserver::notiftyAttributeChanged() which results in calling
-     * SPObject::sp_object_repr_attr_changed and thus updates the object's SPStyle. This update
+     * SPObject::repr_attr_changed and thus updates the object's SPStyle. This update
      * results in another call to repr->setAttribute().
      */
     repr->setAttribute(attr, value.c_str());
diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index 55bd28afe..4965f81c8 100644
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -346,7 +346,7 @@ SimpleNode::setAttribute(gchar const *name, gchar const *value, bool const /*is_
             // tree (and thus has no parent), default values will not be tested.
             if( !strcmp( name, "style" ) && (flags >= SP_ATTR_CLEAN_STYLE_WARN) ) {
                 g_free( cleaned_value );
-                cleaned_value = const_cast<char*>(sp_attribute_clean_style( this, value, flags ).c_str());
+                cleaned_value = g_strdup( sp_attribute_clean_style( this, value, flags ).c_str() );
                 // if( g_strcmp0( value, cleaned_value ) ) {
                 //     g_warning( "SimpleNode::setAttribute: %s", id.c_str() );
                 //     g_warning( "     original: %s", value);