From d4f5006264e2e19a9fe50968a2e422b83785821c Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Mon, 3 Sep 2012 08:35:01 +0200 Subject: revert rev 11646: build issue with dbus (forgot to adapt some more, dbus was not enabled) and other issues (bzr r11649) --- src/extension/dbus/document-interface.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/extension/dbus/document-interface.cpp') 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, -- cgit v1.2.3