From a88918dd5f3e1c3b147c5d1706582ba463a6bd78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= <fengalin@free.fr>
Date: Fri, 25 Jan 2019 18:15:01 +0100
Subject: [PATCH] Use glib_result_from_gboolean! where applicable

---
 gstreamer/src/bin.rs     | 25 +++++++++++--------------
 gstreamer/src/element.rs | 14 +++++++-------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/gstreamer/src/bin.rs b/gstreamer/src/bin.rs
index 60312cad1..e0eee94bf 100644
--- a/gstreamer/src/bin.rs
+++ b/gstreamer/src/bin.rs
@@ -54,13 +54,10 @@ impl<O: IsA<Bin>> GstBinExtManual for O {
     fn add_many<E: IsA<Element>>(&self, elements: &[&E]) -> Result<(), glib::BoolError> {
         for e in elements {
             unsafe {
-                let ret: bool = from_glib(ffi::gst_bin_add(
-                    self.as_ref().to_glib_none().0,
-                    e.as_ref().to_glib_none().0,
-                ));
-                if !ret {
-                    return Err(glib_bool_error!("Failed to add elements"));
-                }
+                glib_result_from_gboolean!(
+                    ffi::gst_bin_add(self.as_ref().to_glib_none().0, e.as_ref().to_glib_none().0),
+                    "Failed to add elements"
+                )?;
             }
         }
 
@@ -70,13 +67,13 @@ impl<O: IsA<Bin>> GstBinExtManual for O {
     fn remove_many<E: IsA<Element>>(&self, elements: &[&E]) -> Result<(), glib::BoolError> {
         for e in elements {
             unsafe {
-                let ret: bool = from_glib(ffi::gst_bin_remove(
-                    self.as_ref().to_glib_none().0,
-                    e.as_ref().to_glib_none().0,
-                ));
-                if !ret {
-                    return Err(glib_bool_error!("Failed to remove elements"));
-                }
+                glib_result_from_gboolean!(
+                    ffi::gst_bin_remove(
+                        self.as_ref().to_glib_none().0,
+                        e.as_ref().to_glib_none().0,
+                    ),
+                    "Failed to remove elements"
+                )?;
             }
         }
 
diff --git a/gstreamer/src/element.rs b/gstreamer/src/element.rs
index c1375d6f6..9f3a3c6bb 100644
--- a/gstreamer/src/element.rs
+++ b/gstreamer/src/element.rs
@@ -49,13 +49,13 @@ impl Element {
         skip_assert_initialized!();
         for (e1, e2) in elements.iter().zip(elements.iter().skip(1)) {
             unsafe {
-                let ret: bool = from_glib(ffi::gst_element_link(
-                    e1.as_ref().to_glib_none().0,
-                    e2.as_ref().to_glib_none().0,
-                ));
-                if !ret {
-                    return Err(glib_bool_error!("Failed to link elements"));
-                }
+                glib_result_from_gboolean!(
+                    ffi::gst_element_link(
+                        e1.as_ref().to_glib_none().0,
+                        e2.as_ref().to_glib_none().0,
+                    ),
+                    "Failed to link elements"
+                )?;
             }
         }