X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=4b6dda545e63ec0d0e5b99dabe84be9a34210f45;hb=c6813c86286b1e3185f883eb7e52a292fee07428;hp=2c6349654681b8060f788879dd5350879422a210;hpb=2cc368cc2c990b39089a8898f6dc03e07970ba36;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index 2c63496..4b6dda5 100644
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.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
@@ -263,18 +264,15 @@ studio::Instance::dialog_save_as()
 		if(find(filename.begin(),filename.end(),'*')!=filename.end())
 			continue;
 
-		std::string base = basename(filename);
-		if(find(base.begin(),base.end(),'.')==base.end())
+		if (filename_extension(filename) == "")
 			filename+=".sifz";
 
 		try
 		{
-			String ext(String(filename.begin()+filename.find_last_of('.')+1,filename.end()));
-			if(ext!="sif" && ext!="sifz" && !App::dialog_yes_no(_("Unknown extension"),
+			String ext(filename_extension(filename));
+			if(ext!=".sif" && ext!=".sifz" && !App::dialog_yes_no(_("Unknown extension"),
 				_("You have given the file name an extension\nwhich I do not recognise. Are you sure this is what you want?")))
-			{
 				continue;
-			}
 		}
 		catch(...)
 		{
@@ -696,7 +694,7 @@ Instance::add_actions_to_group(const Glib::RefPtr<Gtk::ActionGroup>& action_grou
 	candidate_list.sort();
 
 	if(candidate_list.empty())
-		synfig::warning("Action CandidateList is empty!");
+		synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__);
 
 	for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
 	{
@@ -736,7 +734,7 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
 	candidate_list.sort();
 
 	if(candidate_list.empty())
-		synfig::warning("Action CandidateList is empty!");
+		synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__);
 
 	for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
 	{
@@ -805,9 +803,9 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
 	candidate_list.sort();
 
 	if(candidate_list.empty())
-		synfig::warning("Action CandidateList is empty!");
+		synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__);
 	if(candidate_list2.empty())
-		synfig::warning("Action CandidateList2 is empty!");
+		synfig::warning("%s:%d Action CandidateList2 is empty!", __FILE__, __LINE__);
 
 	// Seperate out the candidate lists so that there are no conflicts
 	for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)