X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcanvasinterface.cpp;h=030fb8747790d1898cfdcf1083236eaa9edf83e3;hb=6512163381350bda37884f1692932bdb0d1d4b3a;hp=ba49e886bd4c2c04b7236b1258bd047335f282be;hpb=0821cea41994ae2a458ca7cb146745a9c599b277;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index ba49e88..030fb87 100644
--- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
+++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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
@@ -106,9 +107,10 @@ CanvasInterface::set_time(synfig::Time x)
 	get_canvas()->set_time(cur_time_=x);
 
 	// update the time in all the child canvases
-	Canvas::Children children = get_canvas()->children();
+	Canvas::Children children = get_canvas()->get_root()->children();
+	handle<CanvasInterface> interface;
 	for (Canvas::Children::iterator iter = children.begin(); iter != children.end(); iter++)
-		if (handle<CanvasInterface> interface = get_instance()->find_canvas_interface(*iter))
+		if ((interface = get_instance()->find_canvas_interface(*iter)) != this)
 			interface->set_time(interface->get_canvas()->get_time());
 
 	signal_time_changed()();
@@ -204,7 +206,7 @@ CanvasInterface::add_layer_to(String name, Canvas::Handle canvas, int depth)
 	layer->set_param("blend_method",synfigapp::Main::get_blend_method());
 
 	{
-		// Grab the layer's list pf parameters
+		// Grab the layer's list of parameters
 		Layer::ParamList paramlist=layer->get_param_list();
 		Layer::ParamList::iterator iter;
 		for(iter=paramlist.begin();iter!=paramlist.end();++iter)
@@ -475,14 +477,14 @@ CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
 
 	synfig::info("Attempting to import "+filename);
 
-
-	if(find(filename.begin(),filename.end(),'.')==filename.end())
+	if (filename_extension(filename) == "")
 	{
 		get_ui_interface()->error("Filename must have an extension!");
 		return false;
 	}
 
-	String ext(String(filename.begin()+filename.find_last_of('.')+1,filename.end()));
+	String ext(filename_extension(filename));
+	if (ext.size()) ext = ext.substr(1); // skip initial '.'
 	std::transform(ext.begin(),ext.end(),ext.begin(),&::tolower);
 
 	// If this is a SIF file, then we need to do things slightly differently