X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ficoncontroler.cpp;h=68a819093586ec4eeb11022b077313891183859e;hb=6ee1233ccd00e071d9a1b1f305d980ed91bd1939;hp=36adb8baaa63638b64ef312c44af74132a1b28f2;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
index 36adb8b..68a8190 100644
--- a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
+++ b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
@@ -5,16 +5,17 @@
 **	$Id: iconcontroler.cpp,v 1.1.1.1 2005/01/07 03:34:36 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
 */
 /* ========================================================================= */
@@ -85,6 +86,14 @@ IconControler::IconControler(const synfig::String& basepath)
 #else
 	path_to_icons=IMAGE_DIR;
 #endif
+
+	char* synfig_root=getenv("SYNFIG_ROOT");
+	if(synfig_root) {
+		path_to_icons=synfig_root;
+		path_to_icons+=ETL_DIRECTORY_SEPERATOR;
+		
+		path_to_icons+="share/pixmaps";
+	}
 	path_to_icons+=ETL_DIRECTORY_SEPERATOR;
 
 	try{