X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fsavecanvas.cpp;h=299472ba2b63be87213e20b6da2c144e5af67633;hb=4d2cf011c73551bbe67518097063e22ecdac7c7c;hp=58d40ede4044a8b980f644f7e534e0f10252bd2b;hpb=829462f9bbb66c859f8c4522c6ebee28eeb5605b;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 58d40ed..299472b 100644
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -248,7 +248,7 @@ xmlpp::Element* encode_value(xmlpp::Element* root,const ValueBase &data,Canvas::
 		root->set_name("nil");
 		return root;
 	default:
-		synfig::error(strprintf("Unknown value(%s), cannot create XML representation!",ValueBase::type_name(data.get_type()).c_str()));
+		synfig::error(strprintf(_("Unknown value(%s), cannot create XML representation!"),ValueBase::type_local_name(data.get_type()).c_str()));
 		root->set_name("nil");
 		return root;
 	}
@@ -352,7 +352,7 @@ xmlpp::Element* encode_composite(xmlpp::Element* root,ValueNode_Composite::Const
 	int i;
 	for(i=0;i<value_node->link_count();i++)
 	{
-		string name(strprintf("c%d",i+1));
+		string name(value_node->link_name(i));
 		assert(value_node->get_link(i));
 		if(value_node->get_link(i)->is_exported())
 			root->set_attribute(name,value_node->get_link(i)->get_relative_id(canvas));
@@ -636,7 +636,7 @@ xmlpp::Element* encode_canvas(xmlpp::Element* root,Canvas::ConstHandle canvas)
 	root->set_name("canvas");
 
 	if(canvas->is_root())
-		root->set_attribute("version","0.1");
+		root->set_attribute("version",canvas->get_version());
 
 	if(!canvas->get_id().empty() && !canvas->is_root() && !canvas->is_inline())
 		root->set_attribute("id",canvas->get_id());
@@ -705,7 +705,8 @@ xmlpp::Element* encode_canvas(xmlpp::Element* root,Canvas::ConstHandle canvas)
 	}
 
 	// Output the <defs> section
-	if(!canvas->is_inline() && !canvas->value_node_list().empty() || !canvas->children().empty())
+	//! \todo check where the parentheses should really go - around the && or the ||?
+	if((!canvas->is_inline() && !canvas->value_node_list().empty()) || !canvas->children().empty())
 	{
 		xmlpp::Element *node=root->add_child("defs");
 		const ValueNodeList &value_node_list(canvas->value_node_list());