File glib-sharp-r1174242.patch of Package gtk-sharp2

Overview Repositories Revisions Requests Users Attributes Meta

File glib-sharp-r1174242.patch of Package gtk-sharp2 (Revision 765ecec5cce1caf95ece59402daa058b)

Currently displaying revision 765ecec5cce1caf95ece59402daa058b , Show latest

--- glib/Signal.cs	2008/10/29 21:37:31	117423
+++ glib/Signal.cs	2008/10/29 21:41:57	117424
@@ -127,12 +127,14 @@
 		Type args_type;
 		SignalClosure before_closure;
 		SignalClosure after_closure;
+		Delegate marshaler;
 
 		private Signal (GLib.Object obj, string signal_name, Delegate marshaler)
 		{
 			tref = obj.ToggleRef;
 			name = signal_name;
 			tref.Signals [name] = this;
+			this.marshaler = marshaler;
 		}
 
 		private Signal (GLib.Object obj, string signal_name, Type args_type)
@@ -207,7 +209,6 @@
 			return Lookup (obj, name, typeof (EventArgs));
 		}
 
-		[Obsolete ("Replaced by Lookup (Object obj, string name, Type args_type)")]
 		public static Signal Lookup (GLib.Object obj, string name, Delegate marshaler)
 		{
 			Signal result = obj.ToggleRef.Signals [name] as Signal;
@@ -243,7 +244,10 @@
 			if (d.Method.IsDefined (typeof (ConnectBeforeAttribute), false)) {
 				tref.Target.BeforeSignals [name] = Delegate.Combine (tref.Target.BeforeSignals [name] as Delegate, d);
 				if (before_closure == null) {
-					before_closure = new SignalClosure (tref.Handle, name, args_type);
+					if (marshaler == null)
+						before_closure = new SignalClosure (tref.Handle, name, args_type);
+					else
+						before_closure = new SignalClosure (tref.Handle, name, marshaler, this);
 					before_closure.Disposed += ClosureDisposedHandler;
 					before_closure.Invoked += ClosureInvokedHandler;
 					before_closure.Connect (false);
@@ -251,7 +255,10 @@
 			} else {
 				tref.Target.AfterSignals [name] = Delegate.Combine (tref.Target.AfterSignals [name] as Delegate, d);
 				if (after_closure == null) {
-					after_closure = new SignalClosure (tref.Handle, name, args_type);
+					if (marshaler == null)
+						after_closure = new SignalClosure (tref.Handle, name, args_type);
+					else
+						after_closure = new SignalClosure (tref.Handle, name, marshaler, this);
 					after_closure.Disposed += ClosureDisposedHandler;
 					after_closure.Invoked += ClosureInvokedHandler;
 					after_closure.Connect (true);
--- glib/SignalClosure.cs	2008/10/29 21:37:31	117423
+++ glib/SignalClosure.cs	2008/10/29 21:41:57	117424
@@ -25,7 +25,7 @@
 	using System.Collections;
 	using System.Runtime.InteropServices;
 
-	internal  class ClosureInvokedArgs : EventArgs {
+	internal class ClosureInvokedArgs : EventArgs {
 
 		EventArgs args;
 		GLib.Object obj;
@@ -59,6 +59,8 @@
 		string name;
 		uint id = UInt32.MaxValue;
 		System.Type args_type;
+		Delegate custom_marshaler;
+		GCHandle gch;
 
 		static Hashtable closures = new Hashtable ();
 
@@ -71,6 +73,16 @@
 			this.args_type = args_type;
 		}
 
+		public SignalClosure (IntPtr obj, string signal_name, Delegate custom_marshaler, Signal signal)
+		{
+			gch = GCHandle.Alloc (signal);
+			raw_closure = g_cclosure_new (custom_marshaler, (IntPtr) gch, Notify);
+			closures [raw_closure] = this;
+			handle = obj;
+			name = signal_name;
+			this.custom_marshaler = custom_marshaler;
+		}
+
 		public event EventHandler Disposed;
 		public event ClosureInvokedHandler Invoked;
 
@@ -91,6 +103,9 @@
 		{
 			Disconnect ();
 			closures.Remove (raw_closure);
+			if (custom_marshaler != null)
+				gch.Free ();
+			custom_marshaler = null;
 			if (Disposed != null)
 				Disposed (this, EventArgs.Empty);
 			GC.SuppressFinalize (this);
@@ -182,6 +197,9 @@
 		static extern IntPtr glibsharp_closure_new (ClosureMarshal marshaler, ClosureNotify notify, IntPtr gch);
 
 		[DllImport("libgobject-2.0-0.dll")]
+		static extern IntPtr g_cclosure_new (Delegate cb, IntPtr user_data, ClosureNotify notify);
+
+		[DllImport("libgobject-2.0-0.dll")]
 		static extern uint g_signal_connect_closure (IntPtr obj, IntPtr name, IntPtr closure, bool is_after);
 
 		[DllImport("libgobject-2.0-0.dll")]

Places

File glib-sharp-r1174242.patch of Package gtk-sharp2 (Revision 765ecec5cce1caf95ece59402daa058b)

Places