X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fmodule.cpp;h=7e50d081770bc178e006a1fc799e11098c464beb;hb=3c8b24929765c51ae41675f49c71c7e017d4f301;hp=f893b74e963041eae2c9ce48877918be4685ce39;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/module.cpp b/synfig-core/trunk/src/synfig/module.cpp
index f893b74..7e50d08 100644
--- a/synfig-core/trunk/src/synfig/module.cpp
+++ b/synfig-core/trunk/src/synfig/module.cpp
@@ -1,27 +1,28 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file module.cpp
 **	\brief writeme
 **
 **	$Id: module.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
 
 /* === H E A D E R S ======================================================= */
 
-#define SINFG_NO_ANGLE
+#define SYNFIG_NO_ANGLE
 
 #ifdef USING_PCH
 #	include "pch.h"
@@ -42,16 +43,16 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
-Module::Book *sinfg::Module::book_;
+Module::Book *synfig::Module::book_;
 
 /* === P R O C E D U R E S ================================================= */
 
 bool
 Module::subsys_init(const String &prefix)
 {
-	#ifndef SINFG_LTDL_NO_STATIC
+	#ifndef SYNFIG_LTDL_NO_STATIC
 	//LTDL_SET_PRELOADED_SYMBOLS();
 	#endif
 	
@@ -63,15 +64,15 @@ Module::subsys_init(const String &prefix)
 	}
 
 	lt_dladdsearchdir(".");
-	lt_dladdsearchdir("~/.sinfg/modules");
-	lt_dladdsearchdir((prefix+"/lib/sinfg/modules").c_str());
+	lt_dladdsearchdir("~/.synfig/modules");
+	lt_dladdsearchdir((prefix+"/lib/synfig/modules").c_str());
 #ifdef LIBDIR
-	lt_dladdsearchdir(LIBDIR"/sinfg/modules");
+	lt_dladdsearchdir(LIBDIR"/synfig/modules");
 #endif
 #ifdef __APPLE__
-	lt_dladdsearchdir("/Library/Frameworks/sinfg.framework/Resources/modules");
+	lt_dladdsearchdir("/Library/Frameworks/synfig.framework/Resources/modules");
 #endif
-	lt_dladdsearchdir("/usr/local/lib/sinfg/modules");
+	lt_dladdsearchdir("/usr/local/lib/synfig/modules");
 	lt_dladdsearchdir(".");
 	
 	book_=new Book;
@@ -100,13 +101,13 @@ Module::book()
 }
 
 void
-sinfg::Module::Register(Module::Handle mod)
+synfig::Module::Register(Module::Handle mod)
 {
 	book()[mod->Name()]=mod;
 }
 
 bool
-sinfg::Module::Register(const String &module_name, ProgressCallback *callback)
+synfig::Module::Register(const String &module_name, ProgressCallback *callback)
 {
 	lt_dlhandle module;
 
@@ -117,7 +118,7 @@ sinfg::Module::Register(const String &module_name, ProgressCallback *callback)
 	
 	if(!module)
 	{
-		if(callback)callback->error(strprintf(_("Unable to find module \"%s\" (%s)"),module_name.c_str(),lt_dlerror()));
+		if(callback)callback->warning(strprintf(_("Unable to find module \"%s\" (%s)"),module_name.c_str(),lt_dlerror()));
 		return false;
 	}