From: Taybin Rutkin <taybin@taybin.com>
Date: Thu, 27 Oct 2005 20:51:57 +0000 (+0000)
Subject: main.cc compiles.
X-Git-Tag: 2.0beta4~656
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=df065d141457f6550493199d6653374fde354e4a;p=ardour.git

main.cc compiles.


git-svn-id: svn://localhost/trunk/ardour2@72 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 1ed84763e9..9d3a246f86 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -286,7 +286,7 @@ jack_foobar ()
 void
 gui_jack_error ()
 {
-	Window win (GTK_WINDOW_DIALOG);
+	Window win (Gtk::WINDOW_POPUP);
 	VBox   vpacker;
 	Button ok (_("OK"));
 	Label label (_("Ardour could not connect to JACK.\n\
@@ -307,10 +307,8 @@ Please consider the possibilities, and perhaps (re)start JACK."));
 	win.add (vpacker);
 	win.show_all ();
 	win.signal_delete_event().connect (sigc::ptr_fun (jack_fooey));
-	win.signal_add_event()s (Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK);
-	win.set_position (GTK_WIN_POS_CENTER);
-	win.realize ();
-	win.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH));
+	win.add_events (Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK);
+	win.set_position (Gtk::WIN_POS_CENTER);
 
 	ok.signal_clicked().connect (sigc::ptr_fun (jack_foobar));
 	
@@ -445,7 +443,7 @@ main (int argc, char *argv[])
 					   once everything else is OK.
 					*/
 
-					Main::idle.connect (bind (mem_fun (*ui, &ARDOUR_UI::cmdline_new_session), path));
+					Glib::signal_idle().connect (bind (mem_fun (*ui, &ARDOUR_UI::cmdline_new_session), path));
 					ui->set_will_create_new_session_automatically (true);
 
 				} else {