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

Commit ac4653d

Browse files
GuillaumeGomezGuillaumeGomez
authored
Merge pull request #207 from EPashkin/regen
Regen
2 parents f30e683 + ad66ac0 commit ac4653d

24 files changed

+58
-117
lines changed

‎Gir.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ generate = [
5656

5757
manual = [
5858
"Gdk.Atom",
59-
"Gdk.Atom_",
6059
"Gdk.EventButton",
6160
"Gdk.EventConfigure",
6261
"Gdk.EventCrossing",

‎gir‎

Submodule gir updated 37 files

‎src/auto/app_launch_context.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 (0f1d1c1) from gir-files (77d1f70)
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 Display;
@@ -124,7 +125,6 @@ impl<O: IsA<AppLaunchContext> + IsA<glib::object::Object>> AppLaunchContextExt f
124125

125126
unsafe extern "C" fn notify_display_trampoline<P>(this: *mut ffi::GdkAppLaunchContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
126127
where P: IsA<AppLaunchContext> {
127-
callback_guard!();
128128
let f: &&(Fn(&P) + 'static) = transmute(f);
129129
f(&AppLaunchContext::from_glib_borrow(this).downcast_unchecked())
130130
}

‎src/auto/cursor.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 (0f1d1c1) from gir-files (77d1f70)
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 CursorType;
@@ -130,14 +131,12 @@ impl<O: IsA<Cursor> + IsA<glib::object::Object>> CursorExt for O {
130131

131132
unsafe extern "C" fn notify_cursor_type_trampoline<P>(this: *mut ffi::GdkCursor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
132133
where P: IsA<Cursor> {
133-
callback_guard!();
134134
let f: &&(Fn(&P) + 'static) = transmute(f);
135135
f(&Cursor::from_glib_borrow(this).downcast_unchecked())
136136
}
137137

138138
unsafe extern "C" fn notify_display_trampoline<P>(this: *mut ffi::GdkCursor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
139139
where P: IsA<Cursor> {
140-
callback_guard!();
141140
let f: &&(Fn(&P) + 'static) = transmute(f);
142141
f(&Cursor::from_glib_borrow(this).downcast_unchecked())
143142
}

‎src/auto/device.rs‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
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 Atom;
@@ -615,126 +616,109 @@ impl<O: IsA<Device> + IsA<glib::object::Object>> DeviceExt for O {
615616

616617
unsafe extern "C" fn changed_trampoline<P>(this: *mut ffi::GdkDevice, f: glib_ffi::gpointer)
617618
where P: IsA<Device> {
618-
callback_guard!();
619619
let f: &&(Fn(&P) + 'static) = transmute(f);
620620
f(&Device::from_glib_borrow(this).downcast_unchecked())
621621
}
622622

623623
#[cfg(any(feature = "v3_22", feature = "dox"))]
624624
unsafe extern "C" fn tool_changed_trampoline<P>(this: *mut ffi::GdkDevice, tool: *mut ffi::GdkDeviceTool, f: glib_ffi::gpointer)
625625
where P: IsA<Device> {
626-
callback_guard!();
627626
let f: &&(Fn(&P, &DeviceTool) + 'static) = transmute(f);
628627
f(&Device::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(tool))
629628
}
630629

631630
unsafe extern "C" fn notify_associated_device_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
632631
where P: IsA<Device> {
633-
callback_guard!();
634632
let f: &&(Fn(&P) + 'static) = transmute(f);
635633
f(&Device::from_glib_borrow(this).downcast_unchecked())
636634
}
637635

638636
#[cfg(any(feature = "v3_22", feature = "dox"))]
639637
unsafe extern "C" fn notify_axes_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
640638
where P: IsA<Device> {
641-
callback_guard!();
642639
let f: &&(Fn(&P) + 'static) = transmute(f);
643640
f(&Device::from_glib_borrow(this).downcast_unchecked())
644641
}
645642

646643
unsafe extern "C" fn notify_device_manager_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
647644
where P: IsA<Device> {
648-
callback_guard!();
649645
let f: &&(Fn(&P) + 'static) = transmute(f);
650646
f(&Device::from_glib_borrow(this).downcast_unchecked())
651647
}
652648

653649
unsafe extern "C" fn notify_display_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
654650
where P: IsA<Device> {
655-
callback_guard!();
656651
let f: &&(Fn(&P) + 'static) = transmute(f);
657652
f(&Device::from_glib_borrow(this).downcast_unchecked())
658653
}
659654

660655
unsafe extern "C" fn notify_has_cursor_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
661656
where P: IsA<Device> {
662-
callback_guard!();
663657
let f: &&(Fn(&P) + 'static) = transmute(f);
664658
f(&Device::from_glib_borrow(this).downcast_unchecked())
665659
}
666660

667661
unsafe extern "C" fn notify_input_mode_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
668662
where P: IsA<Device> {
669-
callback_guard!();
670663
let f: &&(Fn(&P) + 'static) = transmute(f);
671664
f(&Device::from_glib_borrow(this).downcast_unchecked())
672665
}
673666

674667
unsafe extern "C" fn notify_input_source_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
675668
where P: IsA<Device> {
676-
callback_guard!();
677669
let f: &&(Fn(&P) + 'static) = transmute(f);
678670
f(&Device::from_glib_borrow(this).downcast_unchecked())
679671
}
680672

681673
unsafe extern "C" fn notify_n_axes_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
682674
where P: IsA<Device> {
683-
callback_guard!();
684675
let f: &&(Fn(&P) + 'static) = transmute(f);
685676
f(&Device::from_glib_borrow(this).downcast_unchecked())
686677
}
687678

688679
unsafe extern "C" fn notify_name_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
689680
where P: IsA<Device> {
690-
callback_guard!();
691681
let f: &&(Fn(&P) + 'static) = transmute(f);
692682
f(&Device::from_glib_borrow(this).downcast_unchecked())
693683
}
694684

695685
#[cfg(any(feature = "v3_20", feature = "dox"))]
696686
unsafe extern "C" fn notify_num_touches_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
697687
where P: IsA<Device> {
698-
callback_guard!();
699688
let f: &&(Fn(&P) + 'static) = transmute(f);
700689
f(&Device::from_glib_borrow(this).downcast_unchecked())
701690
}
702691

703692
#[cfg(any(feature = "v3_16", feature = "dox"))]
704693
unsafe extern "C" fn notify_product_id_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
705694
where P: IsA<Device> {
706-
callback_guard!();
707695
let f: &&(Fn(&P) + 'static) = transmute(f);
708696
f(&Device::from_glib_borrow(this).downcast_unchecked())
709697
}
710698

711699
#[cfg(any(feature = "v3_20", feature = "dox"))]
712700
unsafe extern "C" fn notify_seat_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
713701
where P: IsA<Device> {
714-
callback_guard!();
715702
let f: &&(Fn(&P) + 'static) = transmute(f);
716703
f(&Device::from_glib_borrow(this).downcast_unchecked())
717704
}
718705

719706
#[cfg(any(feature = "v3_22", feature = "dox"))]
720707
unsafe extern "C" fn notify_tool_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
721708
where P: IsA<Device> {
722-
callback_guard!();
723709
let f: &&(Fn(&P) + 'static) = transmute(f);
724710
f(&Device::from_glib_borrow(this).downcast_unchecked())
725711
}
726712

727713
unsafe extern "C" fn notify_type_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
728714
where P: IsA<Device> {
729-
callback_guard!();
730715
let f: &&(Fn(&P) + 'static) = transmute(f);
731716
f(&Device::from_glib_borrow(this).downcast_unchecked())
732717
}
733718

734719
#[cfg(any(feature = "v3_16", feature = "dox"))]
735720
unsafe extern "C" fn notify_vendor_id_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
736721
where P: IsA<Device> {
737-
callback_guard!();
738722
let f: &&(Fn(&P) + 'static) = transmute(f);
739723
f(&Device::from_glib_borrow(this).downcast_unchecked())
740724
}

‎src/auto/device_manager.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 (0f1d1c1) from gir-files (77d1f70)
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 Device;
@@ -98,28 +99,24 @@ impl<O: IsA<DeviceManager> + IsA<glib::object::Object>> DeviceManagerExt for O {
9899

99100
unsafe extern "C" fn device_added_trampoline<P>(this: *mut ffi::GdkDeviceManager, device: *mut ffi::GdkDevice, f: glib_ffi::gpointer)
100101
where P: IsA<DeviceManager> {
101-
callback_guard!();
102102
let f: &&(Fn(&P, &Device) + 'static) = transmute(f);
103103
f(&DeviceManager::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(device))
104104
}
105105

106106
unsafe extern "C" fn device_changed_trampoline<P>(this: *mut ffi::GdkDeviceManager, device: *mut ffi::GdkDevice, f: glib_ffi::gpointer)
107107
where P: IsA<DeviceManager> {
108-
callback_guard!();
109108
let f: &&(Fn(&P, &Device) + 'static) = transmute(f);
110109
f(&DeviceManager::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(device))
111110
}
112111

113112
unsafe extern "C" fn device_removed_trampoline<P>(this: *mut ffi::GdkDeviceManager, device: *mut ffi::GdkDevice, f: glib_ffi::gpointer)
114113
where P: IsA<DeviceManager> {
115-
callback_guard!();
116114
let f: &&(Fn(&P, &Device) + 'static) = transmute(f);
117115
f(&DeviceManager::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(device))
118116
}
119117

120118
unsafe extern "C" fn notify_display_trampoline<P>(this: *mut ffi::GdkDeviceManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
121119
where P: IsA<DeviceManager> {
122-
callback_guard!();
123120
let f: &&(Fn(&P) + 'static) = transmute(f);
124121
f(&DeviceManager::from_glib_borrow(this).downcast_unchecked())
125122
}

‎src/auto/device_tool.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 (0f1d1c1) from gir-files (77d1f70)
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 AxisFlags;
@@ -143,28 +144,24 @@ impl<O: IsA<DeviceTool> + IsA<glib::object::Object>> DeviceToolExt for O {
143144

144145
unsafe extern "C" fn notify_axes_trampoline<P>(this: *mut ffi::GdkDeviceTool, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
145146
where P: IsA<DeviceTool> {
146-
callback_guard!();
147147
let f: &&(Fn(&P) + 'static) = transmute(f);
148148
f(&DeviceTool::from_glib_borrow(this).downcast_unchecked())
149149
}
150150

151151
unsafe extern "C" fn notify_hardware_id_trampoline<P>(this: *mut ffi::GdkDeviceTool, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
152152
where P: IsA<DeviceTool> {
153-
callback_guard!();
154153
let f: &&(Fn(&P) + 'static) = transmute(f);
155154
f(&DeviceTool::from_glib_borrow(this).downcast_unchecked())
156155
}
157156

158157
unsafe extern "C" fn notify_serial_trampoline<P>(this: *mut ffi::GdkDeviceTool, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
159158
where P: IsA<DeviceTool> {
160-
callback_guard!();
161159
let f: &&(Fn(&P) + 'static) = transmute(f);
162160
f(&DeviceTool::from_glib_borrow(this).downcast_unchecked())
163161
}
164162

165163
unsafe extern "C" fn notify_tool_type_trampoline<P>(this: *mut ffi::GdkDeviceTool, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
166164
where P: IsA<DeviceTool> {
167-
callback_guard!();
168165
let f: &&(Fn(&P) + 'static) = transmute(f);
169166
f(&DeviceTool::from_glib_borrow(this).downcast_unchecked())
170167
}

‎src/auto/display.rs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
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 AppLaunchContext;
@@ -530,46 +531,40 @@ impl<O: IsA<Display> + IsA<glib::object::Object>> DisplayExt for O {
530531

531532
unsafe extern "C" fn closed_trampoline<P>(this: *mut ffi::GdkDisplay, is_error: glib_ffi::gboolean, f: glib_ffi::gpointer)
532533
where P: IsA<Display> {
533-
callback_guard!();
534534
let f: &&(Fn(&P, bool) + 'static) = transmute(f);
535535
f(&Display::from_glib_borrow(this).downcast_unchecked(), from_glib(is_error))
536536
}
537537

538538
#[cfg(any(feature = "v3_22", feature = "dox"))]
539539
unsafe extern "C" fn monitor_added_trampoline<P>(this: *mut ffi::GdkDisplay, monitor: *mut ffi::GdkMonitor, f: glib_ffi::gpointer)
540540
where P: IsA<Display> {
541-
callback_guard!();
542541
let f: &&(Fn(&P, &Monitor) + 'static) = transmute(f);
543542
f(&Display::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(monitor))
544543
}
545544

546545
#[cfg(any(feature = "v3_22", feature = "dox"))]
547546
unsafe extern "C" fn monitor_removed_trampoline<P>(this: *mut ffi::GdkDisplay, monitor: *mut ffi::GdkMonitor, f: glib_ffi::gpointer)
548547
where P: IsA<Display> {
549-
callback_guard!();
550548
let f: &&(Fn(&P, &Monitor) + 'static) = transmute(f);
551549
f(&Display::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(monitor))
552550
}
553551

554552
unsafe extern "C" fn opened_trampoline<P>(this: *mut ffi::GdkDisplay, f: glib_ffi::gpointer)
555553
where P: IsA<Display> {
556-
callback_guard!();
557554
let f: &&(Fn(&P) + 'static) = transmute(f);
558555
f(&Display::from_glib_borrow(this).downcast_unchecked())
559556
}
560557

561558
#[cfg(any(feature = "v3_20", feature = "dox"))]
562559
unsafe extern "C" fn seat_added_trampoline<P>(this: *mut ffi::GdkDisplay, seat: *mut ffi::GdkSeat, f: glib_ffi::gpointer)
563560
where P: IsA<Display> {
564-
callback_guard!();
565561
let f: &&(Fn(&P, &Seat) + 'static) = transmute(f);
566562
f(&Display::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(seat))
567563
}
568564

569565
#[cfg(any(feature = "v3_20", feature = "dox"))]
570566
unsafe extern "C" fn seat_removed_trampoline<P>(this: *mut ffi::GdkDisplay, seat: *mut ffi::GdkSeat, f: glib_ffi::gpointer)
571567
where P: IsA<Display> {
572-
callback_guard!();
573568
let f: &&(Fn(&P, &Seat) + 'static) = transmute(f);
574569
f(&Display::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(seat))
575570
}

‎src/auto/display_manager.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 (0f1d1c1) from gir-files (77d1f70)
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 Display;
@@ -91,14 +92,12 @@ impl<O: IsA<DisplayManager> + IsA<glib::object::Object>> DisplayManagerExt for O
9192

9293
unsafe extern "C" fn display_opened_trampoline<P>(this: *mut ffi::GdkDisplayManager, display: *mut ffi::GdkDisplay, f: glib_ffi::gpointer)
9394
where P: IsA<DisplayManager> {
94-
callback_guard!();
9595
let f: &&(Fn(&P, &Display) + 'static) = transmute(f);
9696
f(&DisplayManager::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(display))
9797
}
9898

9999
unsafe extern "C" fn notify_default_display_trampoline<P>(this: *mut ffi::GdkDisplayManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
100100
where P: IsA<DisplayManager> {
101-
callback_guard!();
102101
let f: &&(Fn(&P) + 'static) = transmute(f);
103102
f(&DisplayManager::from_glib_borrow(this).downcast_unchecked())
104103
}

‎src/auto/drag_context.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 (0f1d1c1) from gir-files (77d1f70)
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 Atom;
@@ -194,31 +195,27 @@ impl<O: IsA<DragContext> + IsA<glib::object::Object>> DragContextExt for O {
194195
#[cfg(any(feature = "v3_20", feature = "dox"))]
195196
unsafe extern "C" fn action_changed_trampoline<P>(this: *mut ffi::GdkDragContext, action: ffi::GdkDragAction, f: glib_ffi::gpointer)
196197
where P: IsA<DragContext> {
197-
callback_guard!();
198198
let f: &&(Fn(&P, DragAction) + 'static) = transmute(f);
199199
f(&DragContext::from_glib_borrow(this).downcast_unchecked(), from_glib(action))
200200
}
201201

202202
#[cfg(any(feature = "v3_20", feature = "dox"))]
203203
unsafe extern "C" fn cancel_trampoline<P>(this: *mut ffi::GdkDragContext, reason: ffi::GdkDragCancelReason, f: glib_ffi::gpointer)
204204
where P: IsA<DragContext> {
205-
callback_guard!();
206205
let f: &&(Fn(&P, DragCancelReason) + 'static) = transmute(f);
207206
f(&DragContext::from_glib_borrow(this).downcast_unchecked(), from_glib(reason))
208207
}
209208

210209
#[cfg(any(feature = "v3_20", feature = "dox"))]
211210
unsafe extern "C" fn dnd_finished_trampoline<P>(this: *mut ffi::GdkDragContext, f: glib_ffi::gpointer)
212211
where P: IsA<DragContext> {
213-
callback_guard!();
214212
let f: &&(Fn(&P) + 'static) = transmute(f);
215213
f(&DragContext::from_glib_borrow(this).downcast_unchecked())
216214
}
217215

218216
#[cfg(any(feature = "v3_20", feature = "dox"))]
219217
unsafe extern "C" fn drop_performed_trampoline<P>(this: *mut ffi::GdkDragContext, time: libc::c_int, f: glib_ffi::gpointer)
220218
where P: IsA<DragContext> {
221-
callback_guard!();
222219
let f: &&(Fn(&P, i32) + 'static) = transmute(f);
223220
f(&DragContext::from_glib_borrow(this).downcast_unchecked(), time)
224221
}

0 commit comments

Comments
 (0)