From 8c3df63b95fc49c7e59820a83eede924c422453e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= Date: Mon, 3 Dec 2018 20:24:17 +0100 Subject: [PATCH] URIHandler: rename `get_type` Avoid a conflict with the `get_type` function declared by the `glib_object_subclass!` macro. --- gstreamer/src/subclass/uri_handler.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gstreamer/src/subclass/uri_handler.rs b/gstreamer/src/subclass/uri_handler.rs index e59efb062..f748e63c9 100644 --- a/gstreamer/src/subclass/uri_handler.rs +++ b/gstreamer/src/subclass/uri_handler.rs @@ -26,7 +26,7 @@ use URIType; pub trait URIHandlerImpl: super::element::ElementImpl + Send + Sync + 'static { fn get_uri(&self, element: &URIHandler) -> Option; fn set_uri(&self, element: &URIHandler, uri: Option) -> Result<(), glib::Error>; - fn get_type() -> URIType; + fn get_uri_type() -> URIType; fn get_protocols() -> Vec; } @@ -36,7 +36,7 @@ unsafe extern "C" fn uri_handler_get_type( where T: URIHandlerImpl, { - ::get_type().to_glib() + ::get_uri_type().to_glib() } unsafe extern "C" fn uri_handler_get_protocols(