diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2017-05-05 15:20:37 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2017-05-05 15:20:37 +0000 |
| commit | 9772b554c824cc7a6bc519672191f036f52a3054 (patch) | |
| tree | 561f8b478eded4d89477290ff6b8a4f4015c4807 /src/live_effects/parameter/unit.cpp | |
| parent | Remove unwanted cout (diff) | |
| parent | Update to trunk (diff) | |
| download | inkscape-9772b554c824cc7a6bc519672191f036f52a3054.tar.gz inkscape-9772b554c824cc7a6bc519672191f036f52a3054.zip | |
merge lpeUpdDefaultParams
(bzr r15664)
Diffstat (limited to 'src/live_effects/parameter/unit.cpp')
| -rw-r--r-- | src/live_effects/parameter/unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/live_effects/parameter/unit.cpp b/src/live_effects/parameter/unit.cpp index df0307f97..b9b91c1e6 100644 --- a/src/live_effects/parameter/unit.cpp +++ b/src/live_effects/parameter/unit.cpp @@ -55,9 +55,9 @@ UnitParam::param_set_default() } void -UnitParam::param_update_default(const Glib::ustring default_unit) +UnitParam::param_update_default(const gchar * default_unit) { - defunit = unit_table.getUnit(default_unit); + defunit = unit_table.getUnit((Glib::ustring)default_unit); } void |