gtk-rs · GuillaumeGomez · Mar 2, 2018 · Mar 2, 2018
diff --git a/gir b/gir
diff --git a/src/auto/enums.rs b/src/auto/enums.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ fbb95f4)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

diff --git a/src/auto/flags.rs b/src/auto/flags.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ fbb95f4)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

diff --git a/src/auto/mod.rs b/src/auto/mod.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ fbb95f4)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

diff --git a/src/auto/pixbuf.rs b/src/auto/pixbuf.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ fbb95f4)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
@@ -513,54 +513,63 @@ impl<O: IsA<Pixbuf> + IsA<glib::object::Object>> PixbufExt for O {
 
 unsafe extern "C" fn notify_bits_per_sample_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pixbuf> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_colorspace_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pixbuf> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_alpha_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pixbuf> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_height_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pixbuf> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_n_channels_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pixbuf> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixel_bytes_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pixbuf> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixels_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pixbuf> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_rowstride_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pixbuf> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_width_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Pixbuf> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/pixbuf_format.rs b/src/auto/pixbuf_format.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ fbb95f4)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

diff --git a/src/auto/pixbuf_loader.rs b/src/auto/pixbuf_loader.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ fbb95f4)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
@@ -170,24 +170,28 @@ impl<O: IsA<PixbufLoader> + IsA<glib::object::Object>> PixbufLoaderExt for O {
 
 unsafe extern "C" fn area_prepared_trampoline<P>(this: *mut ffi::GdkPixbufLoader, f: glib_ffi::gpointer)
 where P: IsA<PixbufLoader> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PixbufLoader::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn area_updated_trampoline<P>(this: *mut ffi::GdkPixbufLoader, x: libc::c_int, y: libc::c_int, width: libc::c_int, height: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<PixbufLoader> {
+    callback_guard!();
     let f: &&(Fn(&P, i32, i32, i32, i32) + 'static) = transmute(f);
     f(&PixbufLoader::from_glib_borrow(this).downcast_unchecked(), x, y, width, height)
 }
 
 unsafe extern "C" fn closed_trampoline<P>(this: *mut ffi::GdkPixbufLoader, f: glib_ffi::gpointer)
 where P: IsA<PixbufLoader> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PixbufLoader::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn size_prepared_trampoline<P>(this: *mut ffi::GdkPixbufLoader, width: libc::c_int, height: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<PixbufLoader> {
+    callback_guard!();
     let f: &&(Fn(&P, i32, i32) + 'static) = transmute(f);
     f(&PixbufLoader::from_glib_borrow(this).downcast_unchecked(), width, height)
 }
diff --git a/src/auto/pixbuf_simple_anim.rs b/src/auto/pixbuf_simple_anim.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ fbb95f4)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
@@ -74,6 +74,7 @@ impl<O: IsA<PixbufSimpleAnim> + IsA<glib::object::Object>> PixbufSimpleAnimExt f
 
 unsafe extern "C" fn notify_loop_trampoline<P>(this: *mut ffi::GdkPixbufSimpleAnim, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PixbufSimpleAnim> {
+    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PixbufSimpleAnim::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -24,6 +24,9 @@ pub use glib::{
     Value,
 };
 
+#[macro_use]
+mod rt;
+
 mod auto;
 
 mod animation;

diff --git a/src/pixbuf.rs b/src/pixbuf.rs
@@ -104,6 +104,7 @@ impl Pixbuf {
         let user_data: Box<Box<R>> = Box::new(Box::new(callback));
         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)
         {
+            callback_guard!();
             let mut error = ptr::null_mut();
             let ptr = ffi::gdk_pixbuf_new_from_stream_finish(res, &mut error);
             let result = if error.is_null() {
@@ -126,6 +127,7 @@ impl Pixbuf {
         let user_data: Box<Box<R>> = Box::new(Box::new(callback));
         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)
         {
+            callback_guard!();
             let mut error = ptr::null_mut();
             let ptr = ffi::gdk_pixbuf_new_from_stream_finish(res, &mut error);
             let result = if error.is_null() {
@@ -185,6 +187,7 @@ impl Pixbuf {
         let user_data: Box<Box<Q>> = Box::new(Box::new(callback));
         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)
         {
+            callback_guard!();
             let mut error = ptr::null_mut();
             let mut width = mem::uninitialized();
             let mut height = mem::uninitialized();

diff --git a/src/rt.rs b/src/rt.rs
@@ -0,0 +1,17 @@
+// Copyright 2013-2017, The Gtk-rs Project Developers.
+// See the COPYRIGHT file at the top-level directory of this distribution.
+// Licensed under the MIT license, see the LICENSE file or <http://opensource.org/licenses/MIT>
+
+
+macro_rules! assert_initialized_main_thread {
+    () => ()
+}
+
+macro_rules! callback_guard {
+    () => (
+        let _guard = ::glib::CallbackGuard::new();
+        if cfg!(debug_assertions) {
+            assert_initialized_main_thread!();
+        }
+    )
+}
+14 −0		README.md
+7 −2		src/analysis/bounds.rs
+69 −0		src/analysis/constants.rs
+3 −0		src/analysis/conversion_type.rs
+22 −7		src/analysis/functions.rs
+24 −0		src/analysis/mod.rs
+1 −1		src/analysis/out_parameters.rs
+3 −3		src/analysis/record_type.rs
+4 −4		src/analysis/ref_mode.rs
+3 −0		src/analysis/rust_type.rs
+2 −0		src/analysis/types.rs
+57 −0		src/codegen/constants.rs
+26 −3		src/codegen/function_body_chunk.rs
+2 −0		src/codegen/mod.rs
+1 −0		src/codegen/sys/build.rs
+1 −0		src/codegen/trampoline.rs
+58 −0		src/config/constants.rs
+6 −0		src/config/gobjects.rs
+1 −0		src/config/mod.rs
+54 −0		src/custom_type_glib_priority.rs
+11 −0		src/library.rs
+8 −0		src/library_preprocessing.rs
+9 −1		src/main.rs
+44 −0		src/visitors.rs
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,9 @@ pub use glib::{ @@
         Value,
     };
+    #[macro_use]
+    mod rt;
     mod auto;
     mod animation;
@@ Expand Down @@