Skip to content

Commit 3a7bf73

Browse files
sdroegesdroege
authored
Merge pull request #897 from sdroege/update-gir-files
Update gir files
2 parents 2e2af7c + 39331a4 commit 3a7bf73

File tree

25 files changed

+111
-42
lines changed

25 files changed

+111
-42
lines changed

‎gdk-pixbuf/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 21579010f1cd)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 751a9c9d62f5)
1+
Generated by gir (https://github.com/gtk-rs/gir @ d7bdac6deb40)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 040da0b3a013)

‎gdk-pixbuf/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 21579010f1cd)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 751a9c9d62f5)
1+
Generated by gir (https://github.com/gtk-rs/gir @ d7bdac6deb40)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 040da0b3a013)

‎gio/src/auto/action.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl Action {
2929
#[doc(alias = "g_action_parse_detailed_name")]
3030
pub fn parse_detailed_name(
3131
detailed_name: &str,
32-
) -> Result<(glib::GString, glib::Variant), glib::Error> {
32+
) -> Result<(glib::GString, Option<glib::Variant>), glib::Error> {
3333
unsafe {
3434
let mut action_name = ptr::null_mut();
3535
let mut target_value = ptr::null_mut();

‎gio/src/auto/desktop_app_info.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ impl DesktopAppInfo {
211211
pid_callback: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>,
212212
) -> Result<(), glib::Error> {
213213
let user_setup_data: Box_<Option<Box_<dyn FnOnce() + 'static>>> = Box_::new(user_setup);
214-
unsafe extern "C" fn user_setup_func(user_data: glib::ffi::gpointer) {
214+
unsafe extern "C" fn user_setup_func(data: glib::ffi::gpointer) {
215215
let callback: Box_<Option<Box_<dyn FnOnce() + 'static>>> =
216-
Box_::from_raw(user_data as *mut _);
216+
Box_::from_raw(data as *mut _);
217217
let callback = (*callback).expect("cannot get closure...");
218218
callback()
219219
}

‎gio/src/auto/file.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -940,10 +940,10 @@ impl<O: IsA<File>> FileExt for O {
940940
unsafe extern "C" fn progress_callback_func(
941941
current_num_bytes: i64,
942942
total_num_bytes: i64,
943-
user_data: glib::ffi::gpointer,
943+
data: glib::ffi::gpointer,
944944
) {
945945
let callback: *mut Option<&mut dyn (FnMut(i64, i64))> =
946-
user_data as *const _ as usize as *mut Option<&mut dyn (FnMut(i64, i64))>;
946+
data as *const _ as usize as *mut Option<&mut dyn (FnMut(i64, i64))>;
947947
if let Some(ref mut callback) = *callback {
948948
callback(current_num_bytes, total_num_bytes)
949949
} else {
@@ -2028,10 +2028,10 @@ impl<O: IsA<File>> FileExt for O {
20282028
unsafe extern "C" fn progress_callback_func(
20292029
current_num_bytes: i64,
20302030
total_num_bytes: i64,
2031-
user_data: glib::ffi::gpointer,
2031+
data: glib::ffi::gpointer,
20322032
) {
20332033
let callback: *mut Option<&mut dyn (FnMut(i64, i64))> =
2034-
user_data as *const _ as usize as *mut Option<&mut dyn (FnMut(i64, i64))>;
2034+
data as *const _ as usize as *mut Option<&mut dyn (FnMut(i64, i64))>;
20352035
if let Some(ref mut callback) = *callback {
20362036
callback(current_num_bytes, total_num_bytes)
20372037
} else {

‎gio/src/auto/subprocess_launcher.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ impl SubprocessLauncher {
5050
#[doc(alias = "g_subprocess_launcher_set_child_setup")]
5151
pub fn set_child_setup<P: Fn() + 'static>(&self, child_setup: P) {
5252
let child_setup_data: Box_<P> = Box_::new(child_setup);
53-
unsafe extern "C" fn child_setup_func<P: Fn() + 'static>(user_data: glib::ffi::gpointer) {
54-
let callback: &P = &*(user_data as *mut _);
53+
unsafe extern "C" fn child_setup_func<P: Fn() + 'static>(data: glib::ffi::gpointer) {
54+
let callback: &P = &*(data as *mut _);
5555
(*callback)();
5656
}
5757
let child_setup = Some(child_setup_func::<P> as _);

‎gio/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 21579010f1cd)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 751a9c9d62f5)
1+
Generated by gir (https://github.com/gtk-rs/gir @ d7bdac6deb40)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 040da0b3a013)

‎gio/sys/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,7 @@ pub const G_MENU_ATTRIBUTE_ACTION_NAMESPACE: &[u8] = b"action-namespace\0";
497497
pub const G_MENU_ATTRIBUTE_ICON: &[u8] = b"icon\0";
498498
pub const G_MENU_ATTRIBUTE_LABEL: &[u8] = b"label\0";
499499
pub const G_MENU_ATTRIBUTE_TARGET: &[u8] = b"target\0";
500+
pub const G_MENU_EXPORTER_MAX_SECTION_SIZE: c_int = 1000;
500501
pub const G_MENU_LINK_SECTION: &[u8] = b"section\0";
501502
pub const G_MENU_LINK_SUBMENU: &[u8] = b"submenu\0";
502503
pub const G_NATIVE_VOLUME_MONITOR_EXTENSION_POINT_NAME: &[u8] = b"gio-native-volume-monitor\0";

‎gio/sys/tests/abi.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2804,6 +2804,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
28042804
("G_MENU_ATTRIBUTE_ICON", "icon"),
28052805
("G_MENU_ATTRIBUTE_LABEL", "label"),
28062806
("G_MENU_ATTRIBUTE_TARGET", "target"),
2807+
("G_MENU_EXPORTER_MAX_SECTION_SIZE", "1000"),
28072808
("G_MENU_LINK_SECTION", "section"),
28082809
("G_MENU_LINK_SUBMENU", "submenu"),
28092810
("(guint) G_MOUNT_MOUNT_NONE", "0"),

‎gio/sys/tests/constant.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ int main() {
422422
PRINT_CONSTANT(G_MENU_ATTRIBUTE_ICON);
423423
PRINT_CONSTANT(G_MENU_ATTRIBUTE_LABEL);
424424
PRINT_CONSTANT(G_MENU_ATTRIBUTE_TARGET);
425+
PRINT_CONSTANT(G_MENU_EXPORTER_MAX_SECTION_SIZE);
425426
PRINT_CONSTANT(G_MENU_LINK_SECTION);
426427
PRINT_CONSTANT(G_MENU_LINK_SUBMENU);
427428
PRINT_CONSTANT((guint) G_MOUNT_MOUNT_NONE);

0 commit comments

Comments
 (0)