From 2085d170be97b4bfba1aa2595008aa417e29722f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Sun, 24 Jun 2018 14:42:11 +0300
Subject: [PATCH] Get rid of callback_guard! as unwinding through FFI is
 defined behaviour now and aborts

---
 gstreamer-app/src/auto/app_sink.rs            | 10 -------
 gstreamer-app/src/auto/app_src.rs             | 16 -----------
 gstreamer-app/src/auto/versions.txt           |  2 +-
 gstreamer-audio/src/auto/stream_volume.rs     |  2 --
 gstreamer-audio/src/auto/versions.txt         |  2 +-
 gstreamer-base/src/auto/base_sink.rs          | 11 --------
 gstreamer-base/src/auto/base_src.rs           |  4 ---
 gstreamer-base/src/auto/base_transform.rs     |  1 -
 gstreamer-base/src/auto/versions.txt          |  2 +-
 gstreamer-net/src/auto/net_client_clock.rs    |  8 ------
 gstreamer-net/src/auto/net_time_provider.rs   |  5 ----
 gstreamer-net/src/auto/ptp_clock.rs           |  4 ---
 gstreamer-net/src/auto/versions.txt           |  2 +-
 gstreamer-pbutils/src/auto/discoverer.rs      |  4 ---
 gstreamer-pbutils/src/auto/versions.txt       |  2 +-
 gstreamer-player/src/auto/player.rs           | 27 -------------------
 .../player_gmain_context_signal_dispatcher.rs |  1 -
 .../player_video_overlay_video_renderer.rs    |  2 --
 gstreamer-player/src/auto/versions.txt        |  2 +-
 gstreamer-rtsp-server/src/auto/rtsp_auth.rs   |  1 -
 gstreamer-rtsp-server/src/auto/rtsp_client.rs | 26 ------------------
 gstreamer-rtsp-server/src/auto/rtsp_media.rs  | 19 -------------
 .../src/auto/rtsp_media_factory.rs            | 13 ---------
 .../src/auto/rtsp_media_factory_uri.rs        |  2 --
 gstreamer-rtsp-server/src/auto/rtsp_server.rs |  7 -----
 .../src/auto/rtsp_session.rs                  |  3 ---
 .../src/auto/rtsp_session_pool.rs             |  2 --
 gstreamer-rtsp-server/src/auto/rtsp_stream.rs |  5 ----
 .../src/auto/rtsp_thread_pool.rs              |  1 -
 gstreamer-rtsp-server/src/auto/versions.txt   |  2 +-
 gstreamer-rtsp/src/auto/versions.txt          |  2 +-
 gstreamer-sdp/src/auto/versions.txt           |  2 +-
 gstreamer-video/src/auto/versions.txt         |  2 +-
 gstreamer-webrtc/src/auto/versions.txt        |  2 +-
 .../src/auto/web_rtcdtls_transport.rs         |  7 -----
 .../src/auto/web_rtcice_transport.rs          |  5 ----
 .../src/auto/web_rtcrtp_transceiver.rs        |  3 ---
 gstreamer/src/auto/bin.rs                     |  7 -----
 gstreamer/src/auto/bus.rs                     |  3 ---
 gstreamer/src/auto/child_proxy.rs             |  2 --
 gstreamer/src/auto/clock.rs                   |  4 ---
 gstreamer/src/auto/device.rs                  |  5 ----
 gstreamer/src/auto/device_monitor.rs          |  1 -
 gstreamer/src/auto/device_provider.rs         |  2 --
 gstreamer/src/auto/element.rs                 |  3 ---
 gstreamer/src/auto/object.rs                  |  2 --
 gstreamer/src/auto/pad.rs                     |  6 -----
 gstreamer/src/auto/pad_template.rs            |  6 -----
 gstreamer/src/auto/pipeline.rs                |  3 ---
 gstreamer/src/auto/registry.rs                |  2 --
 gstreamer/src/auto/stream.rs                  |  5 ----
 gstreamer/src/auto/stream_collection.rs       |  1 -
 gstreamer/src/auto/system_clock.rs            |  1 -
 gstreamer/src/auto/versions.txt               |  2 +-
 54 files changed, 12 insertions(+), 254 deletions(-)

diff --git a/gstreamer-app/src/auto/app_sink.rs b/gstreamer-app/src/auto/app_sink.rs
index 75019d190..a0155d1b5 100644
--- a/gstreamer-app/src/auto/app_sink.rs
+++ b/gstreamer-app/src/auto/app_sink.rs
@@ -252,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))
 }
diff --git a/gstreamer-app/src/auto/app_src.rs b/gstreamer-app/src/auto/app_src.rs
index 35d6c42d0..e490a6f66 100644
--- a/gstreamer-app/src/auto/app_src.rs
+++ b/gstreamer-app/src/auto/app_src.rs
@@ -364,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))
 }
diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer-app/src/auto/versions.txt
+++ b/gstreamer-app/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-audio/src/auto/stream_volume.rs b/gstreamer-audio/src/auto/stream_volume.rs
index 266caec29..aba3294ef 100644
--- a/gstreamer-audio/src/auto/stream_volume.rs
+++ b/gstreamer-audio/src/auto/stream_volume.rs
@@ -95,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())
 }
diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer-audio/src/auto/versions.txt
+++ b/gstreamer-audio/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-base/src/auto/base_sink.rs b/gstreamer-base/src/auto/base_sink.rs
index 6f5ce184a..5082fa936 100644
--- a/gstreamer-base/src/auto/base_sink.rs
+++ b/gstreamer-base/src/auto/base_sink.rs
@@ -447,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())
 }
diff --git a/gstreamer-base/src/auto/base_src.rs b/gstreamer-base/src/auto/base_src.rs
index f4d3b9c39..fe9dbc487 100644
--- a/gstreamer-base/src/auto/base_src.rs
+++ b/gstreamer-base/src/auto/base_src.rs
@@ -268,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())
 }
diff --git a/gstreamer-base/src/auto/base_transform.rs b/gstreamer-base/src/auto/base_transform.rs
index cb5a33e2c..63f245c67 100644
--- a/gstreamer-base/src/auto/base_transform.rs
+++ b/gstreamer-base/src/auto/base_transform.rs
@@ -176,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())
 }
diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer-base/src/auto/versions.txt
+++ b/gstreamer-base/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-net/src/auto/net_client_clock.rs b/gstreamer-net/src/auto/net_client_clock.rs
index 51190316c..0dc6b6226 100644
--- a/gstreamer-net/src/auto/net_client_clock.rs
+++ b/gstreamer-net/src/auto/net_client_clock.rs
@@ -198,49 +198,41 @@ 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_qos_dscp_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) {
-    callback_guard!();
     let f: &&(Fn(&NetClientClock) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer-net/src/auto/net_time_provider.rs b/gstreamer-net/src/auto/net_time_provider.rs
index 68b7d1bbc..74961662b 100644
--- a/gstreamer-net/src/auto/net_time_provider.rs
+++ b/gstreamer-net/src/auto/net_time_provider.rs
@@ -125,31 +125,26 @@ unsafe impl Send for NetTimeProvider {}
 unsafe impl Sync for NetTimeProvider {}
 
 unsafe extern "C" fn notify_active_trampoline(this: *mut ffi::GstNetTimeProvider, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&NetTimeProvider) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_address_trampoline(this: *mut ffi::GstNetTimeProvider, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&NetTimeProvider) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_clock_trampoline(this: *mut ffi::GstNetTimeProvider, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&NetTimeProvider) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_port_trampoline(this: *mut ffi::GstNetTimeProvider, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&NetTimeProvider) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_qos_dscp_trampoline(this: *mut ffi::GstNetTimeProvider, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&NetTimeProvider) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer-net/src/auto/ptp_clock.rs b/gstreamer-net/src/auto/ptp_clock.rs
index 918d7c5cc..ef2758355 100644
--- a/gstreamer-net/src/auto/ptp_clock.rs
+++ b/gstreamer-net/src/auto/ptp_clock.rs
@@ -98,25 +98,21 @@ unsafe impl Send for PtpClock {}
 unsafe impl Sync for PtpClock {}
 
 unsafe extern "C" fn notify_domain_trampoline(this: *mut ffi::GstPtpClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PtpClock) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_grandmaster_clock_id_trampoline(this: *mut ffi::GstPtpClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PtpClock) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_internal_clock_trampoline(this: *mut ffi::GstPtpClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PtpClock) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_master_clock_id_trampoline(this: *mut ffi::GstPtpClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PtpClock) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer-net/src/auto/versions.txt
+++ b/gstreamer-net/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-pbutils/src/auto/discoverer.rs b/gstreamer-pbutils/src/auto/discoverer.rs
index a4c8478f1..45fc0668e 100644
--- a/gstreamer-pbutils/src/auto/discoverer.rs
+++ b/gstreamer-pbutils/src/auto/discoverer.rs
@@ -99,25 +99,21 @@ unsafe impl Send for Discoverer {}
 unsafe impl Sync for Discoverer {}
 
 unsafe extern "C" fn discovered_trampoline(this: *mut ffi::GstDiscoverer, info: *mut ffi::GstDiscovererInfo, error: *mut glib_ffi::GError, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Discoverer, &DiscovererInfo, &Option<Error>) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this), &from_glib_borrow(info), &from_glib_borrow(error))
 }
 
 unsafe extern "C" fn finished_trampoline(this: *mut ffi::GstDiscoverer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Discoverer) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn source_setup_trampoline(this: *mut ffi::GstDiscoverer, source: *mut gst_ffi::GstElement, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Discoverer, &gst::Element) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this), &from_glib_borrow(source))
 }
 
 unsafe extern "C" fn starting_trampoline(this: *mut ffi::GstDiscoverer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Discoverer) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer-pbutils/src/auto/versions.txt
+++ b/gstreamer-pbutils/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-player/src/auto/player.rs b/gstreamer-player/src/auto/player.rs
index 29f88d54c..58bd38342 100644
--- a/gstreamer-player/src/auto/player.rs
+++ b/gstreamer-player/src/auto/player.rs
@@ -575,163 +575,136 @@ unsafe impl Send for Player {}
 unsafe impl Sync for Player {}
 
 unsafe extern "C" fn buffering_trampoline(this: *mut ffi::GstPlayer, object: libc::c_int, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player, i32) + Send + 'static) = transmute(f);
     f(&from_glib_borrow(this), object)
 }
 
 unsafe extern "C" fn end_of_stream_trampoline(this: *mut ffi::GstPlayer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn error_trampoline(this: *mut ffi::GstPlayer, object: *mut glib_ffi::GError, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player, &Error) + Send + 'static) = transmute(f);
     f(&from_glib_borrow(this), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn media_info_updated_trampoline(this: *mut ffi::GstPlayer, object: *mut ffi::GstPlayerMediaInfo, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player, &PlayerMediaInfo) + Send + 'static) = transmute(f);
     f(&from_glib_borrow(this), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn mute_changed_trampoline(this: *mut ffi::GstPlayer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn state_changed_trampoline(this: *mut ffi::GstPlayer, object: ffi::GstPlayerState, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player, PlayerState) + Send + 'static) = transmute(f);
     f(&from_glib_borrow(this), from_glib(object))
 }
 
 unsafe extern "C" fn uri_loaded_trampoline(this: *mut ffi::GstPlayer, object: *mut libc::c_char, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player, &str) + Send + 'static) = transmute(f);
     f(&from_glib_borrow(this), &String::from_glib_none(object))
 }
 
 unsafe extern "C" fn video_dimensions_changed_trampoline(this: *mut ffi::GstPlayer, object: libc::c_int, p0: libc::c_int, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player, i32, i32) + Send + 'static) = transmute(f);
     f(&from_glib_borrow(this), object, p0)
 }
 
 unsafe extern "C" fn volume_changed_trampoline(this: *mut ffi::GstPlayer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn warning_trampoline(this: *mut ffi::GstPlayer, object: *mut glib_ffi::GError, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player, &Error) + Send + 'static) = transmute(f);
     f(&from_glib_borrow(this), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn notify_audio_video_offset_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_current_audio_track_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_current_subtitle_track_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_current_video_track_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_duration_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_media_info_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_mute_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_pipeline_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_position_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_rate_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_signal_dispatcher_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_suburi_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_uri_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_video_multiview_flags_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_video_multiview_mode_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_video_renderer_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_volume_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer-player/src/auto/player_gmain_context_signal_dispatcher.rs b/gstreamer-player/src/auto/player_gmain_context_signal_dispatcher.rs
index d94275670..68bc3b2f3 100644
--- a/gstreamer-player/src/auto/player_gmain_context_signal_dispatcher.rs
+++ b/gstreamer-player/src/auto/player_gmain_context_signal_dispatcher.rs
@@ -47,7 +47,6 @@ unsafe impl Send for PlayerGMainContextSignalDispatcher {}
 unsafe impl Sync for PlayerGMainContextSignalDispatcher {}
 
 unsafe extern "C" fn notify_application_context_trampoline(this: *mut ffi::GstPlayerGMainContextSignalDispatcher, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PlayerGMainContextSignalDispatcher) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs b/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs
index 58584e4a0..0dc679741 100644
--- a/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs
+++ b/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs
@@ -102,13 +102,11 @@ unsafe impl Send for PlayerVideoOverlayVideoRenderer {}
 unsafe impl Sync for PlayerVideoOverlayVideoRenderer {}
 
 unsafe extern "C" fn notify_video_sink_trampoline(this: *mut ffi::GstPlayerVideoOverlayVideoRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PlayerVideoOverlayVideoRenderer) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_window_handle_trampoline(this: *mut ffi::GstPlayerVideoOverlayVideoRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PlayerVideoOverlayVideoRenderer) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer-player/src/auto/versions.txt
+++ b/gstreamer-player/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs
index c357f90c4..29866620b 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs
@@ -193,7 +193,6 @@ impl<O: IsA<RTSPAuth> + IsA<glib::object::Object>> RTSPAuthExt for O {
 
 unsafe extern "C" fn accept_certificate_trampoline<P>(this: *mut ffi::GstRTSPAuth, connection: *mut gio_ffi::GTlsConnection, peer_cert: *mut gio_ffi::GTlsCertificate, errors: gio_ffi::GTlsCertificateFlags, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<RTSPAuth> {
-    callback_guard!();
     let f: &&(Fn(&P, &gio::TlsConnection, &gio::TlsCertificate, gio::TlsCertificateFlags) -> bool + Send + Sync + 'static) = transmute(f);
     f(&RTSPAuth::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(connection), &from_glib_borrow(peer_cert), from_glib(errors)).to_glib()
 }
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_client.rs b/gstreamer-rtsp-server/src/auto/rtsp_client.rs
index 12e74506e..b3773b3d2 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_client.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_client.rs
@@ -486,63 +486,54 @@ impl<O: IsA<RTSPClient> + IsA<glib::object::Object>> RTSPClientExt for O {
 
 unsafe extern "C" fn announce_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx))
 }
 
 unsafe extern "C" fn closed_trampoline<P>(this: *mut ffi::GstRTSPClient, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn describe_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx))
 }
 
 unsafe extern "C" fn get_parameter_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx))
 }
 
 unsafe extern "C" fn handle_response_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx))
 }
 
 unsafe extern "C" fn new_session_trampoline<P>(this: *mut ffi::GstRTSPClient, object: *mut ffi::GstRTSPSession, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPSession) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn options_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx))
 }
 
 unsafe extern "C" fn pause_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx))
 }
 
 unsafe extern "C" fn play_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx))
 }
@@ -550,7 +541,6 @@ where P: IsA<RTSPClient> {
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 unsafe extern "C" fn pre_announce_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer) -> gst_rtsp_ffi::GstRTSPStatusCode
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) -> gst_rtsp::RTSPStatusCode + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx)).to_glib()
 }
@@ -558,7 +548,6 @@ where P: IsA<RTSPClient> {
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 unsafe extern "C" fn pre_describe_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer) -> gst_rtsp_ffi::GstRTSPStatusCode
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) -> gst_rtsp::RTSPStatusCode + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx)).to_glib()
 }
@@ -566,7 +555,6 @@ where P: IsA<RTSPClient> {
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 unsafe extern "C" fn pre_get_parameter_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer) -> gst_rtsp_ffi::GstRTSPStatusCode
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) -> gst_rtsp::RTSPStatusCode + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx)).to_glib()
 }
@@ -574,7 +562,6 @@ where P: IsA<RTSPClient> {
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 unsafe extern "C" fn pre_options_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer) -> gst_rtsp_ffi::GstRTSPStatusCode
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) -> gst_rtsp::RTSPStatusCode + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx)).to_glib()
 }
@@ -582,7 +569,6 @@ where P: IsA<RTSPClient> {
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 unsafe extern "C" fn pre_pause_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer) -> gst_rtsp_ffi::GstRTSPStatusCode
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) -> gst_rtsp::RTSPStatusCode + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx)).to_glib()
 }
@@ -590,7 +576,6 @@ where P: IsA<RTSPClient> {
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 unsafe extern "C" fn pre_play_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer) -> gst_rtsp_ffi::GstRTSPStatusCode
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) -> gst_rtsp::RTSPStatusCode + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx)).to_glib()
 }
@@ -598,7 +583,6 @@ where P: IsA<RTSPClient> {
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 unsafe extern "C" fn pre_record_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer) -> gst_rtsp_ffi::GstRTSPStatusCode
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) -> gst_rtsp::RTSPStatusCode + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx)).to_glib()
 }
@@ -606,7 +590,6 @@ where P: IsA<RTSPClient> {
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 unsafe extern "C" fn pre_set_parameter_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer) -> gst_rtsp_ffi::GstRTSPStatusCode
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) -> gst_rtsp::RTSPStatusCode + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx)).to_glib()
 }
@@ -614,7 +597,6 @@ where P: IsA<RTSPClient> {
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 unsafe extern "C" fn pre_setup_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer) -> gst_rtsp_ffi::GstRTSPStatusCode
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) -> gst_rtsp::RTSPStatusCode + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx)).to_glib()
 }
@@ -622,56 +604,48 @@ where P: IsA<RTSPClient> {
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 unsafe extern "C" fn pre_teardown_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer) -> gst_rtsp_ffi::GstRTSPStatusCode
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) -> gst_rtsp::RTSPStatusCode + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx)).to_glib()
 }
 
 unsafe extern "C" fn record_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx))
 }
 
 unsafe extern "C" fn set_parameter_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx))
 }
 
 unsafe extern "C" fn setup_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx))
 }
 
 unsafe extern "C" fn teardown_request_trampoline<P>(this: *mut ffi::GstRTSPClient, ctx: *mut ffi::GstRTSPContext, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPContext) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(ctx))
 }
 
 unsafe extern "C" fn notify_drop_backlog_trampoline<P>(this: *mut ffi::GstRTSPClient, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_mount_points_trampoline<P>(this: *mut ffi::GstRTSPClient, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_session_pool_trampoline<P>(this: *mut ffi::GstRTSPClient, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPClient> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPClient::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_media.rs
index e492f1bbd..ab6ab2588 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_media.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_media.rs
@@ -731,133 +731,114 @@ impl<O: IsA<RTSPMedia> + IsA<glib::object::Object>> RTSPMediaExt for O {
 
 unsafe extern "C" fn new_state_trampoline<P>(this: *mut ffi::GstRTSPMedia, object: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked(), object)
 }
 
 unsafe extern "C" fn new_stream_trampoline<P>(this: *mut ffi::GstRTSPMedia, object: *mut ffi::GstRTSPStream, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPStream) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn prepared_trampoline<P>(this: *mut ffi::GstRTSPMedia, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn removed_stream_trampoline<P>(this: *mut ffi::GstRTSPMedia, object: *mut ffi::GstRTSPStream, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPStream) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn target_state_trampoline<P>(this: *mut ffi::GstRTSPMedia, object: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked(), object)
 }
 
 unsafe extern "C" fn unprepared_trampoline<P>(this: *mut ffi::GstRTSPMedia, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_buffer_size_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_clock_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_element_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_eos_shutdown_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_latency_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_profiles_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_protocols_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_reusable_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_shared_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stop_on_disconnect_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_suspend_mode_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_time_provider_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_transport_mode_trampoline<P>(this: *mut ffi::GstRTSPMedia, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMedia> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMedia::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs
index 629332d9a..1d174c7e6 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs
@@ -513,91 +513,78 @@ impl<O: IsA<RTSPMediaFactory> + IsA<glib::object::Object>> RTSPMediaFactoryExt f
 
 unsafe extern "C" fn media_configure_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, object: *mut ffi::GstRTSPMedia, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPMedia) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn media_constructed_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, object: *mut ffi::GstRTSPMedia, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPMedia) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn notify_buffer_size_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_clock_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_eos_shutdown_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_latency_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_launch_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_profiles_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_protocols_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_shared_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stop_on_disconnect_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_suspend_mode_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_transport_mode_trampoline<P>(this: *mut ffi::GstRTSPMediaFactory, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactory> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactory::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs b/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs
index e4b7cb045..fc53f049a 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs
@@ -105,14 +105,12 @@ impl<O: IsA<RTSPMediaFactoryURI> + IsA<glib::object::Object>> RTSPMediaFactoryUR
 
 unsafe extern "C" fn notify_uri_trampoline<P>(this: *mut ffi::GstRTSPMediaFactoryURI, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactoryURI> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactoryURI::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_gstpay_trampoline<P>(this: *mut ffi::GstRTSPMediaFactoryURI, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPMediaFactoryURI> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPMediaFactoryURI::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_server.rs b/gstreamer-rtsp-server/src/auto/rtsp_server.rs
index b362ea3b9..efac97c51 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_server.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_server.rs
@@ -300,49 +300,42 @@ impl<O: IsA<RTSPServer> + IsA<glib::object::Object>> RTSPServerExt for O {
 
 unsafe extern "C" fn client_connected_trampoline<P>(this: *mut ffi::GstRTSPServer, object: *mut ffi::GstRTSPClient, f: glib_ffi::gpointer)
 where P: IsA<RTSPServer> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPClient) + Send + Sync + 'static) = transmute(f);
     f(&RTSPServer::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn notify_address_trampoline<P>(this: *mut ffi::GstRTSPServer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPServer> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPServer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_backlog_trampoline<P>(this: *mut ffi::GstRTSPServer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPServer> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPServer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_bound_port_trampoline<P>(this: *mut ffi::GstRTSPServer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPServer> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPServer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_mount_points_trampoline<P>(this: *mut ffi::GstRTSPServer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPServer> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPServer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_service_trampoline<P>(this: *mut ffi::GstRTSPServer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPServer> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPServer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_session_pool_trampoline<P>(this: *mut ffi::GstRTSPServer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPServer> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPServer::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session.rs b/gstreamer-rtsp-server/src/auto/rtsp_session.rs
index 526892232..028e25b15 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_session.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_session.rs
@@ -210,21 +210,18 @@ impl<O: IsA<RTSPSession> + IsA<glib::object::Object>> RTSPSessionExt for O {
 
 unsafe extern "C" fn notify_sessionid_trampoline<P>(this: *mut ffi::GstRTSPSession, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPSession> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPSession::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_timeout_trampoline<P>(this: *mut ffi::GstRTSPSession, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPSession> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPSession::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_timeout_always_visible_trampoline<P>(this: *mut ffi::GstRTSPSession, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPSession> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPSession::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs
index 7840a4d81..73be899af 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs
@@ -131,14 +131,12 @@ impl<O: IsA<RTSPSessionPool> + IsA<glib::object::Object>> RTSPSessionPoolExt for
 
 unsafe extern "C" fn session_removed_trampoline<P>(this: *mut ffi::GstRTSPSessionPool, object: *mut ffi::GstRTSPSession, f: glib_ffi::gpointer)
 where P: IsA<RTSPSessionPool> {
-    callback_guard!();
     let f: &&(Fn(&P, &RTSPSession) + Send + Sync + 'static) = transmute(f);
     f(&RTSPSessionPool::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn notify_max_sessions_trampoline<P>(this: *mut ffi::GstRTSPSessionPool, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPSessionPool> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPSessionPool::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs
index ff03f29e7..42d2f3386 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs
@@ -619,35 +619,30 @@ impl<O: IsA<RTSPStream> + IsA<glib::object::Object>> RTSPStreamExt for O {
 
 unsafe extern "C" fn new_rtcp_encoder_trampoline<P>(this: *mut ffi::GstRTSPStream, object: *mut gst_ffi::GstElement, f: glib_ffi::gpointer)
 where P: IsA<RTSPStream> {
-    callback_guard!();
     let f: &&(Fn(&P, &gst::Element) + Send + Sync + 'static) = transmute(f);
     f(&RTSPStream::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn new_rtp_encoder_trampoline<P>(this: *mut ffi::GstRTSPStream, object: *mut gst_ffi::GstElement, f: glib_ffi::gpointer)
 where P: IsA<RTSPStream> {
-    callback_guard!();
     let f: &&(Fn(&P, &gst::Element) + Send + Sync + 'static) = transmute(f);
     f(&RTSPStream::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn notify_control_trampoline<P>(this: *mut ffi::GstRTSPStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPStream> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPStream::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_profiles_trampoline<P>(this: *mut ffi::GstRTSPStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPStream> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPStream::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_protocols_trampoline<P>(this: *mut ffi::GstRTSPStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPStream> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPStream::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs
index f49eaf04f..d10e34efb 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs
@@ -87,7 +87,6 @@ impl<O: IsA<RTSPThreadPool> + IsA<glib::object::Object>> RTSPThreadPoolExt for O
 
 unsafe extern "C" fn notify_max_threads_trampoline<P>(this: *mut ffi::GstRTSPThreadPool, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RTSPThreadPool> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&RTSPThreadPool::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer-rtsp-server/src/auto/versions.txt
+++ b/gstreamer-rtsp-server/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer-rtsp/src/auto/versions.txt
+++ b/gstreamer-rtsp/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer-sdp/src/auto/versions.txt
+++ b/gstreamer-sdp/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer-video/src/auto/versions.txt
+++ b/gstreamer-video/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer-webrtc/src/auto/versions.txt
+++ b/gstreamer-webrtc/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs b/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs
index 51f9bdfec..5102e5493 100644
--- a/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs
+++ b/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs
@@ -168,43 +168,36 @@ unsafe impl Send for WebRTCDTLSTransport {}
 unsafe impl Sync for WebRTCDTLSTransport {}
 
 unsafe extern "C" fn notify_certificate_trampoline(this: *mut ffi::GstWebRTCDTLSTransport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCDTLSTransport) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_client_trampoline(this: *mut ffi::GstWebRTCDTLSTransport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCDTLSTransport) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_remote_certificate_trampoline(this: *mut ffi::GstWebRTCDTLSTransport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCDTLSTransport) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_rtcp_trampoline(this: *mut ffi::GstWebRTCDTLSTransport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCDTLSTransport) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_session_id_trampoline(this: *mut ffi::GstWebRTCDTLSTransport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCDTLSTransport) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_state_trampoline(this: *mut ffi::GstWebRTCDTLSTransport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCDTLSTransport) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_transport_trampoline(this: *mut ffi::GstWebRTCDTLSTransport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCDTLSTransport) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer-webrtc/src/auto/web_rtcice_transport.rs b/gstreamer-webrtc/src/auto/web_rtcice_transport.rs
index 388545d12..97bde0883 100644
--- a/gstreamer-webrtc/src/auto/web_rtcice_transport.rs
+++ b/gstreamer-webrtc/src/auto/web_rtcice_transport.rs
@@ -121,31 +121,26 @@ unsafe impl Send for WebRTCICETransport {}
 unsafe impl Sync for WebRTCICETransport {}
 
 unsafe extern "C" fn on_new_candidate_trampoline(this: *mut ffi::GstWebRTCICETransport, object: *mut libc::c_char, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCICETransport, &str) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this), &String::from_glib_none(object))
 }
 
 unsafe extern "C" fn on_selected_candidate_pair_change_trampoline(this: *mut ffi::GstWebRTCICETransport, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCICETransport) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_component_trampoline(this: *mut ffi::GstWebRTCICETransport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCICETransport) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_gathering_state_trampoline(this: *mut ffi::GstWebRTCICETransport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCICETransport) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_state_trampoline(this: *mut ffi::GstWebRTCICETransport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCICETransport) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer-webrtc/src/auto/web_rtcrtp_transceiver.rs b/gstreamer-webrtc/src/auto/web_rtcrtp_transceiver.rs
index 53beb0313..6ce7cb426 100644
--- a/gstreamer-webrtc/src/auto/web_rtcrtp_transceiver.rs
+++ b/gstreamer-webrtc/src/auto/web_rtcrtp_transceiver.rs
@@ -79,19 +79,16 @@ unsafe impl Send for WebRTCRTPTransceiver {}
 unsafe impl Sync for WebRTCRTPTransceiver {}
 
 unsafe extern "C" fn notify_mlineindex_trampoline(this: *mut ffi::GstWebRTCRTPTransceiver, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCRTPTransceiver) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_receiver_trampoline(this: *mut ffi::GstWebRTCRTPTransceiver, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCRTPTransceiver) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_sender_trampoline(this: *mut ffi::GstWebRTCRTPTransceiver, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&WebRTCRTPTransceiver) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer/src/auto/bin.rs b/gstreamer/src/auto/bin.rs
index d7098743e..b47c8c339 100644
--- a/gstreamer/src/auto/bin.rs
+++ b/gstreamer/src/auto/bin.rs
@@ -296,7 +296,6 @@ impl<O: IsA<Bin> + IsA<glib::object::Object>> BinExt for O {
 #[cfg(any(feature = "v1_10", feature = "dox"))]
 unsafe extern "C" fn deep_element_added_trampoline<P>(this: *mut ffi::GstBin, sub_bin: *mut ffi::GstBin, element: *mut ffi::GstElement, f: glib_ffi::gpointer)
 where P: IsA<Bin> {
-    callback_guard!();
     let f: &&(Fn(&P, &Bin, &Element) + Send + Sync + 'static) = transmute(f);
     f(&Bin::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(sub_bin), &from_glib_borrow(element))
 }
@@ -304,42 +303,36 @@ where P: IsA<Bin> {
 #[cfg(any(feature = "v1_10", feature = "dox"))]
 unsafe extern "C" fn deep_element_removed_trampoline<P>(this: *mut ffi::GstBin, sub_bin: *mut ffi::GstBin, element: *mut ffi::GstElement, f: glib_ffi::gpointer)
 where P: IsA<Bin> {
-    callback_guard!();
     let f: &&(Fn(&P, &Bin, &Element) + Send + Sync + 'static) = transmute(f);
     f(&Bin::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(sub_bin), &from_glib_borrow(element))
 }
 
 unsafe extern "C" fn do_latency_trampoline<P>(this: *mut ffi::GstBin, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Bin> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + Send + Sync + 'static) = transmute(f);
     f(&Bin::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn element_added_trampoline<P>(this: *mut ffi::GstBin, element: *mut ffi::GstElement, f: glib_ffi::gpointer)
 where P: IsA<Bin> {
-    callback_guard!();
     let f: &&(Fn(&P, &Element) + Send + Sync + 'static) = transmute(f);
     f(&Bin::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(element))
 }
 
 unsafe extern "C" fn element_removed_trampoline<P>(this: *mut ffi::GstBin, element: *mut ffi::GstElement, f: glib_ffi::gpointer)
 where P: IsA<Bin> {
-    callback_guard!();
     let f: &&(Fn(&P, &Element) + Send + Sync + 'static) = transmute(f);
     f(&Bin::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(element))
 }
 
 unsafe extern "C" fn notify_async_handling_trampoline<P>(this: *mut ffi::GstBin, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Bin> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Bin::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_message_forward_trampoline<P>(this: *mut ffi::GstBin, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Bin> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Bin::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer/src/auto/bus.rs b/gstreamer/src/auto/bus.rs
index 01e41be9a..c8f976e7a 100644
--- a/gstreamer/src/auto/bus.rs
+++ b/gstreamer/src/auto/bus.rs
@@ -159,19 +159,16 @@ unsafe impl Send for Bus {}
 unsafe impl Sync for Bus {}
 
 unsafe extern "C" fn message_trampoline(this: *mut ffi::GstBus, message: *mut ffi::GstMessage, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Bus, &Message) + Send + 'static) = transmute(f);
     f(&from_glib_borrow(this), &from_glib_borrow(message))
 }
 
 unsafe extern "C" fn sync_message_trampoline(this: *mut ffi::GstBus, message: *mut ffi::GstMessage, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Bus, &Message) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this), &from_glib_borrow(message))
 }
 
 unsafe extern "C" fn notify_enable_async_trampoline(this: *mut ffi::GstBus, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Bus) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer/src/auto/child_proxy.rs b/gstreamer/src/auto/child_proxy.rs
index 0d8ab7e9a..a5fb67cb1 100644
--- a/gstreamer/src/auto/child_proxy.rs
+++ b/gstreamer/src/auto/child_proxy.rs
@@ -136,14 +136,12 @@ impl<O: IsA<ChildProxy> + IsA<glib::object::Object>> ChildProxyExt for O {
 
 unsafe extern "C" fn child_added_trampoline<P>(this: *mut ffi::GstChildProxy, object: *mut gobject_ffi::GObject, name: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<ChildProxy> {
-    callback_guard!();
     let f: &&(Fn(&P, &glib::Object, &str) + Send + Sync + 'static) = transmute(f);
     f(&ChildProxy::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object), &String::from_glib_none(name))
 }
 
 unsafe extern "C" fn child_removed_trampoline<P>(this: *mut ffi::GstChildProxy, object: *mut gobject_ffi::GObject, name: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<ChildProxy> {
-    callback_guard!();
     let f: &&(Fn(&P, &glib::Object, &str) + Send + Sync + 'static) = transmute(f);
     f(&ChildProxy::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object), &String::from_glib_none(name))
 }
diff --git a/gstreamer/src/auto/clock.rs b/gstreamer/src/auto/clock.rs
index 9cd784476..d0ce888d4 100644
--- a/gstreamer/src/auto/clock.rs
+++ b/gstreamer/src/auto/clock.rs
@@ -318,28 +318,24 @@ impl<O: IsA<Clock> + IsA<glib::object::Object>> ClockExt for O {
 
 unsafe extern "C" fn synced_trampoline<P>(this: *mut ffi::GstClock, synced: glib_ffi::gboolean, f: glib_ffi::gpointer)
 where P: IsA<Clock> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) + Send + Sync + 'static) = transmute(f);
     f(&Clock::from_glib_borrow(this).downcast_unchecked(), from_glib(synced))
 }
 
 unsafe extern "C" fn notify_timeout_trampoline<P>(this: *mut ffi::GstClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Clock> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Clock::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_window_size_trampoline<P>(this: *mut ffi::GstClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Clock> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Clock::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_window_threshold_trampoline<P>(this: *mut ffi::GstClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Clock> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Clock::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer/src/auto/device.rs b/gstreamer/src/auto/device.rs
index a10ca5223..7604317d9 100644
--- a/gstreamer/src/auto/device.rs
+++ b/gstreamer/src/auto/device.rs
@@ -153,35 +153,30 @@ impl<O: IsA<Device> + IsA<glib::object::Object>> DeviceExt for O {
 
 unsafe extern "C" fn removed_trampoline<P>(this: *mut ffi::GstDevice, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_caps_trampoline<P>(this: *mut ffi::GstDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_device_class_trampoline<P>(this: *mut ffi::GstDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_display_name_trampoline<P>(this: *mut ffi::GstDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_properties_trampoline<P>(this: *mut ffi::GstDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer/src/auto/device_monitor.rs b/gstreamer/src/auto/device_monitor.rs
index 848f49d2c..e00170479 100644
--- a/gstreamer/src/auto/device_monitor.rs
+++ b/gstreamer/src/auto/device_monitor.rs
@@ -143,7 +143,6 @@ impl<O: IsA<DeviceMonitor> + IsA<glib::object::Object>> DeviceMonitorExt for O {
 
 unsafe extern "C" fn notify_show_all_trampoline<P>(this: *mut ffi::GstDeviceMonitor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<DeviceMonitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&DeviceMonitor::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer/src/auto/device_provider.rs b/gstreamer/src/auto/device_provider.rs
index 1add826ef..01fdf1457 100644
--- a/gstreamer/src/auto/device_provider.rs
+++ b/gstreamer/src/auto/device_provider.rs
@@ -158,14 +158,12 @@ impl<O: IsA<DeviceProvider> + IsA<glib::object::Object>> DeviceProviderExt for O
 
 unsafe extern "C" fn provider_hidden_trampoline<P>(this: *mut ffi::GstDeviceProvider, object: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<DeviceProvider> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + Send + Sync + 'static) = transmute(f);
     f(&DeviceProvider::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(object))
 }
 
 unsafe extern "C" fn provider_unhidden_trampoline<P>(this: *mut ffi::GstDeviceProvider, object: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<DeviceProvider> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + Send + Sync + 'static) = transmute(f);
     f(&DeviceProvider::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(object))
 }
diff --git a/gstreamer/src/auto/element.rs b/gstreamer/src/auto/element.rs
index 0595b4825..09b67bc7f 100644
--- a/gstreamer/src/auto/element.rs
+++ b/gstreamer/src/auto/element.rs
@@ -527,21 +527,18 @@ impl<O: IsA<Element> + IsA<glib::object::Object>> ElementExt for O {
 
 unsafe extern "C" fn no_more_pads_trampoline<P>(this: *mut ffi::GstElement, f: glib_ffi::gpointer)
 where P: IsA<Element> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Element::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn pad_added_trampoline<P>(this: *mut ffi::GstElement, new_pad: *mut ffi::GstPad, f: glib_ffi::gpointer)
 where P: IsA<Element> {
-    callback_guard!();
     let f: &&(Fn(&P, &Pad) + Send + Sync + 'static) = transmute(f);
     f(&Element::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(new_pad))
 }
 
 unsafe extern "C" fn pad_removed_trampoline<P>(this: *mut ffi::GstElement, old_pad: *mut ffi::GstPad, f: glib_ffi::gpointer)
 where P: IsA<Element> {
-    callback_guard!();
     let f: &&(Fn(&P, &Pad) + Send + Sync + 'static) = transmute(f);
     f(&Element::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(old_pad))
 }
diff --git a/gstreamer/src/auto/object.rs b/gstreamer/src/auto/object.rs
index 459aa7a0a..dab86191c 100644
--- a/gstreamer/src/auto/object.rs
+++ b/gstreamer/src/auto/object.rs
@@ -256,14 +256,12 @@ impl<O: IsA<Object> + IsA<glib::object::Object>> GstObjectExt for O {
 
 unsafe extern "C" fn notify_name_trampoline<P>(this: *mut ffi::GstObject, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Object> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Object::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_parent_trampoline<P>(this: *mut ffi::GstObject, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Object> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Object::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer/src/auto/pad.rs b/gstreamer/src/auto/pad.rs
index da0475ec5..5519e0dce 100644
--- a/gstreamer/src/auto/pad.rs
+++ b/gstreamer/src/auto/pad.rs
@@ -610,42 +610,36 @@ impl<O: IsA<Pad> + IsA<glib::object::Object>> PadExt for O {
 
 unsafe extern "C" fn linked_trampoline<P>(this: *mut ffi::GstPad, peer: *mut ffi::GstPad, f: glib_ffi::gpointer)
 where P: IsA<Pad> {
-    callback_guard!();
     let f: &&(Fn(&P, &Pad) + Send + Sync + 'static) = transmute(f);
     f(&Pad::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(peer))
 }
 
 unsafe extern "C" fn unlinked_trampoline<P>(this: *mut ffi::GstPad, peer: *mut ffi::GstPad, f: glib_ffi::gpointer)
 where P: IsA<Pad> {
-    callback_guard!();
     let f: &&(Fn(&P, &Pad) + Send + Sync + 'static) = transmute(f);
     f(&Pad::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(peer))
 }
 
 unsafe extern "C" fn notify_caps_trampoline<P>(this: *mut ffi::GstPad, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pad> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Pad::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_direction_trampoline<P>(this: *mut ffi::GstPad, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pad> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Pad::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_offset_trampoline<P>(this: *mut ffi::GstPad, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pad> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Pad::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_template_trampoline<P>(this: *mut ffi::GstPad, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pad> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Pad::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer/src/auto/pad_template.rs b/gstreamer/src/auto/pad_template.rs
index e64d5e2d9..600833afa 100644
--- a/gstreamer/src/auto/pad_template.rs
+++ b/gstreamer/src/auto/pad_template.rs
@@ -146,38 +146,32 @@ unsafe impl Send for PadTemplate {}
 unsafe impl Sync for PadTemplate {}
 
 unsafe extern "C" fn pad_created_trampoline(this: *mut ffi::GstPadTemplate, pad: *mut ffi::GstPad, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PadTemplate, &Pad) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this), &from_glib_borrow(pad))
 }
 
 unsafe extern "C" fn notify_caps_trampoline(this: *mut ffi::GstPadTemplate, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PadTemplate) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_direction_trampoline(this: *mut ffi::GstPadTemplate, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PadTemplate) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 #[cfg(any(feature = "v1_14", feature = "dox"))]
 unsafe extern "C" fn notify_gtype_trampoline(this: *mut ffi::GstPadTemplate, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PadTemplate) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_name_template_trampoline(this: *mut ffi::GstPadTemplate, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PadTemplate) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_presence_trampoline(this: *mut ffi::GstPadTemplate, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&PadTemplate) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer/src/auto/pipeline.rs b/gstreamer/src/auto/pipeline.rs
index 692af5123..cbcb64b5e 100644
--- a/gstreamer/src/auto/pipeline.rs
+++ b/gstreamer/src/auto/pipeline.rs
@@ -154,21 +154,18 @@ impl<O: IsA<Pipeline> + IsA<glib::object::Object>> PipelineExt for O {
 
 unsafe extern "C" fn notify_auto_flush_bus_trampoline<P>(this: *mut ffi::GstPipeline, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pipeline> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Pipeline::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_delay_trampoline<P>(this: *mut ffi::GstPipeline, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pipeline> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Pipeline::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_latency_trampoline<P>(this: *mut ffi::GstPipeline, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pipeline> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&Pipeline::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer/src/auto/registry.rs b/gstreamer/src/auto/registry.rs
index 8fc355fc5..aa0917c53 100644
--- a/gstreamer/src/auto/registry.rs
+++ b/gstreamer/src/auto/registry.rs
@@ -148,13 +148,11 @@ unsafe impl Send for Registry {}
 unsafe impl Sync for Registry {}
 
 unsafe extern "C" fn feature_added_trampoline(this: *mut ffi::GstRegistry, feature: *mut ffi::GstPluginFeature, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Registry, &PluginFeature) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this), &from_glib_borrow(feature))
 }
 
 unsafe extern "C" fn plugin_added_trampoline(this: *mut ffi::GstRegistry, plugin: *mut ffi::GstPlugin, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Registry, &Plugin) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this), &from_glib_borrow(plugin))
 }
diff --git a/gstreamer/src/auto/stream.rs b/gstreamer/src/auto/stream.rs
index d6e0b68b0..52f7973b0 100644
--- a/gstreamer/src/auto/stream.rs
+++ b/gstreamer/src/auto/stream.rs
@@ -205,31 +205,26 @@ unsafe impl Send for Stream {}
 unsafe impl Sync for Stream {}
 
 unsafe extern "C" fn notify_caps_trampoline(this: *mut ffi::GstStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Stream) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_stream_flags_trampoline(this: *mut ffi::GstStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Stream) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_stream_id_trampoline(this: *mut ffi::GstStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Stream) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_stream_type_trampoline(this: *mut ffi::GstStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Stream) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_tags_trampoline(this: *mut ffi::GstStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Stream) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer/src/auto/stream_collection.rs b/gstreamer/src/auto/stream_collection.rs
index f9836f01e..b8e32e729 100644
--- a/gstreamer/src/auto/stream_collection.rs
+++ b/gstreamer/src/auto/stream_collection.rs
@@ -86,7 +86,6 @@ unsafe impl Send for StreamCollection {}
 unsafe impl Sync for StreamCollection {}
 
 unsafe extern "C" fn notify_upstream_id_trampoline(this: *mut ffi::GstStreamCollection, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&StreamCollection) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/gstreamer/src/auto/system_clock.rs b/gstreamer/src/auto/system_clock.rs
index db6cf34a9..a300fdd79 100644
--- a/gstreamer/src/auto/system_clock.rs
+++ b/gstreamer/src/auto/system_clock.rs
@@ -84,7 +84,6 @@ impl<O: IsA<SystemClock> + IsA<glib::object::Object>> SystemClockExt for O {
 
 unsafe extern "C" fn notify_clock_type_trampoline<P>(this: *mut ffi::GstSystemClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SystemClock> {
-    callback_guard!();
     let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f);
     f(&SystemClock::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt
index 980fc12b3..75e89a5e7 100644
--- a/gstreamer/src/auto/versions.txt
+++ b/gstreamer/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1825132)
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)