Update glib-sharp from trunk

Fixes bug #595377.

3 files changed, 3 insertions, 2 deletions

diff --git a/gstreamer-sharp/glib-sharp/GType.cs b/gstreamer-sharp/glib-sharp/GType.cs
index ae8174e..470fb58 100755
--- a/gstreamer-sharp/glib-sharp/GType.cs
+++ b/gstreamer-sharp/glib-sharp/GType.cs
@@ -230,8 +230,8 @@ namespace Gst.GLib {
 					foreach (AssemblyName ref_name in asm.GetReferencedAssemblies ()) {
 						if (ref_name.Name != asm_name)
 							continue;
-						string asm_dir = Path.GetDirectoryName (asm.Location);
 						try {
+							string asm_dir = Path.GetDirectoryName (asm.Location);
 							Assembly ref_asm;
 							if (File.Exists (Path.Combine (asm_dir, ref_name.Name + ".dll")))
 								ref_asm = Assembly.LoadFrom (Path.Combine (asm_dir, ref_name.Name + ".dll"));
diff --git a/gstreamer-sharp/glib-sharp/Idle.cs b/gstreamer-sharp/glib-sharp/Idle.cs
index dd15f3b..2ffdfe9 100755
--- a/gstreamer-sharp/glib-sharp/Idle.cs
+++ b/gstreamer-sharp/glib-sharp/Idle.cs
@@ -61,6 +61,7 @@ namespace Gst.GLib {
 				// Both branches remove our delegate from the
 				// managed list of handlers, but only
 				// Source.Remove will remove it from the
+				// unmanaged list also.
 
 				if (disposing)
 					Remove ();
diff --git a/gstreamer-sharp/glib-sharp/Value.cs b/gstreamer-sharp/glib-sharp/Value.cs
index 31ab85f..531de1a 100755
--- a/gstreamer-sharp/glib-sharp/Value.cs
+++ b/gstreamer-sharp/glib-sharp/Value.cs
@@ -552,7 +552,7 @@ namespace Gst.GLib {
 				else if (type == GType.UInt64.Val)
 					g_value_set_uint64 (ref this, (ulong) value);
 				else if (type == GType.ULong.Val)
-					SetULongForPlatform ((ulong) value);
+					SetULongForPlatform (Convert.ToUInt64 (value));
 				else if (GType.Is (type, GType.Enum))
 					g_value_set_enum (ref this, (int)value);
 				else if (GType.Is (type, GType.Flags))