Use g_setenv and g_getenv for portability

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index ca50e4a97dc46022badcc654f874e54c79c2c414..cd26a8cf8f2259d90fd31cab908064d6861f76ff 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"
@@ -60,6 +60,10 @@
 
 #include "i18n.h"
 
+#ifdef __APPLE__
+#include <Carbon/Carbon.h>
+#endif
+
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR_COMMAND_LINE;
@@ -106,7 +110,7 @@ Please consider the possibilities, and perhaps (re)start JACK."), PROGRAM_NAME))
 static void export_search_path (const string& base_dir, const char* varname, const char* dir)
 {
        string path;
-       const char * cstr = getenv (varname);
+       const char * cstr = g_getenv (varname);
 
        if (cstr) {
                path = cstr;
@@ -117,7 +121,7 @@ static void export_search_path (const string& base_dir, const char* varname, con
        path += base_dir;
        path += dir;
 
-       setenv (varname, path.c_str(), 1);
+       g_setenv (varname, path.c_str(), 1);
 }
 
 #ifdef __APPLE__
@@ -130,7 +134,7 @@ extern void set_language_preference (); // cocoacarbon.mm
 void
 fixup_bundle_environment (int, char* [])
 {
-       if (!getenv ("ARDOUR_BUNDLED")) {
+       if (!g_getenv ("ARDOUR_BUNDLED")) {
                return;
        }
 
@@ -180,10 +184,12 @@ fixup_bundle_environment (int, char* [])
        export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib");
        export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines");
 
+       g_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
         */
 
-       unsetenv ("GTK_RC_FILES");
+       g_unsetenv ("GTK_RC_FILES");
 
        /* write a pango.rc file and tell pango to use it. we'd love
           to put this into the PROGRAM_NAME.app bundle and leave it there,
@@ -208,19 +214,21 @@ fixup_bundle_environment (int, char* [])
                                << endl;
                        pangorc.close ();
                        
-                       setenv ("PANGO_RC_FILE", path.c_str(), 1);
+                       g_setenv ("PANGO_RC_FILE", path.c_str(), 1);
                }
        }
        
-       setenv ("CHARSETALIASDIR", bundle_dir.c_str(), 1);
-       setenv ("FONTCONFIG_FILE", Glib::build_filename (bundle_dir, "Resources/fonts.conf").c_str(), 1);
-       setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (bundle_dir, "Resources/gdk-pixbuf.loaders").c_str(), 1);
+       g_setenv ("CHARSETALIASDIR", bundle_dir.c_str(), 1);
+       g_setenv ("FONTCONFIG_FILE", Glib::build_filename (bundle_dir, "Resources/fonts.conf").c_str(), 1);
+       g_setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (bundle_dir, "Resources/gdk-pixbuf.loaders").c_str(), 1);
 }
 
-#include <Carbon/Carbon.h>
-
 static void load_custom_fonts() {
-#if 0 // untested OSX code
+/* this code will only compile on OS X 10.6 and above, and we currently do not
+ * need it for earlier versions since we fall back on a non-monospace,
+ * non-custom font.
+ */
+#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)) {
@@ -231,7 +239,7 @@ static void load_custom_fonts() {
        CFURLRef fontURL;
        CFErrorRef error;
        ttf = CFStringCreateWithBytes(
-                       kCFAllocatorDefault, ardour_mono_filec_str(),
+                       kCFAllocatorDefault, (UInt8*) ardour_mono_file.c_str(),
                        ardour_mono_file.length(),
                        kCFStringEncodingUTF8, FALSE);
        fontURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, ttf, kCFURLPOSIXPathStyle, TRUE);
@@ -250,7 +258,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
         * acceptable to build paths directly using '/'.
         */
 
-       if (!getenv ("ARDOUR_BUNDLED")) {
+       if (!g_getenv ("ARDOUR_BUNDLED")) {
                return;
        }
 
@@ -286,18 +294,20 @@ 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");
 
+       g_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
         */
 
-       unsetenv ("GTK_RC_FILES");
+       g_unsetenv ("GTK_RC_FILES");
 
        /* Tell fontconfig where to find fonts.conf. Use the system version
           if it exists, otherwise use the stuff we included in the bundle
        */
 
        if (Glib::file_test ("/etc/fonts/fonts.conf", Glib::FILE_TEST_EXISTS)) {
-               setenv ("FONTCONFIG_FILE", "/etc/fonts/fonts.conf", 1);
-               setenv ("FONTCONFIG_PATH", "/etc/fonts", 1);
+               g_setenv ("FONTCONFIG_FILE", "/etc/fonts/fonts.conf", 1);
+               g_setenv ("FONTCONFIG_PATH", "/etc/fonts", 1);
        } else {
                error << _("No fontconfig file found on your system. Things may looked very odd or ugly") << endmsg;
        }
@@ -326,19 +336,19 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
                        pangorc.close ();
                }
                
-               setenv ("PANGO_RC_FILE", path.c_str(), 1);
+               g_setenv ("PANGO_RC_FILE", path.c_str(), 1);
                
                /* similar for GDK pixbuf loaders, but there's no RC file required
                   to specify where it lives.
                */
                
-               setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (userconfigdir, "gdk-pixbuf.loaders").c_str(), 1);
+               g_setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (userconfigdir, "gdk-pixbuf.loaders").c_str(), 1);
        }
 
         /* this doesn't do much but setting it should prevent various parts of the GTK/GNU stack
            from looking outside the bundle to find the charset.alias file.
         */
-        setenv ("CHARSETALIASDIR", dir_path.c_str(), 1);
+        g_setenv ("CHARSETALIASDIR", dir_path.c_str(), 1);
 
 }
 
@@ -463,7 +473,7 @@ int main (int argc, char *argv[])
        text_receiver.listen_to (warning);
 
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
-       if (getenv ("BOOST_DEBUG")) {
+       if (g_getenv ("BOOST_DEBUG")) {
                boost_debug_shared_ptr_show_live_debugging (true);
        }
 #endif
@@ -479,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