summaryrefslogtreecommitdiffstats
path: root/src/box3d.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-09-24 22:17:24 +0000
committerMarkus Engel <markus.engel@tum.de>2013-09-24 22:17:24 +0000
commitbcca22a25ae98f70c36fff6292f0a8fe4e578d89 (patch)
treea18d382d32f471b7119b9b7b2782cec04d6da43f /src/box3d.cpp
parentRefactored SPUse. (diff)
parentFix my email address through codebase (diff)
downloadinkscape-bcca22a25ae98f70c36fff6292f0a8fe4e578d89.tar.gz
inkscape-bcca22a25ae98f70c36fff6292f0a8fe4e578d89.zip
Merged from trunk (r12588).
(bzr r11608.1.129)
Diffstat (limited to 'src/box3d.cpp')
-rw-r--r--src/box3d.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/box3d.cpp b/src/box3d.cpp
index 0f528a592..193051ee5 100644
--- a/src/box3d.cpp
+++ b/src/box3d.cpp
@@ -255,11 +255,8 @@ Inkscape::XML::Node* SPBox3D::write(Inkscape::XML::Document *xml_doc, Inkscape::
return repr;
}
-gchar* SPBox3D::description() {
- SPBox3D* item = this;
-
- g_return_val_if_fail(SP_IS_BOX3D(item), NULL);
- return g_strdup(_("<b>3D Box</b>"));
+const char* SPBox3D::display_name() {
+ return _("3D Box");
}
void box3d_position_set(SPBox3D *box)