[gst-cvs] gstreamer-sharp: Don't require Gtk# patch from bug #501685

[Sebastian Dröge]

Module: gstreamer-sharp
Branch: master
Commit: 0164337fa8bc23791535df268267f64df30e7e55
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer-sharp/commit/?id=0164337fa8bc23791535df268267f64df30e7e55

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Wed May 13 14:42:04 2009 +0200

Don't require Gtk# patch from bug #501685

---

 README                                          |    1 -
 gstreamer-sharp/override/ColorBalanceAdapter.cs |    9 ++++++---
 gstreamer-sharp/override/MixerAdapter.cs        |   10 +++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README b/README
index ba66d60..a5a2a97 100644
--- a/README
+++ b/README
@@ -1,7 +1,6 @@
 To build this Gtk# from trunk is required and the following patches:
 
 http://bugzilla.novell.com/show_bug.cgi?id=323372
-http://bugzilla.novell.com/show_bug.cgi?id=501685
 http://bugzilla.novell.com/show_bug.cgi?id=497667
 http://bugzilla.novell.com/show_bug.cgi?id=503048
 http://bugzilla.novell.com/show_bug.cgi?id=503060
diff --git a/gstreamer-sharp/override/ColorBalanceAdapter.cs b/gstreamer-sharp/override/ColorBalanceAdapter.cs
index bfabfe2..685b3a0 100644
--- a/gstreamer-sharp/override/ColorBalanceAdapter.cs
+++ b/gstreamer-sharp/override/ColorBalanceAdapter.cs
@@ -89,9 +89,12 @@ namespace Gst.Interfaces {
 			GCHandle gch = (GCHandle) data;
 			ColorBalanceAdapter adapter = gch.Target as ColorBalanceAdapter;
 
-			PropertyInfo pi = adapter.Type.GetProperty ("BalanceType", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.FlattenHierarchy);
-			if (pi != null && pi.PropertyType == typeof (Gst.Interfaces.ColorBalanceType))
-			  native_iface.BalanceType = (Gst.Interfaces.ColorBalanceType) pi.GetValue (null, null);
+			ColorBalanceImplementor implementor = adapter.Implementor;
+			if (implementor != null) {
+			  PropertyInfo pi = implementor.GetType().GetProperty ("BalanceType", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.FlattenHierarchy);
+			  if (pi != null && pi.PropertyType == typeof (Gst.Interfaces.ColorBalanceType))
+			    native_iface.BalanceType = (Gst.Interfaces.ColorBalanceType) pi.GetValue (null, null);
+			}
 
 			Marshal.StructureToPtr (native_iface, ifaceptr, false);
 			gch.Free ();
diff --git a/gstreamer-sharp/override/MixerAdapter.cs b/gstreamer-sharp/override/MixerAdapter.cs
index 68a7025..5510479 100644
--- a/gstreamer-sharp/override/MixerAdapter.cs
+++ b/gstreamer-sharp/override/MixerAdapter.cs
@@ -189,9 +189,13 @@ namespace Gst.Interfaces {
 
 			GCHandle gch = (GCHandle) data;
                         MixerAdapter adapter = gch.Target as MixerAdapter;
-			PropertyInfo pi = adapter.Type.GetProperty ("MixerType", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.FlattenHierarchy);
-                        if (pi != null && pi.PropertyType == typeof (Gst.Interfaces.MixerType))
-                          native_iface.MixerType = (Gst.Interfaces.MixerType) pi.GetValue (null, null);
+                        MixerImplementor implementor = adapter.Implementor;
+
+			if (implementor != null) {
+			  PropertyInfo pi = implementor.GetType().GetProperty ("MixerType", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.FlattenHierarchy);
+                          if (pi != null && pi.PropertyType == typeof (Gst.Interfaces.MixerType))
+                            native_iface.MixerType = (Gst.Interfaces.MixerType) pi.GetValue (null, null);
+			}
 
 			Marshal.StructureToPtr (native_iface, ifaceptr, false);
 			gch.Free ();