[Muine] [PATCH] compat with mono-1.1.1

[Peter Johanson <latexer gentoo org>]

Hey all,

for those brave enough to be using mono from CVS, or the mono-1.1.1
release, you may run into a couple runtime and compilation errors.
Attached is a patch to fix these. I'm pretty sure it's the "right" fix
for the compilation problem, the runtime issue I'm more confident on.

Compilation issue: NotificationAreaIcon.cs: 193-194: menu.Screen fails
because Gtk.Menu does "new Screen { set; }", so it doesn't see the get
accessor from Gtk.Widget. Casting menu to a Gtk.Widget first fixes this.

Runtime issue: Player.cs + HandleView.cs : the GC now will collect
delegates that are passed into p/invoked land. This is because from the
managed end of things it has no way of knowing when these things are
reffed, so if there's no reference to it in managed land, these things
get cleaned up. The patch keep them assigned to class local variables in
managed land so they don't get GCed.

hope this helps,

-pete

-- 
Peter Johanson
<latexer gentoo org>

diff -aur muine-0.6.3-orig/src/HandleView.cs muine-0.6.3/src/HandleView.cs
--- muine-0.6.3-orig/src/HandleView.cs	2004-05-11 13:50:07.000000000 -0400
+++ muine-0.6.3/src/HandleView.cs	2004-09-22 21:52:10.000000000 -0400
@@ -34,15 +34,23 @@
 							  SignalDelegate cb, IntPtr data,
 							  IntPtr p, int flags);
 
+	private SignalDelegate PointerActivatedCB;
+	private SignalDelegate PointersReorderedCB;
+	private SignalDelegate SelectionChangedCB;
+
 	public HandleView () : base (IntPtr.Zero)
 	{
 		Raw = pointer_list_view_new ();
 
-		g_signal_connect_data (Raw, "pointer_activated", new SignalDelegate (PointerActivatedCallback),
+		PointerActivatedCB = new SignalDelegate (PointerActivatedCallback);
+		PointersReorderedCB = new SignalDelegate (PointersReorderedCallback);
+		SelectionChangedCB = new SignalDelegate (SelectionChangedCallback);
+
+		g_signal_connect_data (Raw, "pointer_activated", PointerActivatedCB,
 				       IntPtr.Zero, IntPtr.Zero, 0);
-		g_signal_connect_data (Raw, "pointers_reordered", new SignalDelegate (PointersReorderedCallback),
+		g_signal_connect_data (Raw, "pointers_reordered", PointersReorderedCB,
 				       IntPtr.Zero, IntPtr.Zero, 0);
-		g_signal_connect_data (Raw, "selection_changed", new SignalDelegate (SelectionChangedCallback),
+		g_signal_connect_data (Raw, "selection_changed", SelectionChangedCB,
 				       IntPtr.Zero, IntPtr.Zero, 0);
 	}
 
diff -aur muine-0.6.3-orig/src/NotificationAreaIcon.cs muine-0.6.3/src/NotificationAreaIcon.cs
--- muine-0.6.3-orig/src/NotificationAreaIcon.cs	2004-06-18 15:14:28.000000000 -0400
+++ muine-0.6.3/src/NotificationAreaIcon.cs	2004-09-23 10:11:49.521428120 -0400
@@ -190,8 +190,8 @@
 		x = menu_x;
 		y = menu_y;
 
-		int monitor = menu.Screen.GetMonitorAtPoint (x, y);
-		Gdk.Rectangle rect = menu.Screen.GetMonitorGeometry (monitor);
+		int monitor = ((Widget)menu).Screen.GetMonitorAtPoint (x, y);
+		Gdk.Rectangle rect = ((Widget)menu).Screen.GetMonitorGeometry (monitor);
 
 		int space_above = y - rect.Y;
 		int space_below = rect.Y + rect.Height - y;
diff -aur muine-0.6.3-orig/src/Player.cs muine-0.6.3/src/Player.cs
--- muine-0.6.3-orig/src/Player.cs	2004-06-05 09:56:38.000000000 -0400
+++ muine-0.6.3/src/Player.cs	2004-09-22 21:53:17.000000000 -0400
@@ -182,6 +182,10 @@
 							         IntPtr p, int flags);
 	}
 
+	private IntSignalDelegate tick_cb;
+	private SignalDelegate eos_cb;
+	private StringSignalDelegate error_cb;
+
 	public Player () : base (IntPtr.Zero)
 	{
 		IntPtr error_ptr;
@@ -193,11 +197,15 @@
 			throw new Exception (error);
 		}
 		
-		ConnectInt.g_signal_connect_data (Raw, "tick", new IntSignalDelegate (TickCallback),
+		tick_cb = new IntSignalDelegate (TickCallback);
+		eos_cb = new SignalDelegate (EosCallback);
+		error_cb = new StringSignalDelegate (ErrorCallback);
+
+		ConnectInt.g_signal_connect_data (Raw, "tick", tick_cb,
 		                                  IntPtr.Zero, IntPtr.Zero, 0);
-		Connect.g_signal_connect_data (Raw, "end_of_stream", new SignalDelegate (EosCallback),
+		Connect.g_signal_connect_data (Raw, "end_of_stream", eos_cb,
 				               IntPtr.Zero, IntPtr.Zero, 0);
-		ConnectString.g_signal_connect_data (Raw, "error", new StringSignalDelegate (ErrorCallback),
+		ConnectString.g_signal_connect_data (Raw, "error", error_cb,
 				                     IntPtr.Zero, IntPtr.Zero, 0);
 
 		playing = false;