synchronize preferences and monitor-section

[ardour.git] / gtk2_ardour / about.cc

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index b656c29ad8175fde37d430a630095338fe0c6e93..f3af8a8ff6363bbd256ae8cd6c8c31abab460341 100644 (file)
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -30,7 +30,6 @@
 #include "ardour/version.h"
 #include "ardour/filesystem_paths.h"
 
-#include "utils.h"
 #include "version.h"
 
 #include "about.h"
@@ -40,6 +39,10 @@
 
 #include "i18n.h"
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-version.h"
+#endif
+
 using namespace Gtk;
 using namespace Gdk;
 using namespace std;
@@ -125,7 +128,9 @@ static const char* authors[] = {
        N_("Hans Baier"),
        N_("Ben Bell"),
        N_("Sakari Bergen"),
+       N_("Christian Borss"),
        N_("Chris Cannam"),
+       N_("Jeremy Carter"),
        N_("Jesse Chappell"),
        N_("Thomas Charbonnel"),
        N_("Sam Chessman"),
@@ -264,7 +269,7 @@ patent must be licensed for everyone's free use or not licensed at all.\n\
   The precise terms and conditions for copying, distribution and\n\
 modification follow.\n\
 \f\n\
-                   GNU GENERAL PUBLIC LICENSE\n\
+""                 GNU GENERAL PUBLIC LICENSE\n\
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n\
 \n\
   0. This License applies to any program or other work which contains\n\
@@ -546,7 +551,9 @@ proprietary programs.  If your program is a subroutine library, you may\n\
 consider it more useful to permit linking proprietary applications with the\n\
 library.  If this is what you want to do, use the GNU Library General\n\
 Public License instead of this License.\n\
-");
+"); /* Note that at the start of (approximately) line 265, the above license
+       text has been split into two concatenated tokens (to satisfy compilation
+       under MSVC). Hopefully this won't affect gcc */
 
 About::About ()
        : config_info (0)
@@ -562,7 +569,7 @@ About::About ()
 
        Searchpath spath(ardour_data_search_path());
 
-       if (find_file_in_search_path (spath, "splash.png", splash_file)) {
+       if (find_file (spath, "splash.png", splash_file)) {
                set_logo (Gdk::Pixbuf::create_from_file (splash_file));
        } else {
                error << "Could not find splash file" << endmsg;