diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2012-09-03 06:35:01 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2012-09-03 06:35:01 +0000 |
| commit | d4f5006264e2e19a9fe50968a2e422b83785821c (patch) | |
| tree | 934174c6829e8a96dbffa5f6207d462723fbedca /src/extension/dbus/document-interface.cpp | |
| parent | Fix for 422644 : Show filename in statusbar on saving (diff) | |
| download | inkscape-d4f5006264e2e19a9fe50968a2e422b83785821c.tar.gz inkscape-d4f5006264e2e19a9fe50968a2e422b83785821c.zip | |
revert rev 11646: build issue with dbus (forgot to adapt some more, dbus was not enabled) and other issues
(bzr r11649)
Diffstat (limited to 'src/extension/dbus/document-interface.cpp')
| -rw-r--r-- | src/extension/dbus/document-interface.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
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, |