merge with master, fixing conflicts in 3 wscript files

2 files changed, 7 insertions, 6 deletions

diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index 9c20da0f4c..cd7ab1537a 100644
--- a/libs/gtkmm2ext/gtk_ui.cc
+++ b/libs/gtkmm2ext/gtk_ui.cc
@@ -120,9 +120,9 @@ UI::UI (string namestr, int *argc, char ***argv)
 
 UI::~UI ()
 {
+	_receiver.hangup ();
 }
 
-
 bool
 UI::caller_is_ui_thread ()
 {
@@ -265,12 +265,14 @@ UI::run (Receiver &old_receiver)
 
 	Glib::signal_idle().connect (bind_return (mem_fun (old_receiver, &Receiver::hangup), false));
 
-	starting ();
+	if (starting ()) {
+		return;
+	}
+
 	_active = true;
 	theMain->run ();
 	_active = false;
-	stopping ();
-	_receiver.hangup ();
+
 	return;
 }
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
index a758ad78f4..9fa9e99fe8 100644
--- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
+++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
@@ -156,8 +156,7 @@ class UI : public AbstractUI<UIRequest>
 	   stopping just after we return from it (at the top level)
 	*/
 
-	sigc::signal<void> starting;
-	sigc::signal<void> stopping;
+        virtual int starting() = 0;
 
 	sigc::signal<void> theme_changed;