Fix session-open after selecting new, template, then back

[ardour.git] / gtk2_ardour / floating_text_entry.h

diff --git a/gtk2_ardour/floating_text_entry.h b/gtk2_ardour/floating_text_entry.h
index 596914c317ae9e810852ca61588478573326a64f..0527feca9949ee2f33ee2112388c4ac8f7c55081 100644 (file)
--- a/gtk2_ardour/floating_text_entry.h
+++ b/gtk2_ardour/floating_text_entry.h
@@ -25,7 +25,7 @@
 
 class FloatingTextEntry : public Gtk::Window
 {
-  public:
+public:
        FloatingTextEntry (Gtk::Window* parent, const std::string& initial_contents);
 
        /* 1st argument to handler is the new text
@@ -36,24 +36,26 @@ class FloatingTextEntry : public Gtk::Window
         */
        sigc::signal2<void,std::string,int> use_text;
 
-  private:
-        Gtk::Entry entry;
-        bool entry_changed;
-       bool by_popup_menu;
+private:
+       Gtk::Entry entry;
+       bool entry_changed;
 
-        /* handlers for Entry events */
+       /* handlers for Entry events */
        bool entry_focus_out (GdkEventFocus*);
-        bool key_press (GdkEventKey*);
-        bool key_release (GdkEventKey*);
-        void activated ();
-        bool button_press (GdkEventButton*);
-        void changed ();
-       void populate_popup (Gtk::Menu*);
+       bool key_press (GdkEventKey*);
+       bool key_release (GdkEventKey*);
+       void activated ();
+       bool button_press (GdkEventButton*);
+       void changed ();
+       void idle_delete_self ();
+       void disconect_signals ();
 
-        /* handlers for window events */
+       std::list<sigc::connection> _connections;
 
-        void on_realize ();
-        void on_hide ();
+       /* handlers for window events */
+
+       void on_realize ();
+       void on_hide ();
 };
 
 #endif // __ardour_window_h__