summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter/text.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2017-05-05 15:20:37 +0000
committerjabiertxof <info@marker.es>2017-05-05 15:20:37 +0000
commit9772b554c824cc7a6bc519672191f036f52a3054 (patch)
tree561f8b478eded4d89477290ff6b8a4f4015c4807 /src/live_effects/parameter/text.cpp
parentRemove unwanted cout (diff)
parentUpdate to trunk (diff)
downloadinkscape-9772b554c824cc7a6bc519672191f036f52a3054.tar.gz
inkscape-9772b554c824cc7a6bc519672191f036f52a3054.zip
merge lpeUpdDefaultParams
(bzr r15664)
Diffstat (limited to 'src/live_effects/parameter/text.cpp')
-rw-r--r--src/live_effects/parameter/text.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 47fbd39af..4062a4dc7 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -50,9 +50,9 @@ TextParam::param_set_default()
}
void
-TextParam::param_update_default(Glib::ustring default_value)
+TextParam::param_update_default(const gchar * default_value)
{
- defvalue = default_value;
+ defvalue = (Glib::ustring)default_value;
}
void