Skip to content
This repository was archived by the owner on Jun 8, 2021. It is now read-only.

Commit 1462bd8

Browse files
committed
Remove missed callback_guard
1 parent a3f067b commit 1462bd8

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

src/pixbuf.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ impl Pixbuf {
104104
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
105105
unsafe extern "C" fn new_from_stream_async_trampoline<R: FnOnce(Result<Pixbuf, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
106106
{
107-
callback_guard!();
108107
let mut error = ptr::null_mut();
109108
let ptr = ffi::gdk_pixbuf_new_from_stream_finish(res, &mut error);
110109
let result = if error.is_null() {
@@ -127,7 +126,6 @@ impl Pixbuf {
127126
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
128127
unsafe extern "C" fn new_from_stream_at_scale_async_trampoline<R: FnOnce(Result<Pixbuf, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
129128
{
130-
callback_guard!();
131129
let mut error = ptr::null_mut();
132130
let ptr = ffi::gdk_pixbuf_new_from_stream_finish(res, &mut error);
133131
let result = if error.is_null() {
@@ -187,7 +185,6 @@ impl Pixbuf {
187185
let user_data: Box<Box<Q>> = Box::new(Box::new(callback));
188186
unsafe extern "C" fn get_file_info_async_trampoline<Q: FnOnce(Result<Option<(PixbufFormat, i32, i32)>, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
189187
{
190-
callback_guard!();
191188
let mut error = ptr::null_mut();
192189
let mut width = mem::uninitialized();
193190
let mut height = mem::uninitialized();

src/rt.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,3 @@
66
macro_rules! assert_initialized_main_thread {
77
() => ()
88
}
9-
10-
macro_rules! callback_guard {
11-
() => (
12-
let _guard = ::glib::CallbackGuard::new();
13-
if cfg!(debug_assertions) {
14-
assert_initialized_main_thread!();
15-
}
16-
)
17-
}

0 commit comments

Comments
 (0)