revert rev 11646: build issue with dbus (forgot to adapt some more, dbus was not enabled) and other issues

(bzr r11649)

10 files changed, 64 insertions, 48 deletions

diff --git a/src/attribute-rel-util.cpp b/src/attribute-rel-util.cpp
index cf94c0c1e..239e359e2 100644
--- a/src/attribute-rel-util.cpp
+++ b/src/attribute-rel-util.cpp
@@ -128,13 +128,17 @@ void sp_attribute_clean_style(Node *repr, unsigned int flags) {
 
   // Find element's style
   SPCSSAttr *css = sp_repr_css_attr( repr, "style" );
+
   sp_attribute_clean_style(repr, css, flags);
 
+  // g_warning( "sp_repr_write_stream_element(): Final style:" );
+  //sp_repr_css_print( css );
+
   // Convert css node's properties data to string and set repr node's attribute "style" to that string.
   // sp_repr_css_set( repr, css, "style"); // Don't use as it will cause loop.
-  Glib::ustring value;
-  sp_repr_css_write_string(css, value);
-  repr->setAttribute("style", value.c_str());
+  gchar *value = sp_repr_css_write_string(css);
+  repr->setAttribute("style", value);
+  if (value) g_free (value);
 
   sp_repr_css_attr_unref( css );
 }
@@ -143,7 +147,7 @@ void sp_attribute_clean_style(Node *repr, unsigned int flags) {
 /**
  * Clean CSS style on an element.
  */
-Glib::ustring sp_attribute_clean_style(Node *repr, gchar const *string, unsigned int flags) {
+gchar * sp_attribute_clean_style(Node *repr, gchar const *string, unsigned int flags) {
 
   g_return_val_if_fail (repr != NULL, NULL);
   g_return_val_if_fail (repr->type() == Inkscape::XML::ELEMENT_NODE, NULL);
@@ -151,12 +155,11 @@ Glib::ustring sp_attribute_clean_style(Node *repr, gchar const *string, unsigned
   SPCSSAttr *css = sp_repr_css_attr_new();
   sp_repr_css_attr_add_from_string( css, string );
   sp_attribute_clean_style(repr, css, flags);
-  Glib::ustring string_cleaned;
-  sp_repr_css_write_string (css, string_cleaned);
+  gchar* string_cleaned = sp_repr_css_write_string( css );
 
   sp_repr_css_attr_unref( css );
 
-  return string_cleaned;
+  return  string_cleaned;
 }
 
 
diff --git a/src/attribute-rel-util.h b/src/attribute-rel-util.h
index 449a66d9e..d9d270a13 100644
--- a/src/attribute-rel-util.h
+++ b/src/attribute-rel-util.h
@@ -61,7 +61,7 @@ void sp_attribute_clean_style(Node *repr, unsigned int flags);
 /**
  * Clean style properties for one style string.
  */
-Glib::ustring sp_attribute_clean_style(Node *repr, gchar const *string, unsigned int flags);
+gchar* sp_attribute_clean_style(Node *repr, gchar const *string, unsigned int flags);
 
 /**
  * Clean style properties for one CSS.
diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp
index 706215573..c67234b34 100644
--- a/src/extension/dbus/document-interface.cpp
+++ b/src/extension/dbus/document-interface.cpp
@@ -226,9 +226,7 @@ gchar *finish_create_shape (DocumentInterface *object, GError ** /*error*/, Inks
     SPCSSAttr *style = sp_desktop_get_style(object->desk, TRUE);
     
     if (style) {
-        Glib::ustring str;
-        sp_repr_css_write_string(style, str);
-        newNode->setAttribute("style", str.c_str(), TRUE);
+        newNode->setAttribute("style", sp_repr_css_write_string(style), TRUE);
     }
     else {
         newNode->setAttribute("style", "fill:#0000ff;fill-opacity:1;stroke:#c900b9;stroke-width:0;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none", TRUE);
@@ -567,7 +565,7 @@ gchar *document_interface_node(DocumentInterface *object, gchar *type, GError **
 }
 
 /****************************************************************************
-     ENVIRONMENT FUNCTIONS
+     ENVIORNMENT FUNCTIONS
 ****************************************************************************/
 gdouble
 document_interface_document_get_width (DocumentInterface *object)
@@ -584,9 +582,7 @@ document_interface_document_get_height (DocumentInterface *object)
 gchar *document_interface_document_get_css(DocumentInterface *object, GError ** /*error*/)
 {
     SPCSSAttr *current = (object->desk)->current;
-    glib::ustring str;
-    sp_repr_css_write_string(current, str);
-    return (str.empty() ? NULL : g_strdup (str.c_str()));
+    return sp_repr_css_write_string(current);
 }
 
 gboolean document_interface_document_merge_css(DocumentInterface *object,
diff --git a/src/id-clash.cpp b/src/id-clash.cpp
index 05af32be8..d8299652b 100644
--- a/src/id-clash.cpp
+++ b/src/id-clash.cpp
@@ -259,9 +259,10 @@ fix_up_refs(const refmap_type *refmap, const id_changelist_type &id_changes)
                 gchar *url = g_strdup_printf("url(#%s)", obj->getId());
                 sp_repr_css_set_property(style, it->attr, url);
                 g_free(url);
-                Glib::ustring style_string;
-                sp_repr_css_write_string(style, style_string);
-                it->elem->getRepr()->setAttribute("style", style_string.c_str());
+                gchar *style_string = sp_repr_css_write_string(style);
+                it->elem->getRepr()->setAttribute("style", style_string);
+                g_free(style_string);
+
             } else {
                 g_assert(0); // shouldn't happen
             }
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 1f985a629..4615fd6e1 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -489,18 +489,18 @@ void Preferences::setString(Glib::ustring const &pref_path, Glib::ustring const
 
 void Preferences::setStyle(Glib::ustring const &pref_path, SPCSSAttr *style)
 {
-    Glib::ustring css_str;
-    sp_repr_css_write_string(style, css_str);
-    _setRawValue(pref_path, css_str.c_str());
+    gchar *css_str = sp_repr_css_write_string(style);
+    _setRawValue(pref_path, css_str);
+    g_free(css_str);
 }
 
 void Preferences::mergeStyle(Glib::ustring const &pref_path, SPCSSAttr *style)
 {
     SPCSSAttr *current = getStyle(pref_path);
     sp_repr_css_merge(current, style);
-    Glib::ustring css_str;
-    sp_repr_css_write_string(current, css_str);
-    _setRawValue(pref_path, css_str.c_str());
+    gchar *css_str = sp_repr_css_write_string(current);
+    _setRawValue(pref_path, css_str);
+    g_free(css_str);
     sp_repr_css_attr_unref(current);
 }
 
diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index 9ceeaf262..892c89a15 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -1031,9 +1031,15 @@ Inkscape::XML::Node * SPObject::sp_object_private_write(SPObject *object, Inksca
             if( prefs->getBool("/options/svgoutput/check_on_editing") ) {
 
                 unsigned int flags = sp_attribute_clean_get_prefs();
-                Glib::ustring s_cleaned = sp_attribute_clean_style( repr, s, flags ); 
+                gchar *s_cleaned = sp_attribute_clean_style( repr, s, flags ); 
+ 
+                // g_warning("SPObject::sp_object_private_write: %s", object->getId() );
+                // g_warning("                                   old: :%s:", repr->attribute("style") );
+                // g_warning("                                   new: :%s:", s );
+                // g_warning("                               cleaned: :%s:", s_cleaned );
+
                 g_free( s );
-                s = (s_cleaned.empty() ? NULL : g_strdup (s_cleaned.c_str()));
+                s = s_cleaned;
             }
 
             if( s == NULL || strcmp(s,"") == 0 ) {
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 857ae7019..1ee26e803 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -227,7 +227,8 @@ StyleSwatch::setWatchedTool(const char *path, bool synthesize)
 }
 
 
-void StyleSwatch::setStyle(SPCSSAttr *css)
+void
+StyleSwatch::setStyle(SPCSSAttr *css)
 {
     if (_css)
         sp_repr_css_attr_unref (_css);
@@ -238,18 +239,18 @@ void StyleSwatch::setStyle(SPCSSAttr *css)
     _css = sp_repr_css_attr_new();
     sp_repr_css_merge(_css, css);
 
-    Glib::ustring css_string;
-    sp_repr_css_write_string (_css, css_string);
+    gchar const *css_string = sp_repr_css_write_string (_css);
     SPStyle *temp_spstyle = sp_style_new(SP_ACTIVE_DOCUMENT);
-    if (~css_string.empty()) {
-        sp_style_merge_from_style_string (temp_spstyle, css_string.c_str());
-    }
-    
+    if (css_string)
+        sp_style_merge_from_style_string (temp_spstyle, css_string);
+
     setStyle (temp_spstyle);
+
     sp_style_unref (temp_spstyle);
 }
 
-void StyleSwatch::setStyle(SPStyle *query)
+void
+StyleSwatch::setStyle(SPStyle *query)
 {
     _place[SS_FILL].remove();
     _place[SS_STROKE].remove();
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 88f85f8de..594ac83c6 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -270,9 +270,10 @@ double sp_repr_css_double_property(SPCSSAttr *css, gchar const *name, double def
 /**
  * Write a style attribute string from a list of properties stored in an SPCSAttr object.
  */
-void sp_repr_css_write_string(SPCSSAttr *css, Glib::ustring &str)
+gchar *sp_repr_css_write_string(SPCSSAttr *css)
 {
-    str.clear();
+    Glib::ustring buffer;
+
     for ( List<AttributeRecord const> iter = css->attributeList() ;
           iter ; ++iter )
     {
@@ -280,24 +281,26 @@ void sp_repr_css_write_string(SPCSSAttr *css, Glib::ustring &str)
             continue;
         }
 
-        str.append(g_quark_to_string(iter->key));
-        str.push_back(':');
+        buffer.append(g_quark_to_string(iter->key));
+        buffer.push_back(':');
         if (!strcmp(g_quark_to_string(iter->key), "font-family")
                 || !strcmp(g_quark_to_string(iter->key), "-inkscape-font-specification")) {
             // we only quote font-family/font-specification, as SPStyle does
             gchar *val_quoted = css2_escape_quote (iter->value);
             if (val_quoted) {
-                str.append(val_quoted);
+                buffer.append(val_quoted);
                 g_free (val_quoted);
             }
         } else {
-            str.append(iter->value); // unquoted
+            buffer.append(iter->value); // unquoted
         }
 
         if (rest(iter)) {
-            str.push_back(';');
+            buffer.push_back(';');
         }
     }
+
+    return (buffer.empty() ? NULL : g_strdup (buffer.c_str()));
 }
 
 /**
@@ -309,8 +312,7 @@ void sp_repr_css_set(Node *repr, SPCSSAttr *css, gchar const *attr)
     g_assert(css != NULL);
     g_assert(attr != NULL);
 
-    Glib::ustring value;
-    sp_repr_css_write_string(css, value);
+    gchar *value = sp_repr_css_write_string(css);
 
     /*
      * If the new value is different from the old value, this will sometimes send a signal via
@@ -318,7 +320,9 @@ void sp_repr_css_set(Node *repr, SPCSSAttr *css, gchar const *attr)
      * SPObject::sp_object_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());
+    repr->setAttribute(attr, value);
+
+    if (value) g_free (value);
 }
 
 /**
diff --git a/src/xml/repr.h b/src/xml/repr.h
index debd0f489..86a798e3e 100644
--- a/src/xml/repr.h
+++ b/src/xml/repr.h
@@ -79,7 +79,7 @@ void sp_repr_css_unset_property(SPCSSAttr *css, gchar const *name);
 bool sp_repr_css_property_is_unset(SPCSSAttr *css, gchar const *name);
 double sp_repr_css_double_property(SPCSSAttr *css, gchar const *name, double defval);
 
-void sp_repr_css_write_string(SPCSSAttr *css, Glib::ustring &str);
+gchar *sp_repr_css_write_string(SPCSSAttr *css);
 void sp_repr_css_set(Inkscape::XML::Node *repr, SPCSSAttr *css, gchar const *key);
 void sp_repr_css_merge(SPCSSAttr *dst, SPCSSAttr *src);
 void sp_repr_css_attr_add_from_string(SPCSSAttr *css, const gchar *data);
diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index 3d59647cf..c197d648b 100644
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -320,7 +320,7 @@ SimpleNode::setAttribute(gchar const *name, gchar const *value, bool const /*is_
     Glib::ustring element = g_quark_to_string(_name);
     //g_warning("setAttribute:  %s: %s: %s", element.c_str(), name, value);
 
-    Glib::ustring cleaned_value = (value ? value : Glib::ustring());
+    gchar* cleaned_value = g_strdup( value );
 
     // Only check elements in SVG name space and don't block setting attribute to NULL.
     if( element.substr(0,4) == "svg:" && value != NULL) {
@@ -338,6 +338,7 @@ SimpleNode::setAttribute(gchar const *name, gchar const *value, bool const /*is_
             if( (attr_warn || attr_remove) && value != NULL ) {
                 bool is_useful = sp_attribute_check_attribute( element, id, name, attr_warn );
                 if( !is_useful && attr_remove ) {
+                    g_free( cleaned_value );
                     return; // Don't add to tree.
                 }
             }
@@ -345,6 +346,7 @@ SimpleNode::setAttribute(gchar const *name, gchar const *value, bool const /*is_
             // Check style properties -- Note: if element is not yet inserted into
             // 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 = sp_attribute_clean_style( this, value, flags );
                 // if( g_strcmp0( value, cleaned_value ) ) {
                 //     g_warning( "SimpleNode::setAttribute: %s", id.c_str() );
@@ -370,8 +372,8 @@ SimpleNode::setAttribute(gchar const *name, gchar const *value, bool const /*is_
     ptr_shared<char> old_value=( existing ? existing->value : ptr_shared<char>() );
 
     ptr_shared<char> new_value=ptr_shared<char>();
-    if (~cleaned_value.empty()) {
-        new_value = share_string(cleaned_value.c_str());
+    if (cleaned_value) {
+        new_value = share_string(cleaned_value);
         tracker.set<DebugSetAttribute>(*this, key, new_value);
         if (!existing) {
             if (ref) {
@@ -399,6 +401,9 @@ SimpleNode::setAttribute(gchar const *name, gchar const *value, bool const /*is_
         _observers.notifyAttributeChanged(*this, key, old_value, new_value);
         //g_warning( "setAttribute notified: %s: %s: %s: %s", name, element.c_str(), old_value, new_value ); 
     }
+
+    g_free( cleaned_value );
+
 }
 
 void SimpleNode::addChild(Node *generic_child, Node *generic_ref) {