Skip to content

Commit d523527

Browse files
GuillaumeGomezGuillaumeGomez
authored
Merge pull request gtk-rs#84 from EPashkin/regen
Remove callback_guard
2 parents 4f892d2 + 86c78b8 commit d523527

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+137
-257
lines changed

‎gir

Submodule gir updated 52 files

‎gir-files

‎src/application.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ impl<O: IsA<Application> + IsA<glib::object::Object>> ApplicationExtManual for O
3636
#[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))]
3737
unsafe extern "C" fn open_trampoline<P>(this: *mut ffi::GApplication, files: *const *mut ffi::GFile, n_files: libc::c_int, hint: *mut libc::c_char, f: glib_ffi::gpointer)
3838
where P: IsA<Application> {
39-
callback_guard!();
4039
let f: &&(Fn(&P, &[File], &str) + 'static) = transmute(f);
4140
let files: Vec<File> = FromGlibContainer::from_glib_none_num(files, n_files as usize);
4241
f(&Application::from_glib_none(this).downcast_unchecked(), &files, &String::from_glib_none(hint))

‎src/auto/action.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// This file was generated by gir (746446b) from gir-files (469db10)
1+
// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
2+
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
23
// DO NOT EDIT
34

45
#[cfg(any(feature = "v2_38", feature = "dox"))]
@@ -176,35 +177,30 @@ impl<O: IsA<Action> + IsA<glib::object::Object>> ActionExt for O {
176177

177178
unsafe extern "C" fn notify_enabled_trampoline<P>(this: *mut ffi::GAction, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
178179
where P: IsA<Action> {
179-
callback_guard!();
180180
let f: &&(Fn(&P) + 'static) = transmute(f);
181181
f(&Action::from_glib_borrow(this).downcast_unchecked())
182182
}
183183

184184
unsafe extern "C" fn notify_name_trampoline<P>(this: *mut ffi::GAction, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
185185
where P: IsA<Action> {
186-
callback_guard!();
187186
let f: &&(Fn(&P) + 'static) = transmute(f);
188187
f(&Action::from_glib_borrow(this).downcast_unchecked())
189188
}
190189

191190
unsafe extern "C" fn notify_parameter_type_trampoline<P>(this: *mut ffi::GAction, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
192191
where P: IsA<Action> {
193-
callback_guard!();
194192
let f: &&(Fn(&P) + 'static) = transmute(f);
195193
f(&Action::from_glib_borrow(this).downcast_unchecked())
196194
}
197195

198196
unsafe extern "C" fn notify_state_trampoline<P>(this: *mut ffi::GAction, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
199197
where P: IsA<Action> {
200-
callback_guard!();
201198
let f: &&(Fn(&P) + 'static) = transmute(f);
202199
f(&Action::from_glib_borrow(this).downcast_unchecked())
203200
}
204201

205202
unsafe extern "C" fn notify_state_type_trampoline<P>(this: *mut ffi::GAction, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
206203
where P: IsA<Action> {
207-
callback_guard!();
208204
let f: &&(Fn(&P) + 'static) = transmute(f);
209205
f(&Action::from_glib_borrow(this).downcast_unchecked())
210206
}

‎src/auto/action_group.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// This file was generated by gir (746446b) from gir-files (469db10)
1+
// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
2+
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
23
// DO NOT EDIT
34

45
use ffi;
@@ -176,28 +177,24 @@ impl<O: IsA<ActionGroup> + IsA<glib::object::Object>> ActionGroupExt for O {
176177

177178
unsafe extern "C" fn action_added_trampoline<P>(this: *mut ffi::GActionGroup, action_name: *mut libc::c_char, f: glib_ffi::gpointer)
178179
where P: IsA<ActionGroup> {
179-
callback_guard!();
180180
let f: &&(Fn(&P, &str) + 'static) = transmute(f);
181181
f(&ActionGroup::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(action_name))
182182
}
183183

184184
unsafe extern "C" fn action_enabled_changed_trampoline<P>(this: *mut ffi::GActionGroup, action_name: *mut libc::c_char, enabled: glib_ffi::gboolean, f: glib_ffi::gpointer)
185185
where P: IsA<ActionGroup> {
186-
callback_guard!();
187186
let f: &&(Fn(&P, &str, bool) + 'static) = transmute(f);
188187
f(&ActionGroup::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(action_name), from_glib(enabled))
189188
}
190189

191190
unsafe extern "C" fn action_removed_trampoline<P>(this: *mut ffi::GActionGroup, action_name: *mut libc::c_char, f: glib_ffi::gpointer)
192191
where P: IsA<ActionGroup> {
193-
callback_guard!();
194192
let f: &&(Fn(&P, &str) + 'static) = transmute(f);
195193
f(&ActionGroup::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(action_name))
196194
}
197195

198196
unsafe extern "C" fn action_state_changed_trampoline<P>(this: *mut ffi::GActionGroup, action_name: *mut libc::c_char, value: *mut glib_ffi::GVariant, f: glib_ffi::gpointer)
199197
where P: IsA<ActionGroup> {
200-
callback_guard!();
201198
let f: &&(Fn(&P, &str, &glib::Variant) + 'static) = transmute(f);
202199
f(&ActionGroup::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(action_name), &from_glib_borrow(value))
203200
}

‎src/auto/action_map.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// This file was generated by gir (746446b) from gir-files (469db10)
1+
// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
2+
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
23
// DO NOT EDIT
34

45
use Action;

‎src/auto/app_info.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// This file was generated by gir (746446b) from gir-files (469db10)
1+
// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
2+
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
23
// DO NOT EDIT
34

45
use AppInfoCreateFlags;
@@ -89,7 +90,6 @@ impl AppInfo {
8990
let user_data: Box<Box<Q>> = Box::new(Box::new(callback));
9091
unsafe extern "C" fn launch_default_for_uri_async_trampoline<Q: FnOnce(Result<(), Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut ffi::GAsyncResult, user_data: glib_ffi::gpointer)
9192
{
92-
callback_guard!();
9393
let mut error = ptr::null_mut();
9494
let _ = ffi::g_app_info_launch_default_for_uri_finish(res, &mut error);
9595
let result = if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) };

‎src/auto/app_launch_context.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// This file was generated by gir (746446b) from gir-files (469db10)
1+
// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
2+
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
23
// DO NOT EDIT
34

45
use AppInfo;
@@ -125,15 +126,13 @@ impl<O: IsA<AppLaunchContext> + IsA<glib::object::Object>> AppLaunchContextExt f
125126
#[cfg(any(feature = "v2_36", feature = "dox"))]
126127
unsafe extern "C" fn launch_failed_trampoline<P>(this: *mut ffi::GAppLaunchContext, startup_notify_id: *mut libc::c_char, f: glib_ffi::gpointer)
127128
where P: IsA<AppLaunchContext> {
128-
callback_guard!();
129129
let f: &&(Fn(&P, &str) + 'static) = transmute(f);
130130
f(&AppLaunchContext::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(startup_notify_id))
131131
}
132132

133133
#[cfg(any(feature = "v2_36", feature = "dox"))]
134134
unsafe extern "C" fn launched_trampoline<P>(this: *mut ffi::GAppLaunchContext, info: *mut ffi::GAppInfo, platform_data: *mut glib_ffi::GVariant, f: glib_ffi::gpointer)
135135
where P: IsA<AppLaunchContext> {
136-
callback_guard!();
137136
let f: &&(Fn(&P, &AppInfo, &glib::Variant) + 'static) = transmute(f);
138137
f(&AppLaunchContext::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(info), &from_glib_borrow(platform_data))
139138
}

‎src/auto/application.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// This file was generated by gir (746446b) from gir-files (469db10)
1+
// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
2+
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
23
// DO NOT EDIT
34

45
use ActionGroup;
@@ -479,78 +480,67 @@ impl<O: IsA<Application> + IsA<glib::object::Object>> ApplicationExt for O {
479480

480481
unsafe extern "C" fn activate_trampoline<P>(this: *mut ffi::GApplication, f: glib_ffi::gpointer)
481482
where P: IsA<Application> {
482-
callback_guard!();
483483
let f: &&(Fn(&P) + 'static) = transmute(f);
484484
f(&Application::from_glib_borrow(this).downcast_unchecked())
485485
}
486486

487487
unsafe extern "C" fn shutdown_trampoline<P>(this: *mut ffi::GApplication, f: glib_ffi::gpointer)
488488
where P: IsA<Application> {
489-
callback_guard!();
490489
let f: &&(Fn(&P) + 'static) = transmute(f);
491490
f(&Application::from_glib_borrow(this).downcast_unchecked())
492491
}
493492

494493
unsafe extern "C" fn startup_trampoline<P>(this: *mut ffi::GApplication, f: glib_ffi::gpointer)
495494
where P: IsA<Application> {
496-
callback_guard!();
497495
let f: &&(Fn(&P) + 'static) = transmute(f);
498496
f(&Application::from_glib_borrow(this).downcast_unchecked())
499497
}
500498

501499
unsafe extern "C" fn notify_action_group_trampoline<P>(this: *mut ffi::GApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
502500
where P: IsA<Application> {
503-
callback_guard!();
504501
let f: &&(Fn(&P) + 'static) = transmute(f);
505502
f(&Application::from_glib_borrow(this).downcast_unchecked())
506503
}
507504

508505
unsafe extern "C" fn notify_application_id_trampoline<P>(this: *mut ffi::GApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
509506
where P: IsA<Application> {
510-
callback_guard!();
511507
let f: &&(Fn(&P) + 'static) = transmute(f);
512508
f(&Application::from_glib_borrow(this).downcast_unchecked())
513509
}
514510

515511
unsafe extern "C" fn notify_flags_trampoline<P>(this: *mut ffi::GApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
516512
where P: IsA<Application> {
517-
callback_guard!();
518513
let f: &&(Fn(&P) + 'static) = transmute(f);
519514
f(&Application::from_glib_borrow(this).downcast_unchecked())
520515
}
521516

522517
unsafe extern "C" fn notify_inactivity_timeout_trampoline<P>(this: *mut ffi::GApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
523518
where P: IsA<Application> {
524-
callback_guard!();
525519
let f: &&(Fn(&P) + 'static) = transmute(f);
526520
f(&Application::from_glib_borrow(this).downcast_unchecked())
527521
}
528522

529523
#[cfg(any(feature = "v2_44", feature = "dox"))]
530524
unsafe extern "C" fn notify_is_busy_trampoline<P>(this: *mut ffi::GApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
531525
where P: IsA<Application> {
532-
callback_guard!();
533526
let f: &&(Fn(&P) + 'static) = transmute(f);
534527
f(&Application::from_glib_borrow(this).downcast_unchecked())
535528
}
536529

537530
unsafe extern "C" fn notify_is_registered_trampoline<P>(this: *mut ffi::GApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
538531
where P: IsA<Application> {
539-
callback_guard!();
540532
let f: &&(Fn(&P) + 'static) = transmute(f);
541533
f(&Application::from_glib_borrow(this).downcast_unchecked())
542534
}
543535

544536
unsafe extern "C" fn notify_is_remote_trampoline<P>(this: *mut ffi::GApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
545537
where P: IsA<Application> {
546-
callback_guard!();
547538
let f: &&(Fn(&P) + 'static) = transmute(f);
548539
f(&Application::from_glib_borrow(this).downcast_unchecked())
549540
}
550541

551542
unsafe extern "C" fn notify_resource_base_path_trampoline<P>(this: *mut ffi::GApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
552543
where P: IsA<Application> {
553-
callback_guard!();
554544
let f: &&(Fn(&P) + 'static) = transmute(f);
555545
f(&Application::from_glib_borrow(this).downcast_unchecked())
556546
}

‎src/auto/buffered_input_stream.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// This file was generated by gir (746446b) from gir-files (469db10)
1+
// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
2+
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
23
// DO NOT EDIT
34

45
use Cancellable;
@@ -115,7 +116,6 @@ impl<O: IsA<BufferedInputStream> + IsA<glib::object::Object>> BufferedInputStrea
115116

116117
unsafe extern "C" fn notify_buffer_size_trampoline<P>(this: *mut ffi::GBufferedInputStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
117118
where P: IsA<BufferedInputStream> {
118-
callback_guard!();
119119
let f: &&(Fn(&P) + 'static) = transmute(f);
120120
f(&BufferedInputStream::from_glib_borrow(this).downcast_unchecked())
121121
}

0 commit comments

Comments
 (0)