Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-studio / tags / stable / src / synfigapp / actions / valuenodedynamiclistunloop.cpp

diff --git a/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistunloop.cpp b/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
index 4e4aab5..079be3a 100644 (file)
--- a/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
+++ b/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**  Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -32,6 +33,8 @@
 #include "valuenodedynamiclistunloop.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -44,7 +47,7 @@ using namespace Action;
 
 ACTION_INIT(Action::ValueNodeDynamicListUnLoop);
 ACTION_SET_NAME(Action::ValueNodeDynamicListUnLoop,"value_node_dynamic_list_unloop");
-ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListUnLoop,"Unloop");
+ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListUnLoop,N_("Unloop"));
 ACTION_SET_TASK(Action::ValueNodeDynamicListUnLoop,"unloop");
 ACTION_SET_CATEGORY(Action::ValueNodeDynamicListUnLoop,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::ValueNodeDynamicListUnLoop,0);
@@ -76,21 +79,21 @@ Action::ValueNodeDynamicListUnLoop::get_param_vocab()
 bool
 Action::ValueNodeDynamicListUnLoop::is_candidate(const ParamList &x)
 {
-       if(candidate_check(get_param_vocab(),x))
-       {
-               ValueNode::Handle value_node;
-               ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
-               if(value_desc.parent_is_value_node())
-                       value_node = value_desc.get_parent_value_node();
-               else
-                       value_node = x.find("value_node")->second.get_value_node();
-               if(!ValueNode_DynamicList::Handle::cast_dynamic(value_node))
-                       return false;
-               if(ValueNode_DynamicList::Handle::cast_dynamic(value_node)->get_loop()==false)
-                       return false;
-               return true;
-       }
-       return false;
+       if (!candidate_check(get_param_vocab(),x))
+               return false;
+
+       ValueNode::Handle value_node;
+       ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
+
+       if(value_desc.parent_is_value_node())
+               value_node = value_desc.get_parent_value_node();
+       else
+               value_node = x.find("value_node")->second.get_value_node();
+
+       // We need a dynamic list.
+       return (ValueNode_DynamicList::Handle::cast_dynamic(value_node) &&
+                       // We need the list to be looped.
+                       ValueNode_DynamicList::Handle::cast_dynamic(value_node)->get_loop());
 }
 
 bool