From f3b5340875eaea7056781fe84149eb15dd82e4b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Thu, 17 Dec 2020 17:26:47 +0200
Subject: [PATCH] Update for new simplified glib::Object::new() API

---
 examples/src/bin/rtsp-server-subclass.rs | 15 +++------------
 examples/src/bin/subclass.rs             |  5 +----
 gstreamer/src/pad.rs                     | 11 +++--------
 gstreamer/src/subclass/element.rs        |  5 +----
 gstreamer/src/subclass/pad.rs            |  8 +-------
 5 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/examples/src/bin/rtsp-server-subclass.rs b/examples/src/bin/rtsp-server-subclass.rs
index 2229b5327..44a33e808 100644
--- a/examples/src/bin/rtsp-server-subclass.rs
+++ b/examples/src/bin/rtsp-server-subclass.rs
@@ -167,10 +167,7 @@ mod media_factory {
     impl Default for Factory {
         // Creates a new instance of our factory
         fn default() -> Factory {
-            glib::Object::new(Self::static_type(), &[])
-                .expect("Failed to create factory")
-                .downcast()
-                .expect("Created factory is of wrong type")
+            glib::Object::new(&[]).expect("Failed to create factory")
         }
     }
 }
@@ -316,10 +313,7 @@ mod server {
     impl Default for Server {
         // Creates a new instance of our factory
         fn default() -> Server {
-            glib::Object::new(Self::static_type(), &[])
-                .expect("Failed to create server")
-                .downcast()
-                .expect("Created server is of wrong type")
+            glib::Object::new(&[]).expect("Failed to create server")
         }
     }
 }
@@ -385,10 +379,7 @@ mod client {
     impl Default for Client {
         // Creates a new instance of our factory
         fn default() -> Client {
-            glib::Object::new(Self::static_type(), &[])
-                .expect("Failed to create client")
-                .downcast()
-                .expect("Created client is of wrong type")
+            glib::Object::new(&[]).expect("Failed to create client")
         }
     }
 }
diff --git a/examples/src/bin/subclass.rs b/examples/src/bin/subclass.rs
index ef4aa0366..2d29435a2 100644
--- a/examples/src/bin/subclass.rs
+++ b/examples/src/bin/subclass.rs
@@ -256,10 +256,7 @@ mod fir_filter {
     impl FirFilter {
         // Creates a new instance of our filter with the given name
         pub fn new(name: Option<&str>) -> FirFilter {
-            glib::Object::new(Self::static_type(), &[("name", &name)])
-                .expect("Failed to create fir filter")
-                .downcast()
-                .expect("Created fir filter is of wrong type")
+            glib::Object::new(&[("name", &name)]).expect("Failed to create fir filter")
         }
 
         // Sets the coefficients by getting access to the private
diff --git a/gstreamer/src/pad.rs b/gstreamer/src/pad.rs
index c81c697b0..0a07179d5 100644
--- a/gstreamer/src/pad.rs
+++ b/gstreamer/src/pad.rs
@@ -1628,13 +1628,8 @@ impl<T: IsA<Pad> + IsA<glib::Object>> PadBuilder<T> {
     pub fn new(name: Option<&str>, direction: crate::PadDirection) -> Self {
         assert_initialized_main_thread!();
 
-        let pad = glib::Object::new(
-            T::static_type(),
-            &[("name", &name), ("direction", &direction)],
-        )
-        .expect("Failed to create pad")
-        .downcast::<T>()
-        .unwrap();
+        let pad = glib::Object::new::<T>(&[("name", &name), ("direction", &direction)])
+            .expect("Failed to create pad");
 
         // Ghost pads are a bit special
         if let Some(pad) = pad.dynamic_cast_ref::<crate::GhostPad>() {
@@ -1683,7 +1678,7 @@ impl<T: IsA<Pad> + IsA<glib::Object>> PadBuilder<T> {
             }
         }
 
-        let pad = glib::Object::new(
+        let pad = glib::Object::with_type(
             type_,
             &[
                 ("name", &name),
diff --git a/gstreamer/src/subclass/element.rs b/gstreamer/src/subclass/element.rs
index eede8a90f..dc6d11873 100644
--- a/gstreamer/src/subclass/element.rs
+++ b/gstreamer/src/subclass/element.rs
@@ -744,10 +744,7 @@ mod tests {
 
     impl TestElement {
         pub fn new(name: Option<&str>) -> Self {
-            glib::Object::new(TestElement::static_type(), &[("name", &name)])
-                .unwrap()
-                .downcast::<Self>()
-                .unwrap()
+            glib::Object::new(&[("name", &name)]).unwrap()
         }
     }
 
diff --git a/gstreamer/src/subclass/pad.rs b/gstreamer/src/subclass/pad.rs
index 40590ccd5..5aa6ff530 100644
--- a/gstreamer/src/subclass/pad.rs
+++ b/gstreamer/src/subclass/pad.rs
@@ -141,13 +141,7 @@ mod tests {
 
     impl TestPad {
         pub fn new(name: &str, direction: PadDirection) -> Self {
-            glib::Object::new(
-                TestPad::static_type(),
-                &[("name", &name), ("direction", &direction)],
-            )
-            .unwrap()
-            .downcast::<Self>()
-            .unwrap()
+            glib::Object::new(&[("name", &name), ("direction", &direction)]).unwrap()
         }
     }