mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-30 12:10:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

Update glib-sharp from trunk

Browse source 
Fixes bug #595377.
This commit is contained in:
Sebastian Dröge 2009-11-25 08:15:11 +01:00
parent 6c1b52b76a
commit 579b8f3277
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gstreamer-sharp/glib-sharp/GType.cs
View file

@ -230,8 +230,8 @@ namespace Gst.GLib {
foreach (AssemblyName ref_name in asm.GetReferencedAssemblies ()) { foreach (AssemblyName ref_name in asm.GetReferencedAssemblies ()) {
if (ref_name.Name != asm_name) if (ref_name.Name != asm_name)
continue; continue;
string asm_dir = Path.GetDirectoryName (asm.Location);
try { try {
string asm_dir = Path.GetDirectoryName (asm.Location);
Assembly ref_asm; Assembly ref_asm;
if (File.Exists (Path.Combine (asm_dir, ref_name.Name + ".dll"))) if (File.Exists (Path.Combine (asm_dir, ref_name.Name + ".dll")))
ref_asm = Assembly.LoadFrom (Path.Combine (asm_dir, ref_name.Name + ".dll")); ref_asm = Assembly.LoadFrom (Path.Combine (asm_dir, ref_name.Name + ".dll"));

1
gstreamer-sharp/glib-sharp/Idle.cs
View file

@ -61,6 +61,7 @@ namespace Gst.GLib {
// Both branches remove our delegate from the // Both branches remove our delegate from the
// managed list of handlers, but only // managed list of handlers, but only
// Source.Remove will remove it from the // Source.Remove will remove it from the
// unmanaged list also.
if (disposing) if (disposing)
Remove (); Remove ();

2
gstreamer-sharp/glib-sharp/Value.cs
View file

@ -552,7 +552,7 @@ namespace Gst.GLib {
else if (type == GType.UInt64.Val) else if (type == GType.UInt64.Val)
g_value_set_uint64 (ref this, (ulong) value); g_value_set_uint64 (ref this, (ulong) value);
else if (type == GType.ULong.Val) else if (type == GType.ULong.Val)
SetULongForPlatform ((ulong) value); SetULongForPlatform (Convert.ToUInt64 (value));
else if (GType.Is (type, GType.Enum)) else if (GType.Is (type, GType.Enum))
g_value_set_enum (ref this, (int)value); g_value_set_enum (ref this, (int)value);
else if (GType.Is (type, GType.Flags)) else if (GType.Is (type, GType.Flags))