diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/SConscript | 2 | ||||
| -rw-r--r-- | gtk2_ardour/about.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/main.cc | 13 |
4 files changed, 10 insertions, 12 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 02ba7dd9c1..40e7855a1b 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -306,7 +306,7 @@ env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pix env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/icons'), icon_files)) env.AlwaysBuild ('version.cc') -env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], ['..'])) +env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], 'SConscript')) #dist env.Alias ('tarball', env.Distribute (env['DISTTREE'], diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index fcae1784a3..16512b5951 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -190,7 +190,7 @@ About::About () set_name (X_("ardour")); set_website (X_("http://ardour.org/")); set_website_label (X_("visit http://www.ardour.org/")); - set_version ((string_compose(_("%1\n(built from revision %s"), + set_version ((string_compose(_("%1\n(built from revision %2)"), VERSIONSTRING, gtk_ardour_revision))); diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 7548f94c5b..18cb808eeb 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1873,10 +1873,6 @@ ARDOUR_UI::show () shown_flag = true; } - - if (about) { - about->present (); - } } void @@ -1886,6 +1882,7 @@ ARDOUR_UI::show_splash () about = new About(); } about->present(); + flush_pending (); } void diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 049ef29ead..6182182d38 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -259,7 +259,6 @@ show_ui_callback (void *arg) ARDOUR_UI * ui = (ARDOUR_UI *) arg; ui->hide_splash(); - ui->show (); return FALSE; } @@ -286,7 +285,7 @@ Please consider the possibilities, and perhaps (re)start JACK.")); win.set_position (Gtk::WIN_POS_CENTER); if (!no_splash) { - ui->hide_splash (); + ui->hide_splash (); } /* we just don't care about the result, but we want to block */ @@ -329,10 +328,12 @@ To create it from the command line, start ardour as \"ardour --new %1"), path) < ui->load_session (path, name); } else { - /* TODO: This bit of code doesn't work properly yet - Glib::signal_idle().connect (bind (mem_fun (*ui, &ARDOUR_UI::cmdline_new_session), path)); - ui->set_will_create_new_session_automatically (true); */ + /* TODO: This bit of code doesn't work properly yet + Glib::signal_idle().connect (bind (mem_fun (*ui, &ARDOUR_UI::cmdline_new_session), path)); + ui->set_will_create_new_session_automatically (true); + */ + /* Show the NSD */ ui->hide_splash (); if (!Config->get_no_new_session_dialog()) { @@ -383,7 +384,7 @@ int main (int argc, char *argv[]) cout << _("Ardour/GTK ") << VERSIONSTRING << _("\n (built using ") - << ARDOUR::get_ardour_revision () + << gtk_ardour_revision #ifdef __GNUC__ << _(" and GCC version ") << __VERSION__ #endif |