X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ficoncontroler.cpp;h=2afde90e3127044ac0501ce5544b84969795d068;hb=99b75ef1bb279e2314516f922f05696263d5bd27;hp=41bdf4c6f21a38c4507acc342908d7a7a2d7698d;hpb=1905325be0aa16501c1a802b70da251fb5657b43;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
index 41bdf4c..2afde90 100644
--- a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
+++ b/synfig-studio/trunk/src/gtkmm/iconcontroler.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
@@ -72,7 +73,11 @@ using namespace synfig;
 
 static Glib::RefPtr<Gdk::Pixbuf> _tree_pixbuf_table_value_type[(int)synfig::ValueBase::TYPE_END];
 
+#ifdef WIN32
 IconControler::IconControler(const synfig::String& basepath)
+#else
+IconControler::IconControler(const synfig::String& /*basepath*/)
+#endif
 {
 	Gtk::IconSource icon_source;
 	icon_source.set_direction_wildcarded();
@@ -90,11 +95,11 @@ IconControler::IconControler(const synfig::String& basepath)
 	char* synfig_root=getenv("SYNFIG_ROOT");
 	if(synfig_root) {
 		path_to_icons=synfig_root;
-		path_to_icons+=ETL_DIRECTORY_SEPERATOR;
+		path_to_icons+=ETL_DIRECTORY_SEPARATOR;
 
-		path_to_icons+="share/pixmaps";
+		path_to_icons+="share/pixmaps/synfigstudio";
 	}
-	path_to_icons+=ETL_DIRECTORY_SEPERATOR;
+	path_to_icons+=ETL_DIRECTORY_SEPARATOR;
 
 	try{
 	Gtk::Window::set_default_icon_from_file(path_to_icons+"synfig_icon."+IMAGE_EXT);