projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid warning from g++ 4.3.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
synfigapp
/
actions
/
layeractivate.cpp
diff --git
a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
index
835fd69
..
948bc6f
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
+++ b/
synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
@@
-68,13
+68,12
@@
Action::LayerActivate::get_local_name()const
{
if(!layer)
return _("Activate Layer");
{
if(!layer)
return _("Activate Layer");
- String name;
- if(layer->get_description().empty())
- name=layer->get_local_name();
- else
- name=layer->get_description();
- return (new_status?_("Activate "):_("Deactivate "))+name;
+ return strprintf("%s '%s'",
+ new_status
+ ? _("Activate Layer")
+ : _("Deactivate Layer"),
+ layer->get_non_empty_description().c_str());
}
Action::ParamVocab
}
Action::ParamVocab