2009-09-22 Brad Taylor <brad@getcoded.net>

* glib/Idle.cs: 
	* glib/Timeout.cs: Make sure to remove the unmanaged reference to the
	delegate when we're disposed or finalized.  In particular, this fixes a
	problem where GLib.Object's PerformQueuedUnrefs was being called after
	both the object and the handler had been GC'ed, resulting in a
	segfault.


svn path=/trunk/gtk-sharp/; revision=142362

ChangeLog

@@ -1,3 +1,12 @@
+2009-09-22  Brad Taylor  <brad@getcoded.net>
+
+	* glib/Idle.cs: 
+	* glib/Timeout.cs: Make sure to remove the unmanaged reference to the
+	delegate when we're disposed or finalized.  In particular, this fixes a
+	problem where GLib.Object's PerformQueuedUnrefs was being called after
+	both the object and the handler had been GC'ed, resulting in a
+	segfault.
+
 2009-09-16  Mike Kestner  <mkestner@novell.com>
 
 	* gtk/Gtk.metadata: hide StatusIcon.GetGeometry for custom impl.

glib/Idle.cs

@@ -45,6 +45,25 @@ namespace GLib {
 				proxy_handler = new IdleHandlerInternal (Handler);
 			}
 
+			~IdleProxy ()
+			{
+				Dispose (false);
+			}
+
+			public void Dispose ()
+			{
+				Dispose (true);
+				GC.SuppressFinalize (this);
+			}
+
+			protected virtual void Dispose (bool disposing)
+			{
+				if (disposing)
+					Remove ();
+				
+				Source.Remove (ID);
+			}
+
 			public bool Handler ()
 			{
 				try {

glib/Timeout.cs

@@ -42,6 +42,25 @@ namespace GLib {
 				proxy_handler = new TimeoutHandlerInternal (Handler);
 			}
 
+			~TimeoutProxy ()
+			{
+				Dispose (false);
+			}
+
+			public void Dispose ()
+			{
+				Dispose (true);
+				GC.SuppressFinalize (this);
+			}
+
+			protected virtual void Dispose (bool disposing)
+			{
+				if (disposing)
+					Remove ();
+				
+				Source.Remove (ID);
+			}
+
 			public bool Handler ()
 			{
 				try {