From 67c3b09a1e46cad7acf84801cd89ccef48fb2bf6 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 30 Sep 2008 07:52:18 +0000 Subject: Wafify ingen. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1548 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/gui/App.cpp | 2 +- src/libs/gui/GladeFactory.cpp | 6 ++-- src/libs/gui/LoadPatchWindow.cpp | 2 +- src/libs/gui/LoadSubpatchWindow.cpp | 2 +- src/libs/gui/Makefile.am | 2 +- src/libs/gui/wscript | 65 +++++++++++++++++++++++++++++++++++++ 6 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 src/libs/gui/wscript (limited to 'src/libs/gui') diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp index 9cf69596..f49d394c 100644 --- a/src/libs/gui/App.cpp +++ b/src/libs/gui/App.cpp @@ -107,7 +107,7 @@ App::run(int argc, char** argv, Ingen::Shared::World* world) _instance->configuration()->apply_settings(); // Set default window icon - const Glib::ustring icon_path = PKGDATADIR "/ingen.svg"; + const Glib::ustring icon_path = INGEN_DATA_DIR "/ingen.svg"; try { if (Glib::file_test(icon_path, Glib::FILE_TEST_EXISTS)) Gtk::Window::set_default_icon_from_file(icon_path); diff --git a/src/libs/gui/GladeFactory.cpp b/src/libs/gui/GladeFactory.cpp index 63dc4d0b..2b4d3ec9 100644 --- a/src/libs/gui/GladeFactory.cpp +++ b/src/libs/gui/GladeFactory.cpp @@ -38,14 +38,14 @@ GladeFactory::find_glade_file() glade_filename = "./ingen_gui.glade"; ifstream fs(glade_filename.c_str()); - if (fs.fail()) { // didn't find it, check PKGDATADIR + if (fs.fail()) { // didn't find it, check INGEN_DATA_DIR fs.clear(); - glade_filename = PKGDATADIR; + glade_filename = INGEN_DATA_DIR; glade_filename += "/ingen_gui.glade"; fs.open(glade_filename.c_str()); if (fs.fail()) { - cerr << "[GladeFactory] Unable to find ingen_gui.glade in current directory or " << PKGDATADIR << "." << endl; + cerr << "[GladeFactory] Unable to find ingen_gui.glade in current directory or " << INGEN_DATA_DIR << "." << endl; throw; } fs.close(); diff --git a/src/libs/gui/LoadPatchWindow.cpp b/src/libs/gui/LoadPatchWindow.cpp index c33ad495..70d3ec5b 100644 --- a/src/libs/gui/LoadPatchWindow.cpp +++ b/src/libs/gui/LoadPatchWindow.cpp @@ -60,7 +60,7 @@ LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr