Fixing issues with opening a browser when using the bundle. Use xdg-open instead of glib functions. Fix to epa to ensure that the enviroment is restored correctly. The current enviroment has to be cleared. Otherwise any variables that are set in the current enviroment, but do not have a setting in the restored version will be left set.

git-svn-id: svn://localhost/ardour2/branches/3.0@12812 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 23 insertions, 1 deletions

diff --git a/libs/pbd/epa.cc b/libs/pbd/epa.cc
index 3d3f7477d7..2d5ec29506 100644
--- a/libs/pbd/epa.cc
+++ b/libs/pbd/epa.cc
@@ -115,7 +115,29 @@ EnvironmentalProtectionAgency::save ()
 void
 EnvironmentalProtectionAgency::restore () const
 {
+		clear ();
+
         for (map<string,string>::const_iterator i = e.begin(); i != e.end(); ++i) {
                 setenv (i->first.c_str(), i->second.c_str(), 1);
         }
-}                         
+} 
+
+void
+EnvironmentalProtectionAgency::clear () const
+{
+        char** the_environ = environ;
+
+        for (size_t i = 0; the_environ[i]; ++i) {
+			
+                string estring = the_environ[i];
+                string::size_type equal = estring.find_first_of ('=');
+			
+                if (equal == string::npos) {
+                        /* say what? an environ value without = ? */
+                        continue;
+                }
+			
+                string before = estring.substr (0, equal);
+                unsetenv(before.c_str());
+        }
+}