diff options
author | Carl Hetherington <carl@carlh.net> | 2010-09-19 17:10:43 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-09-19 17:10:43 +0000 |
commit | e47d4633095e05ad1ed47a9ac038b043eaf75000 (patch) | |
tree | 9f5d60411dc952dc49c7e50af6348711fb0429b6 | |
parent | aa00dbc40e00aa43caae6bfc188a27be2f23c636 (diff) |
Cleanup patch from Karsten Wiese. Fixes #3462.
git-svn-id: svn://localhost/ardour2/branches/3.0@7807 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/startup.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index 07a39fd418..186608e596 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -39,6 +39,7 @@ #include "opts.h" #include "engine_dialog.h" #include "i18n.h" +#include "utils.h" using namespace std; using namespace Gtk; @@ -93,17 +94,7 @@ Ardour will play NO role in monitoring")) set_position (WIN_POS_CENTER); set_border_width (12); - sys::path icon_file; - - if (!find_file_in_search_path (ardour_search_path() + system_data_search_path().add_subdirectory_to_paths("icons"), "ardour_icon_48px.png", icon_file)) { - throw failed_constructor(); - } - - try { - icon_pixbuf = Gdk::Pixbuf::create_from_file (icon_file.to_string()); - } - - catch (...) { + if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == 0) { throw failed_constructor(); } |