From 132647a493a3e5b268b488333e91e95a09b16e1b Mon Sep 17 00:00:00 2001
From: dave <dave@a436a847-0d15-0410-975c-d299462d15a1>
Date: Sun, 18 Jun 2006 00:49:37 +0000
Subject: [PATCH] Set cursor in on_map instead of on_show (which segfaults
 sometimes?)

git-svn-id: http://svn.drobilla.net/lad@50 a436a847-0d15-0410-975c-d299462d15a1
---
 flowcanvas/flowcanvas/FlowCanvas.h      | 2 +-
 flowcanvas/src/FlowCanvas.cpp           | 5 +++--
 grauph/src/libs/engine/ObjectSender.cpp | 8 --------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/flowcanvas/flowcanvas/FlowCanvas.h b/flowcanvas/flowcanvas/FlowCanvas.h
index 217c55ba..e1f90e09 100644
--- a/flowcanvas/flowcanvas/FlowCanvas.h
+++ b/flowcanvas/flowcanvas/FlowCanvas.h
@@ -115,7 +115,7 @@ protected:
 
 	virtual bool canvas_event(GdkEvent* event);
 	
-	virtual void on_show();
+	virtual void on_map();
 
 private:
 	Connection* get_connection(const Port* port1, const Port* port2);
diff --git a/flowcanvas/src/FlowCanvas.cpp b/flowcanvas/src/FlowCanvas.cpp
index 9dca1eea..f4f5476d 100644
--- a/flowcanvas/src/FlowCanvas.cpp
+++ b/flowcanvas/src/FlowCanvas.cpp
@@ -70,9 +70,10 @@ FlowCanvas::~FlowCanvas()
 
 
 void
-FlowCanvas::on_show()
+FlowCanvas::on_map()
 {
-	Gnome::Canvas::Canvas::on_show();
+	Gnome::Canvas::Canvas::on_map();
+	assert(get_window());
 	get_window()->set_cursor(Gdk::Cursor(Gdk::HAND2));
 }
 
diff --git a/grauph/src/libs/engine/ObjectSender.cpp b/grauph/src/libs/engine/ObjectSender.cpp
index b5eb458d..24191a5d 100644
--- a/grauph/src/libs/engine/ObjectSender.cpp
+++ b/grauph/src/libs/engine/ObjectSender.cpp
@@ -51,16 +51,8 @@ ObjectSender::send_patch(ClientInterface* client, const Patch* patch)
 	for (List<Node*>::const_iterator j = patch->nodes().begin();
 			j != patch->nodes().end(); ++j) {
 		const Node* const node = (*j);
-		//const Port* const port = node->as_port(); // NULL unless a bridge node
 
 		send_node(client, node);
-		
-		usleep(100);
-
-		// If this is a bridge (input/output) node, send the patch control value as well
-		//if (port && port->port_info()->is_control())
-		//	client->control_change(port->path(),
-		//		((PortBase<sample>*)port)->buffer(0)->value_at(0));
 	}
 	
 	for (List<Connection*>::const_iterator j = patch->connections().begin();