From 544dd176fa55a0a3a3f35d879f74f0601e46914e Mon Sep 17 00:00:00 2001 From: pabs Date: Sun, 30 Mar 2008 11:36:40 +0000 Subject: [PATCH] Use ETL directory separator instead of forward slashes. git-svn-id: http://svn.voria.com/code@1940 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/src/gtkmm/about.cpp | 5 +++-- synfig-studio/trunk/src/gtkmm/iconcontroller.cpp | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/synfig-studio/trunk/src/gtkmm/about.cpp b/synfig-studio/trunk/src/gtkmm/about.cpp index 110fde1..b3e4f52 100644 --- a/synfig-studio/trunk/src/gtkmm/about.cpp +++ b/synfig-studio/trunk/src/gtkmm/about.cpp @@ -174,8 +174,9 @@ About::About() if(synfig_root) { imagepath=synfig_root; imagepath+=ETL_DIRECTORY_SEPARATOR; - - imagepath+="share/pixmaps"; + imagepath+="share"; + imagepath+=ETL_DIRECTORY_SEPARATOR; + imagepath+="pixmaps"; } imagepath+=ETL_DIRECTORY_SEPARATOR; diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp index 2af5543..448a8c6 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp @@ -83,7 +83,7 @@ IconController::IconController(const synfig::String& /*basepath*/) std::string path_to_icons; #ifdef WIN32 - path_to_icons=basepath+"/../"+IMAGE_DIR; + path_to_icons=basepath+ETL_DIRECTORY_SEPARATOR+".."+ETL_DIRECTORY_SEPARATOR+IMAGE_DIR; #else path_to_icons=IMAGE_DIR; #endif @@ -92,8 +92,11 @@ IconController::IconController(const synfig::String& /*basepath*/) if(synfig_root) { path_to_icons=synfig_root; path_to_icons+=ETL_DIRECTORY_SEPARATOR; - - path_to_icons+="share/pixmaps/synfigstudio"; + path_to_icons+="share"; + path_to_icons+=ETL_DIRECTORY_SEPARATOR; + path_to_icons+="pixmaps"; + path_to_icons+=ETL_DIRECTORY_SEPARATOR; + path_to_icons+="synfigstudio"; } path_to_icons+=ETL_DIRECTORY_SEPARATOR; -- 2.7.4