projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid warnings from g++ 4.3.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
layerparamtreestore.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
index
bde9efe
..
f56de42
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
@@
-133,11
+133,7
@@
LayerParamTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int
Glib::Value<Glib::ustring> x;
g_value_init(x.gobj(),x.value_type());
Glib::Value<Glib::ustring> x;
g_value_init(x.gobj(),x.value_type());
-
- if(!layer->get_description().empty())
- x.set(layer->get_description());
- else
- x.set(layer->get_local_name());
+ x.set(layer->get_non_empty_description());
g_value_init(value.gobj(),x.value_type());
g_value_copy(x.gobj(),value.gobj());
g_value_init(value.gobj(),x.value_type());
g_value_copy(x.gobj(),value.gobj());
@@
-303,7
+299,7
@@
LayerParamTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co
void
LayerParamTreeStore::rebuild()
{
void
LayerParamTreeStore::rebuild()
{
- Profiler profiler("LayerParamTreeStore::rebuild()");
+
//
Profiler profiler("LayerParamTreeStore::rebuild()");
if(queued)queued=false;
clear();
layer_list=layer_tree->get_selected_layers();
if(queued)queued=false;
clear();
layer_list=layer_tree->get_selected_layers();