Merged with trunk (painfully)

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 065188dc8bf7f990c698bf642bfb21b0d725cb74..e9ac25a8f81b0f28e8f781dc6eff69473a43e67e 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -251,8 +251,10 @@ which_ui_rcfile ()
        
        if (rcfile.empty()) {
                warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR2_UI_RC to point to a valid UI style file") << endmsg;
+       } else {
+               cerr << "Loading ui configuration file " << rcfile << endl;
        }
-
+       
        return rcfile;
 }
 
@@ -365,6 +367,9 @@ main (int argc, char *argv[])
        ARDOUR::AudioEngine *engine;
        vector<Glib::ustring> null_file_list;
 
+        // needs a better home.
+        Glib::thread_init();
+        
        gtk_set_locale ();
 
        (void)   bindtextdomain (PACKAGE, LOCALEDIR);
@@ -457,5 +462,7 @@ main (int argc, char *argv[])
        delete engine;
        ARDOUR::cleanup ();
        shutdown (0);
+
+       /* just another commit forcing change */
 }