From eb567a50487d6c029ee6c560d0f399bf77504dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Mon, 31 Jul 2017 17:14:00 +0100
Subject: [PATCH] Rename ChildProxy::set/get_property() to
 set/get_child_property() to prevent conflict with glib::ObjectExt

---
 gstreamer/src/child_proxy.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gstreamer/src/child_proxy.rs b/gstreamer/src/child_proxy.rs
index 20a61f36f..40776d093 100644
--- a/gstreamer/src/child_proxy.rs
+++ b/gstreamer/src/child_proxy.rs
@@ -14,12 +14,12 @@ use std::ptr;
 use ChildProxy;
 
 pub trait ChildProxyExtManual {
-    fn get_property(&self, name: &str) -> Option<glib::Value>;
-    fn set_property(&self, name: &str, value: &glib::Value) -> Result<(), glib::BoolError>;
+    fn get_child_property(&self, name: &str) -> Option<glib::Value>;
+    fn set_child_property(&self, name: &str, value: &glib::Value) -> Result<(), glib::BoolError>;
 }
 
 impl<O: IsA<ChildProxy>> ChildProxyExtManual for O {
-    fn get_property(&self, name: &str) -> Option<glib::Value> {
+    fn get_child_property(&self, name: &str) -> Option<glib::Value> {
         unsafe {
             let found: bool = from_glib(ffi::gst_child_proxy_lookup(
                 self.to_glib_none().0,
@@ -41,7 +41,7 @@ impl<O: IsA<ChildProxy>> ChildProxyExtManual for O {
         }
     }
 
-    fn set_property(&self, name: &str, value: &glib::Value) -> Result<(), glib::BoolError> {
+    fn set_child_property(&self, name: &str, value: &glib::Value) -> Result<(), glib::BoolError> {
         unsafe {
             let found: bool = from_glib(ffi::gst_child_proxy_lookup(
                 self.to_glib_none().0,