Remove callback guards

Since Rust 1.24 it is safe to let panics go to the FFI boundary

gstreamer-app/src/app_sink.rs

@@ -11,7 +11,6 @@ use ffi;
 use gst_ffi;
 use glib::translate::*;
 use gst;
-use glib::source::CallbackGuard;
 use glib_ffi::gpointer;
 use std::ptr;
 
@@ -103,7 +102,6 @@ impl AppSinkCallbacksBuilder {
 }
 
 unsafe extern "C" fn trampoline_eos(appsink: *mut ffi::GstAppSink, callbacks: gpointer) {
-    let _guard = CallbackGuard::new();
     let callbacks = &*(callbacks as *const AppSinkCallbacks);
 
     callbacks
@@ -116,7 +114,6 @@ unsafe extern "C" fn trampoline_new_preroll(
     appsink: *mut ffi::GstAppSink,
     callbacks: gpointer,
 ) -> gst_ffi::GstFlowReturn {
-    let _guard = CallbackGuard::new();
     let callbacks = &*(callbacks as *const AppSinkCallbacks);
 
     callbacks
@@ -131,7 +128,6 @@ unsafe extern "C" fn trampoline_new_sample(
     appsink: *mut ffi::GstAppSink,
     callbacks: gpointer,
 ) -> gst_ffi::GstFlowReturn {
-    let _guard = CallbackGuard::new();
     let callbacks = &*(callbacks as *const AppSinkCallbacks);
 
     callbacks
@@ -143,7 +139,6 @@ unsafe extern "C" fn trampoline_new_sample(
 }
 
 unsafe extern "C" fn destroy_callbacks(ptr: gpointer) {
-    let _guard = CallbackGuard::new();
     Box::<AppSinkCallbacks>::from_raw(ptr as *mut _);
 }
 

gstreamer-app/src/app_src.rs

@@ -10,7 +10,6 @@ use AppSrc;
 use ffi;
 use glib::translate::*;
 use gst;
-use glib::source::CallbackGuard;
 use glib_ffi::{gboolean, gpointer};
 use std::ptr;
 use std::mem;
@@ -109,7 +108,6 @@ unsafe extern "C" fn trampoline_need_data(
     length: u32,
     callbacks: gpointer,
 ) {
-    let _guard = CallbackGuard::new();
     let callbacks = &*(callbacks as *const AppSrcCallbacks);
 
     callbacks
@@ -119,7 +117,6 @@ unsafe extern "C" fn trampoline_need_data(
 }
 
 unsafe extern "C" fn trampoline_enough_data(appsrc: *mut ffi::GstAppSrc, callbacks: gpointer) {
-    let _guard = CallbackGuard::new();
     let callbacks = &*(callbacks as *const AppSrcCallbacks);
 
     callbacks
@@ -133,7 +130,6 @@ unsafe extern "C" fn trampoline_seek_data(
     offset: u64,
     callbacks: gpointer,
 ) -> gboolean {
-    let _guard = CallbackGuard::new();
     let callbacks = &*(callbacks as *const AppSrcCallbacks);
 
     callbacks
@@ -145,7 +141,6 @@ unsafe extern "C" fn trampoline_seek_data(
 }
 
 unsafe extern "C" fn destroy_callbacks(ptr: gpointer) {
-    let _guard = CallbackGuard::new();
     Box::<AppSrcCallbacks>::from_raw(ptr as *mut _);
 }
 

gstreamer-app/src/auto/app_sink.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;
@@ -251,61 +252,51 @@ unsafe impl Send for AppSink {}
 unsafe impl Sync for AppSink {}
 
 unsafe extern "C" fn eos_trampoline(this: *mut ffi::GstAppSink, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn new_preroll_trampoline(this: *mut ffi::GstAppSink, f: glib_ffi::gpointer) -> gst_ffi::GstFlowReturn {
-    callback_guard!();
     let f: &&(Fn(&AppSink) -> gst::FlowReturn + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this)).to_glib()
 }
 
 unsafe extern "C" fn new_sample_trampoline(this: *mut ffi::GstAppSink, f: glib_ffi::gpointer) -> gst_ffi::GstFlowReturn {
-    callback_guard!();
     let f: &&(Fn(&AppSink) -> gst::FlowReturn + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this)).to_glib()
 }
 
 unsafe extern "C" fn notify_buffer_list_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_caps_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_drop_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_emit_signals_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_eos_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_max_buffers_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_wait_on_eos_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }

gstreamer-app/src/auto/app_src.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use AppStreamType;
@@ -363,97 +364,81 @@ unsafe impl Send for AppSrc {}
 unsafe impl Sync for AppSrc {}
 
 unsafe extern "C" fn enough_data_trampoline(this: *mut ffi::GstAppSrc, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn need_data_trampoline(this: *mut ffi::GstAppSrc, length: libc::c_uint, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc, u32) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this), length)
 }
 
 unsafe extern "C" fn seek_data_trampoline(this: *mut ffi::GstAppSrc, offset: u64, f: glib_ffi::gpointer) -> glib_ffi::gboolean {
-    callback_guard!();
     let f: &&(Fn(&AppSrc, u64) -> bool + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this), offset).to_glib()
 }
 
 unsafe extern "C" fn notify_block_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_caps_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_current_level_bytes_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_duration_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_emit_signals_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_format_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_is_live_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_max_bytes_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_max_latency_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_min_latency_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_min_percent_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_size_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_stream_type_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }

gstreamer-app/src/auto/enums.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;
-use glib::Type;
 use glib::StaticType;
-use glib::value::{Value, SetValue, FromValue, FromValueOptional};
-use gobject_ffi;
+use glib::Type;
 use glib::translate::*;
+use glib::value::FromValue;
+use glib::value::FromValueOptional;
+use glib::value::SetValue;
+use glib::value::Value;
+use gobject_ffi;
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 pub enum AppStreamType {

gstreamer-app/src/auto/flags.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;

gstreamer-app/src/auto/mod.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 mod app_sink;

gstreamer-app/src/lib.rs

@@ -19,12 +19,6 @@ extern crate gstreamer_sys as gst_ffi;
 #[macro_use]
 extern crate glib;
 
-macro_rules! callback_guard {
-    () => (
-        let _guard = ::glib::CallbackGuard::new();
-    )
-}
-
 macro_rules! skip_assert_initialized {
     () => (
     )

gstreamer-audio/src/auto/enums.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;
-use glib::Type;
 use glib::StaticType;
-use glib::value::{Value, SetValue, FromValue, FromValueOptional};
-use gobject_ffi;
+use glib::Type;
 use glib::translate::*;
+use glib::value::FromValue;
+use glib::value::FromValueOptional;
+use glib::value::SetValue;
+use glib::value::Value;
+use gobject_ffi;
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 pub enum AudioChannelPosition {

gstreamer-audio/src/auto/flags.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;
-use glib::Type;
 use glib::StaticType;
-use glib::value::{Value, SetValue, FromValue, FromValueOptional};
-use gobject_ffi;
+use glib::Type;
 use glib::translate::*;
+use glib::value::FromValue;
+use glib::value::FromValueOptional;
+use glib::value::SetValue;
+use glib::value::Value;
+use gobject_ffi;
 
 bitflags! {
     pub struct AudioFlags: u32 {

gstreamer-audio/src/auto/mod.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 mod stream_volume;

gstreamer-audio/src/auto/stream_volume.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use StreamVolumeFormat;
@@ -94,14 +95,12 @@ impl<O: IsA<StreamVolume> + IsA<glib::object::Object>> StreamVolumeExt for O {
 
 unsafe extern "C" fn notify_mute_trampoline<P>(this: *mut ffi::GstStreamVolume, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StreamVolume> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&StreamVolume::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_volume_trampoline<P>(this: *mut ffi::GstStreamVolume, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StreamVolume> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&StreamVolume::from_glib_borrow(this).downcast_unchecked())
 }

gstreamer-audio/src/lib.rs

@@ -18,12 +18,6 @@ extern crate gstreamer as gst;
 extern crate gstreamer_audio_sys as ffi;
 extern crate gstreamer_sys as gst_ffi;
 
-macro_rules! callback_guard {
-    () => (
-        let _guard = ::glib::CallbackGuard::new();
-    )
-}
-
 macro_rules! assert_initialized_main_thread {
     () => (
         if unsafe {::gst_ffi::gst_is_initialized()} != ::glib_ffi::GTRUE {

gstreamer-base/src/auto/adapter.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;

gstreamer-base/src/auto/base_sink.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;
@@ -446,77 +447,66 @@ impl<O: IsA<BaseSink> + IsA<glib::object::Object>> BaseSinkExt for O {
 
 unsafe extern "C" fn notify_async_trampoline<P>(this: *mut ffi::GstBaseSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSink> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSink::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_blocksize_trampoline<P>(this: *mut ffi::GstBaseSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSink> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSink::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_enable_last_sample_trampoline<P>(this: *mut ffi::GstBaseSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSink> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSink::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_last_sample_trampoline<P>(this: *mut ffi::GstBaseSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSink> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSink::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_max_bitrate_trampoline<P>(this: *mut ffi::GstBaseSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSink> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSink::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_max_lateness_trampoline<P>(this: *mut ffi::GstBaseSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSink> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSink::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_qos_trampoline<P>(this: *mut ffi::GstBaseSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSink> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSink::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_render_delay_trampoline<P>(this: *mut ffi::GstBaseSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSink> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSink::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_sync_trampoline<P>(this: *mut ffi::GstBaseSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSink> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSink::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_throttle_time_trampoline<P>(this: *mut ffi::GstBaseSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSink> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSink::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_ts_offset_trampoline<P>(this: *mut ffi::GstBaseSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSink> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSink::from_glib_borrow(this).downcast_unchecked())
 }

gstreamer-base/src/auto/base_src.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;
@@ -267,28 +268,24 @@ impl<O: IsA<BaseSrc> + IsA<glib::object::Object>> BaseSrcExt for O {
 
 unsafe extern "C" fn notify_blocksize_trampoline<P>(this: *mut ffi::GstBaseSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSrc> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSrc::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_do_timestamp_trampoline<P>(this: *mut ffi::GstBaseSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSrc> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSrc::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_num_buffers_trampoline<P>(this: *mut ffi::GstBaseSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSrc> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSrc::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_typefind_trampoline<P>(this: *mut ffi::GstBaseSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseSrc> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseSrc::from_glib_borrow(this).downcast_unchecked())
 }

gstreamer-base/src/auto/base_transform.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;
@@ -175,7 +176,6 @@ impl<O: IsA<BaseTransform> + IsA<glib::object::Object>> BaseTransformExt for O {
 
 unsafe extern "C" fn notify_qos_trampoline<P>(this: *mut ffi::GstBaseTransform, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<BaseTransform> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&BaseTransform::from_glib_borrow(this).downcast_unchecked())
 }

gstreamer-base/src/auto/enums.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;

gstreamer-base/src/auto/flags.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;

gstreamer-base/src/auto/functions.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;

gstreamer-base/src/auto/mod.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 mod adapter;

gstreamer-base/src/auto/push_src.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use BaseSrc;

gstreamer-base/src/lib.rs

@@ -15,12 +15,6 @@ extern crate gstreamer_sys as gst_ffi;
 #[macro_use]
 extern crate glib;
 
-macro_rules! callback_guard {
-    () => (
-        let _guard = ::glib::CallbackGuard::new();
-    )
-}
-
 macro_rules! assert_initialized_main_thread {
     () => (
         if unsafe {::gst_ffi::gst_is_initialized()} != ::glib_ffi::GTRUE {

gstreamer-net/src/auto/enums.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;

gstreamer-net/src/auto/flags.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;

gstreamer-net/src/auto/mod.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 mod net_client_clock;

gstreamer-net/src/auto/net_client_clock.rs

-// This file was generated by gir (746446b) from gir-files (???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
 use ffi;
@@ -185,43 +186,36 @@ unsafe impl Send for NetClientClock {}
 unsafe impl Sync for NetClientClock {}
 
 unsafe extern "C" fn notify_address_trampoline(this: *mut ffi::GstNetClientClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&NetClientClock) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_base_time_trampoline(this: *mut ffi::GstNetClientClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&NetClientClock) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_bus_trampoline(this: *mut ffi::GstNetClientClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&NetClientClock) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_internal_clock_trampoline(this: *mut ffi::GstNetClientClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&NetClientClock) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_minimum_update_interval_trampoline(this: *mut ffi::GstNetClientClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&NetClientClock) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_port_trampoline(this: *mut ffi::GstNetClientClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&NetClientClock) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_round_trip_limit_trampoline(this: *mut ffi::GstNetClientClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {