summaryrefslogtreecommitdiffstats
path: root/src/gui/GladeFactory.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-10-20 02:02:27 +0000
committerDavid Robillard <d@drobilla.net>2008-10-20 02:02:27 +0000
commit955c64efcf30e87ab3d4bdb1520745c1997f0953 (patch)
tree7237ea80d10bf5a25fec1cb8e870ac55448ca444 /src/gui/GladeFactory.cpp
parent5e09c3e596c1b0860a996cf8f6023b43d5286a4a (diff)
downloadingen-955c64efcf30e87ab3d4bdb1520745c1997f0953.tar.gz
ingen-955c64efcf30e87ab3d4bdb1520745c1997f0953.tar.bz2
ingen-955c64efcf30e87ab3d4bdb1520745c1997f0953.zip
Make Ingen and Patchage relocatable binaries when built as a bundle.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1690 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/GladeFactory.cpp')
-rw-r--r--src/gui/GladeFactory.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/gui/GladeFactory.cpp b/src/gui/GladeFactory.cpp
index 81640d57..792e67ac 100644
--- a/src/gui/GladeFactory.cpp
+++ b/src/gui/GladeFactory.cpp
@@ -19,6 +19,7 @@
#include <iostream>
#include <fstream>
#include "config.h"
+#include "shared/runtime_paths.hpp"
using namespace std;
@@ -36,21 +37,15 @@ GladeFactory::find_glade_file()
if (env_path)
glade_filename = env_path;
else
- glade_filename = "./ingen_gui.glade";
+ glade_filename = Shared::data_file_path("ingen_gui.glade");
ifstream fs(glade_filename.c_str());
- if (fs.fail()) { // didn't find it, check INGEN_DATA_DIR
- fs.clear();
- 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 " << INGEN_DATA_DIR << "." << endl;
- throw;
- }
- fs.close();
+ if (fs.fail()) {
+ cerr << "Unable to find ingen_gui.glade in " << INGEN_DATA_DIR << endl;
+ throw;
}
+
+ fs.close();
cerr << "[GladeFactory] Loading widgets from " << glade_filename.c_str() << endl;
}