tweak label alignment

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index f386f2a0e5301224f16bd97305a7e63f2cad105d..21e534397976b39930a1e02fd8c7f3fb2dc21a55 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -38,7 +38,7 @@
 
 #include <jack/jack.h>
 
-#include "ardour/svn_revision.h"
+#include "ardour/revision.h"
 #include "ardour/version.h"
 #include "ardour/ardour.h"
 #include "ardour/audioengine.h"
@@ -184,6 +184,8 @@ fixup_bundle_environment (int, char* [])
        export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib");
        export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines");
 
+       setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(getenv ("PATH"))).c_str(), 1);
+
        /* unset GTK_RC_FILES so that we only load the RC files that we define
         */
 
@@ -223,10 +225,10 @@ fixup_bundle_environment (int, char* [])
 
 static void load_custom_fonts() {
 /* this code will only compile on OS X 10.6 and above, and we currently do not
- * need it anyway since we have no custom fonts on OS X. Leave it here in case
- * we ever need to comeback to it.
+ * need it for earlier versions since we fall back on a non-monospace,
+ * non-custom font.
  */
-#if 0
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
        std::string ardour_mono_file;
 
        if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
@@ -292,6 +294,8 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
        export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib");
        export_search_path (dir_path, "GTK_PATH", "/lib/gtkengines");
 
+       setenv ("PATH", (dir_path + "/bin:" + std::string(getenv ("PATH"))).c_str(), 1);
+
        /* unset GTK_RC_FILES so that we only load the RC files that we define
         */
 
@@ -485,7 +489,7 @@ int main (int argc, char *argv[])
        cout << PROGRAM_NAME
             << VERSIONSTRING
             << _(" (built using ")
-            << svn_revision
+            << revision
 #ifdef __GNUC__
             << _(" and GCC version ") << __VERSION__
 #endif