ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2004-02-03 Mike Kestner <mkestner@ximian.com>

Browse source 
* glib/ManagedValue.cs : null check on Free.
	* glib/Value.cs : some ManagedValue rework because we unset now.

svn path=/trunk/gtk-sharp/; revision=22728
This commit is contained in:
Mike Kestner 2004-02-03 06:24:42 +00:00
parent d4c8fc78c7
commit d723bf3cef
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-02-03 Mike Kestner <mkestner@ximian.com>
* glib/ManagedValue.cs : null check on Free.
* glib/Value.cs : some ManagedValue rework because we unset now.
2004-02-02 Mike Kestner <mkestner@ximian.com> 2004-02-02 Mike Kestner <mkestner@ximian.com>
* generator/CustomMarshalerGen.cs : beginnings of a new generatable. * generator/CustomMarshalerGen.cs : beginnings of a new generatable.

2
glib/ManagedValue.cs
View file

@ -66,6 +66,8 @@ namespace GLibSharp {
public static void Free (IntPtr ptr) public static void Free (IntPtr ptr)
{ {
ValueHolder holder = (ValueHolder) pointers[ptr]; ValueHolder holder = (ValueHolder) pointers[ptr];
if (holder == null)
return;
holder.ref_count--; holder.ref_count--;
if (holder.ref_count < 1) if (holder.ref_count < 1)
pointers.Remove (ptr); pointers.Remove (ptr);

24
glib/Value.cs
View file

@ -66,22 +66,21 @@ namespace GLib {
} }
public void Dispose () { public void Dispose () {
if (_val != IntPtr.Zero) { if (_val != IntPtr.Zero && needs_dispose) {
IntPtr rawtype = gtksharp_value_get_value_type (_val); IntPtr rawtype = gtksharp_value_get_value_type (_val);
if (rawtype == ManagedValue.GType.Val) { if (rawtype == ManagedValue.GType.Val) {
ManagedValue.Free (g_value_get_boxed (_val)); ManagedValue.Free (g_value_get_boxed (_val));
} }
if (needs_dispose) lock (idle_queue) {
lock (idle_queue) { idle_queue.Enqueue (_val);
idle_queue.Enqueue (_val); lock (typeof (Value)){
lock (typeof (Value)){ if (!idle_queued) {
if (!idle_queued){ Idle.Add (new IdleHandler (DoDispose));
Idle.Add (new IdleHandler (DoDispose)); idle_queued = true;
idle_queued = true;
}
} }
} }
}
_val = IntPtr.Zero; _val = IntPtr.Zero;
} }
@ -353,9 +352,6 @@ namespace GLib {
g_value_set_enum (_val, (int) wrap); g_value_set_enum (_val, (int) wrap);
} }
[DllImport("libgobject-2.0-0.dll")]
static extern void g_value_set_boxed_take_ownership (IntPtr val, IntPtr data);
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]
static extern bool g_type_is_a (IntPtr type, IntPtr is_a_type); static extern bool g_type_is_a (IntPtr type, IntPtr is_a_type);
@ -382,7 +378,7 @@ namespace GLib {
} }
if (type == GType.None) if (type == GType.None)
g_value_set_boxed_take_ownership (_val, ManagedValue.WrapObject (obj)); g_value_set_boxed (_val, ManagedValue.WrapObject (obj));
else if (type == GType.String) else if (type == GType.String)
g_value_set_string (_val, (string) obj); g_value_set_string (_val, (string) obj);
else if (type == GType.Boolean) else if (type == GType.Boolean)
@ -685,7 +681,7 @@ namespace GLib {
set { set {
GType type = GLibSharp.TypeConverter.LookupType (value.GetType()); GType type = GLibSharp.TypeConverter.LookupType (value.GetType());
if (type == GType.None) if (type == GType.None)
g_value_set_boxed_take_ownership (_val, ManagedValue.WrapObject (value)); g_value_set_boxed (_val, ManagedValue.WrapObject (value));
else if (type == GType.String) else if (type == GType.String)
g_value_set_string (_val, (string) value); g_value_set_string (_val, (string) value);
else if (type == GType.Boolean) else if (type == GType.Boolean)