Implement Value traits inside glib_wrapper!() instead of doing it generically

This is needed to be able to create implementations for other pointer
types, e.g. boxed types, without creating overlapping implementations.

Author: sdroege

src/object.rs

@@ -12,6 +12,7 @@ use std::mem;
 use std::ptr;
 
 use Value;
+use value::SetValue;
 use Type;
 use BoolError;
 use Closure;
@@ -243,6 +244,28 @@ macro_rules! glib_object_wrapper {
             }
         }
 
+        #[doc(hidden)]
+        impl<'a> $crate::value::FromValueOptional<'a> for $name {
+            unsafe fn from_value_optional(value: &$crate::Value) -> Option<Self> {
+                Option::<$name>::from_glib_full(gobject_ffi::g_value_dup_object(value.to_glib_none().0) as *mut $ffi_name)
+                    .map(|o| $crate::object::Downcast::downcast_unchecked(o))
+            }
+        }
+
+        #[doc(hidden)]
+        impl $crate::value::SetValue for $name {
+            unsafe fn set_value(value: &mut $crate::Value, this: &Self) {
+                gobject_ffi::g_value_set_object(value.to_glib_none_mut().0, $crate::translate::ToGlibPtr::<*mut $ffi_name>::to_glib_none(this).0 as *mut gobject_ffi::GObject)
+            }
+        }
+
+        #[doc(hidden)]
+        impl $crate::value::SetValueOptional for $name {
+            unsafe fn set_value_optional(value: &mut $crate::Value, this: Option<&Self>) {
+                gobject_ffi::g_value_set_object(value.to_glib_none_mut().0, $crate::translate::ToGlibPtr::<*mut $ffi_name>::to_glib_none(&this).0 as *mut gobject_ffi::GObject)
+            }
+        }
+
         impl ::std::cmp::Eq for $name { }
     };
 
@@ -373,7 +396,7 @@ fn get_property_type<T: IsA<Object>>(obj: &T, property_name: &str) -> Option<Typ
     }
 }
 
-impl<T: IsA<Object>> ObjectExt for T {
+impl<T: IsA<Object> + SetValue> ObjectExt for T {
     fn get_type(&self) -> Type {
         unsafe {
             let obj = self.to_glib_none().0;

src/value.rs

@@ -79,7 +79,6 @@ use std::ffi::CStr;
 use std::ptr;
 use libc::c_void;
 
-use object::{Downcast, IsA, Object};
 use translate::*;
 use types::{StaticType, Type};
 
@@ -518,25 +517,6 @@ impl SetValueOptional for String {
     }
 }
 
-impl<'a, T: IsA<Object>> FromValueOptional<'a> for T {
-    unsafe fn from_value_optional(value: &Value) -> Option<Self> {
-        Option::<Object>::from_glib_full(gobject_ffi::g_value_dup_object(value.to_glib_none().0))
-            .map(|o| o.downcast_unchecked())
-    }
-}
-
-impl<T: IsA<Object>> SetValue for T {
-    unsafe fn set_value(value: &mut Value, this: &Self) {
-        gobject_ffi::g_value_set_object(value.to_glib_none_mut().0, this.to_glib_none().0)
-    }
-}
-
-impl<T: IsA<Object>> SetValueOptional for T {
-    unsafe fn set_value_optional(value: &mut Value, this: Option<&Self>) {
-        gobject_ffi::g_value_set_object(value.to_glib_none_mut().0, this.to_glib_none().0)
-    }
-}
-
 impl<'a> FromValueOptional<'a> for bool {
     unsafe fn from_value_optional(value: &'a Value) -> Option<Self> {
         Some(from_glib(gobject_ffi::g_value_get_boolean(value.to_glib_none().0)))