2008-08-20 Mike Kestner <mkestner@novell.com>

* glib/Object.cs:
	* glib/Signal.cs: fix a couple 2.0-isms.  Patch from Christian Hoff.

svn path=/trunk/gtk-sharp/; revision=111574
This commit is contained in:
Mike Kestner 2008-08-25 20:43:09 +00:00
parent 927904664a
commit 47e002a7d4
3 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2008-08-20 Mike Kestner <mkestner@novell.com>
* glib/Object.cs:
* glib/Signal.cs: fix a couple 2.0-isms. Patch from Christian Hoff.
2008-08-20 Mike Kestner <mkestner@novell.com> 2008-08-20 Mike Kestner <mkestner@novell.com>
* bootstrap-2.12: bump svn version after tag. * bootstrap-2.12: bump svn version after tag.

View File

@ -614,7 +614,7 @@ namespace GLib {
static Object () static Object ()
{ {
if (Environment.GetEnvironmentVariable ("GTK_SHARP_DEBUG") != null) if (Environment.GetEnvironmentVariable ("GTK_SHARP_DEBUG") != null)
GLib.Log.SetLogHandler ("GLib-GObject", GLib.LogLevelFlags.All, GLib.Log.PrintTraceLogFunction); GLib.Log.SetLogHandler ("GLib-GObject", GLib.LogLevelFlags.All, new GLib.LogFunc (GLib.Log.PrintTraceLogFunction));
} }
} }
} }

View File

@ -155,14 +155,14 @@ namespace GLib {
void ClosureDisposedCB (object o, EventArgs args) void ClosureDisposedCB (object o, EventArgs args)
{ {
if (o == before_closure) { if (o == before_closure) {
before_closure.Disposed -= ClosureDisposedHandler; before_closure.Disposed -= new EventHandler (ClosureDisposedHandler);
before_closure.Invoked -= ClosureInvokedCB; before_closure.Invoked -= new ClosureInvokedHandler (ClosureInvokedCB);
if (tref.Target != null) if (tref.Target != null)
tref.Target.BeforeSignals.Remove (name); tref.Target.BeforeSignals.Remove (name);
before_closure = null; before_closure = null;
} else { } else {
after_closure.Disposed -= ClosureDisposedHandler; after_closure.Disposed -= new EventHandler (ClosureDisposedHandler);
after_closure.Invoked -= ClosureInvokedCB; after_closure.Invoked -= new ClosureInvokedHandler (ClosureInvokedCB);
if (tref.Target != null) if (tref.Target != null)
tref.Target.AfterSignals.Remove (name); tref.Target.AfterSignals.Remove (name);
after_closure = null; after_closure = null;