summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/ardour_ui.cc1
-rw-r--r--libs/gtkmm2ext/window_proxy.cc4
2 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b19d57112f..2d6d00848c 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -460,7 +460,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
const XMLNode* ui_xml = Config->extra_xml (X_("UI"));
if (ui_xml) {
- std::cerr << "\n\n\nHAVE UI XML, set dialogs\n\n\n";
key_editor.set_state (*ui_xml, 0);
session_option_editor.set_state (*ui_xml, 0);
speaker_config_window.set_state (*ui_xml, 0);
diff --git a/libs/gtkmm2ext/window_proxy.cc b/libs/gtkmm2ext/window_proxy.cc
index 9e5105a81b..9dfe03f1a0 100644
--- a/libs/gtkmm2ext/window_proxy.cc
+++ b/libs/gtkmm2ext/window_proxy.cc
@@ -21,7 +21,6 @@
#include <gtkmm/window.h>
#include "pbd/xml++.h"
-#include "pbd/stacktrace.h"
#include "gtkmm2ext/window_proxy.h"
#include "gtkmm2ext/visibility_tracker.h"
@@ -236,7 +235,7 @@ WindowProxy::setup ()
{
assert (_window);
- vistracker = new Gtkmm2ext::VisibilityTracker (*_window);
+ assert (_window);
delete_connection = _window->signal_delete_event().connect (sigc::mem_fun (*this, &WindowProxy::delete_event_handler));
configure_connection = _window->signal_configure_event().connect (sigc::mem_fun (*this, &WindowProxy::configure_handler), false);
@@ -249,6 +248,7 @@ WindowProxy::setup ()
void
WindowProxy::map_handler ()
{
+ vistracker = new Gtkmm2ext::VisibilityTracker (*_window);
/* emit our own signal */
signal_map ();
}