From a94d4d583db3783227e0a1fcd2134b9ae35349ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Thu, 13 Jul 2017 10:36:38 +0300
Subject: [PATCH] Re-export gst::ObjectExt as gst::GstObjectExt to prevent
 conflict with glib::ObjectExt

---
 examples/src/decodebin.rs        | 1 -
 examples/src/launch_glib_main.rs | 1 -
 gstreamer/src/lib.rs             | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/src/decodebin.rs b/examples/src/decodebin.rs
index a688ed011..ef40d19e5 100644
--- a/examples/src/decodebin.rs
+++ b/examples/src/decodebin.rs
@@ -1,6 +1,5 @@
 extern crate gstreamer as gst;
 use gst::*;
-use gst::ObjectExt as GstObjectExt;
 
 extern crate glib;
 use glib::ObjectExt;
diff --git a/examples/src/launch_glib_main.rs b/examples/src/launch_glib_main.rs
index 1f9922a20..6ce570abd 100644
--- a/examples/src/launch_glib_main.rs
+++ b/examples/src/launch_glib_main.rs
@@ -1,6 +1,5 @@
 extern crate gstreamer as gst;
 use gst::*;
-use gst::ObjectExt as GstObjectExt;
 
 extern crate glib;
 use glib::*;
diff --git a/gstreamer/src/lib.rs b/gstreamer/src/lib.rs
index 8d0ad7aae..f9dc0cd61 100644
--- a/gstreamer/src/lib.rs
+++ b/gstreamer/src/lib.rs
@@ -44,6 +44,7 @@ mod auto;
 pub use auto::*;
 pub use auto::traits::*;
 pub use auto::functions::{parse_launch, parse_bin_from_description};
+pub use auto::traits::ObjectExt as GstObjectExt;
 
 pub mod miniobject;
 pub use miniobject::GstRc;