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

+2-2
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

+2-2
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

+1-1
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

+2-2
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

+4-4
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

+2-2
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

+2-2
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

+1
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

+1
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

+1
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);

‎gio/sys/versions.txt

+2-2
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)

‎gir

‎gir-files

‎glib/gobject-sys/versions.txt

+2-2
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)

‎glib/src/auto/functions.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -709,9 +709,8 @@ pub fn spawn_async(
709709
child_setup: Option<Box_<dyn FnOnce() + 'static>>,
710710
) -> Result<Pid, crate::Error> {
711711
let child_setup_data: Box_<Option<Box_<dyn FnOnce() + 'static>>> = Box_::new(child_setup);
712-
unsafe extern "C" fn child_setup_func(user_data: ffi::gpointer) {
713-
let callback: Box_<Option<Box_<dyn FnOnce() + 'static>>> =
714-
Box_::from_raw(user_data as *mut _);
712+
unsafe extern "C" fn child_setup_func(data: ffi::gpointer) {
713+
let callback: Box_<Option<Box_<dyn FnOnce() + 'static>>> = Box_::from_raw(data as *mut _);
715714
let callback = (*callback).expect("cannot get closure...");
716715
callback()
717716
}

‎glib/src/auto/main_context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl MainContext {
6161

6262
//#[doc(alias = "g_main_context_get_poll_func")]
6363
//#[doc(alias = "get_poll_func")]
64-
//pub fn poll_func(&self) -> /*Unimplemented*/Fn(/*Ignored*/PollFD, u32, i32) -> i32 {
64+
//pub fn poll_func(&self) -> /*Unimplemented*/Fn(/*Ignored*/PollFD, u32) -> i32 {
6565
// unsafe { TODO: call ffi:g_main_context_get_poll_func() }
6666
//}
6767

@@ -96,7 +96,7 @@ impl MainContext {
9696
//}
9797

9898
//#[doc(alias = "g_main_context_set_poll_func")]
99-
//pub fn set_poll_func(&self, func: /*Unimplemented*/Fn(/*Ignored*/PollFD, u32, i32) -> i32) {
99+
//pub fn set_poll_func(&self, func: /*Unimplemented*/Fn(/*Ignored*/PollFD, u32) -> i32) {
100100
// unsafe { TODO: call ffi:g_main_context_set_poll_func() }
101101
//}
102102

‎glib/src/auto/versions.txt

+2-2
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)

‎glib/sys/src/lib.rs

+67
Original file line numberDiff line numberDiff line change
@@ -2445,6 +2445,21 @@ extern "C" {
24452445
clear_: gboolean,
24462446
element_size: c_uint,
24472447
) -> *mut GArray;
2448+
#[cfg(any(feature = "v2_76", feature = "dox"))]
2449+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
2450+
pub fn g_array_new_take(
2451+
data: gpointer,
2452+
len: size_t,
2453+
clear: gboolean,
2454+
element_size: size_t,
2455+
) -> *mut GArray;
2456+
#[cfg(any(feature = "v2_76", feature = "dox"))]
2457+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
2458+
pub fn g_array_new_take_zero_terminated(
2459+
data: gpointer,
2460+
clear: gboolean,
2461+
element_size: size_t,
2462+
) -> *mut GArray;
24482463
pub fn g_array_prepend_vals(
24492464
array: *mut GArray,
24502465
data: gconstpointer,
@@ -3122,7 +3137,13 @@ extern "C" {
31223137
hash_table: *mut GHashTable,
31233138
length: *mut c_uint,
31243139
) -> *mut gpointer;
3140+
#[cfg(any(feature = "v2_76", feature = "dox"))]
3141+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
3142+
pub fn g_hash_table_get_keys_as_ptr_array(hash_table: *mut GHashTable) -> *mut GPtrArray;
31253143
pub fn g_hash_table_get_values(hash_table: *mut GHashTable) -> *mut GList;
3144+
#[cfg(any(feature = "v2_76", feature = "dox"))]
3145+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
3146+
pub fn g_hash_table_get_values_as_ptr_array(hash_table: *mut GHashTable) -> *mut GPtrArray;
31263147
pub fn g_hash_table_insert(
31273148
hash_table: *mut GHashTable,
31283149
key: gpointer,
@@ -3156,6 +3177,12 @@ extern "C" {
31563177
pub fn g_hash_table_size(hash_table: *mut GHashTable) -> c_uint;
31573178
pub fn g_hash_table_steal(hash_table: *mut GHashTable, key: gconstpointer) -> gboolean;
31583179
pub fn g_hash_table_steal_all(hash_table: *mut GHashTable);
3180+
#[cfg(any(feature = "v2_76", feature = "dox"))]
3181+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
3182+
pub fn g_hash_table_steal_all_keys(hash_table: *mut GHashTable) -> *mut GPtrArray;
3183+
#[cfg(any(feature = "v2_76", feature = "dox"))]
3184+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
3185+
pub fn g_hash_table_steal_all_values(hash_table: *mut GHashTable) -> *mut GPtrArray;
31593186
#[cfg(any(feature = "v2_58", feature = "dox"))]
31603187
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_58")))]
31613188
pub fn g_hash_table_steal_extended(
@@ -4117,6 +4144,23 @@ extern "C" {
41174144
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_74")))]
41184145
pub fn g_ptr_array_is_null_terminated(array: *mut GPtrArray) -> gboolean;
41194146
pub fn g_ptr_array_new() -> *mut GPtrArray;
4147+
#[cfg(any(feature = "v2_76", feature = "dox"))]
4148+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
4149+
pub fn g_ptr_array_new_from_array(
4150+
data: *mut gpointer,
4151+
len: size_t,
4152+
copy_func: GCopyFunc,
4153+
copy_func_user_data: gpointer,
4154+
element_free_func: GDestroyNotify,
4155+
) -> *mut GPtrArray;
4156+
#[cfg(any(feature = "v2_76", feature = "dox"))]
4157+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
4158+
pub fn g_ptr_array_new_from_null_terminated_array(
4159+
data: *mut gpointer,
4160+
copy_func: GCopyFunc,
4161+
copy_func_user_data: gpointer,
4162+
element_free_func: GDestroyNotify,
4163+
) -> *mut GPtrArray;
41204164
pub fn g_ptr_array_new_full(
41214165
reserved_size: c_uint,
41224166
element_free_func: GDestroyNotify,
@@ -4128,6 +4172,19 @@ extern "C" {
41284172
element_free_func: GDestroyNotify,
41294173
null_terminated: gboolean,
41304174
) -> *mut GPtrArray;
4175+
#[cfg(any(feature = "v2_76", feature = "dox"))]
4176+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
4177+
pub fn g_ptr_array_new_take(
4178+
data: *mut gpointer,
4179+
len: size_t,
4180+
element_free_func: GDestroyNotify,
4181+
) -> *mut GPtrArray;
4182+
#[cfg(any(feature = "v2_76", feature = "dox"))]
4183+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
4184+
pub fn g_ptr_array_new_take_null_terminated(
4185+
data: *mut gpointer,
4186+
element_free_func: GDestroyNotify,
4187+
) -> *mut GPtrArray;
41314188
pub fn g_ptr_array_new_with_free_func(element_free_func: GDestroyNotify) -> *mut GPtrArray;
41324189
pub fn g_ptr_array_ref(array: *mut GPtrArray) -> *mut GPtrArray;
41334190
pub fn g_ptr_array_remove(array: *mut GPtrArray, data: gpointer) -> gboolean;
@@ -4143,6 +4200,16 @@ extern "C" {
41434200
pub fn g_ptr_array_set_size(array: *mut GPtrArray, length: c_int);
41444201
pub fn g_ptr_array_sized_new(reserved_size: c_uint) -> *mut GPtrArray;
41454202
pub fn g_ptr_array_sort(array: *mut GPtrArray, compare_func: GCompareFunc);
4203+
#[cfg(any(feature = "v2_76", feature = "dox"))]
4204+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
4205+
pub fn g_ptr_array_sort_values(array: *mut GPtrArray, compare_func: GCompareFunc);
4206+
#[cfg(any(feature = "v2_76", feature = "dox"))]
4207+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_76")))]
4208+
pub fn g_ptr_array_sort_values_with_data(
4209+
array: *mut GPtrArray,
4210+
compare_func: GCompareDataFunc,
4211+
user_data: gpointer,
4212+
);
41464213
pub fn g_ptr_array_sort_with_data(
41474214
array: *mut GPtrArray,
41484215
compare_func: GCompareDataFunc,

‎glib/sys/versions.txt

+2-2
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)

‎graphene/src/auto/versions.txt

+2-2
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)

‎graphene/sys/versions.txt

+2-2
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)

‎pango/src/auto/versions.txt

+2-2
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)

‎pango/sys/versions.txt

+2-2
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)

‎pangocairo/src/auto/versions.txt

+2-2
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)

‎pangocairo/sys/versions.txt

+2-2
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)

0 commit comments

Comments
 (0)