Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / about.cc

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 85d089f13dc882c242bcbfc8345453706303c367..b2dac673799fefa96c9499589106bc3a1f78f07c 100644 (file)
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -20,7 +20,6 @@
 #include <algorithm>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/wait.h>
 #include <cstdio>
 #include <ctime>
 #include <cstdlib>
@@ -41,6 +40,10 @@
 
 #include "i18n.h"
 
+#ifdef SearchPath
+#undef SearchPath
+#endif
+
 using namespace Gtk;
 using namespace Gdk;
 using namespace std;
@@ -185,7 +188,8 @@ static const char* translators[] = {
 \n\tRobert Schwede <schwede@ironshark.com>\
 \n\tBenjamin Scherrer <realhangman@web.de>\
 \n\tEdgar Aichinger <edogawa@aon.at>\
-\n\tRichard Oax <richard@pagliacciempire.de>\n"),
+\n\tRichard Oax <richard@pagliacciempire.de>\
+\n\tRobin Gloster <robin@loc-com.de>\n"),
        N_("Italian:\n\tFilippo Pappalardo <filippo@email.it>\n\tRaffaele Morelli <raffaele.morelli@gmail.com>\n"),
        N_("Portuguese:\n\tRui Nuno Capela <rncbc@rncbc.org>\n"),
        N_("Brazilian Portuguese:\n\tAlexander da Franca Fernandes <alexander@nautae.eti.br>\
@@ -590,6 +594,11 @@ About::About ()
        get_action_area()->add (*config_button);
        get_action_area()->reorder_child (*config_button, 0);
        config_button->signal_clicked().connect (mem_fun (*this, &About::show_config_info));
+
+       Gtk::Button *btn = static_cast<Gtk::Button*>(get_widget_for_response(Gtk::RESPONSE_CANCEL));
+       if (btn) {
+               btn->signal_clicked().connect(sigc::mem_fun(static_cast<Gtk::Window*>(this), &Gtk::Window::hide));
+       }
 }
 
 About::~About ()