Skip to content

Commit 9b087c3

Browse files
sdroegesdroege
authored
Merge pull request #1755 from sdroege/gdk-pixbuf-v2_44
gdk-pixbuf: Add v2_44 version feature
2 parents 64bf85f + d9f949b commit 9b087c3

File tree

22 files changed

+38
-38
lines changed

22 files changed

+38
-38
lines changed

‎gdk-pixbuf/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ name = "gdk_pixbuf"
1919
[features]
2020
v2_40 = ["gdk-pixbuf-sys/v2_40"]
2121
v2_42 = ["v2_40", "gdk-pixbuf-sys/v2_42"]
22+
v2_44 = ["v2_42", "gdk-pixbuf-sys/v2_44"]
2223

2324
[dependencies]
2425
gdk-pixbuf-sys.workspace = true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 3fcec321a85e)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
22
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)

‎gdk-pixbuf/sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ version = "2.40"
6666
version = "2.42"
6767

6868
[package.metadata.system-deps.gdk_pixbuf_2_0.v2_44]
69-
version = "2.44"
69+
version = "2.43"
7070

7171
[package.metadata.docs.rs]
7272
rustc-args = ["--cfg", "docsrs"]

‎gdk-pixbuf/sys/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 3fcec321a85e)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
22
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)

‎gio/src/auto/desktop_app_info.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ impl DesktopAppInfo {
205205
launch_context: Option<&impl IsA<AppLaunchContext>>,
206206
spawn_flags: glib::SpawnFlags,
207207
user_setup: Option<Box_<dyn FnOnce() + 'static>>,
208-
pid_callback: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>,
208+
pid_callback: Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)>,
209209
) -> Result<(), glib::Error> {
210210
let user_setup_data: Box_<Option<Box_<dyn FnOnce() + 'static>>> = Box_::new(user_setup);
211211
unsafe extern "C" fn user_setup_func(data: glib::ffi::gpointer) {
@@ -218,7 +218,7 @@ impl DesktopAppInfo {
218218
} else {
219219
None
220220
};
221-
let mut pid_callback_data: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> =
221+
let mut pid_callback_data: Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)> =
222222
pid_callback;
223223
unsafe extern "C" fn pid_callback_func(
224224
appinfo: *mut ffi::GDesktopAppInfo,
@@ -227,7 +227,7 @@ impl DesktopAppInfo {
227227
) {
228228
let appinfo = from_glib_borrow(appinfo);
229229
let pid = from_glib(pid);
230-
let callback = user_data as *mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>;
230+
let callback = user_data as *mut Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)>;
231231
if let Some(ref mut callback) = *callback {
232232
callback(&appinfo, pid)
233233
} else {
@@ -240,7 +240,7 @@ impl DesktopAppInfo {
240240
None
241241
};
242242
let super_callback0: Box_<Option<Box_<dyn FnOnce() + 'static>>> = user_setup_data;
243-
let super_callback1: &mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> =
243+
let super_callback1: &mut Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)> =
244244
&mut pid_callback_data;
245245
unsafe {
246246
let mut error = std::ptr::null_mut();

‎gio/src/auto/file.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,15 +222,15 @@ pub trait FileExt: IsA<File> + 'static {
222222
destination: &impl IsA<File>,
223223
flags: FileCopyFlags,
224224
cancellable: Option<&impl IsA<Cancellable>>,
225-
progress_callback: Option<&mut dyn (FnMut(i64, i64))>,
225+
progress_callback: Option<&mut dyn FnMut(i64, i64)>,
226226
) -> Result<(), glib::Error> {
227-
let mut progress_callback_data: Option<&mut dyn (FnMut(i64, i64))> = progress_callback;
227+
let mut progress_callback_data: Option<&mut dyn FnMut(i64, i64)> = progress_callback;
228228
unsafe extern "C" fn progress_callback_func(
229229
current_num_bytes: i64,
230230
total_num_bytes: i64,
231231
data: glib::ffi::gpointer,
232232
) {
233-
let callback = data as *mut Option<&mut dyn (FnMut(i64, i64))>;
233+
let callback = data as *mut Option<&mut dyn FnMut(i64, i64)>;
234234
if let Some(ref mut callback) = *callback {
235235
callback(current_num_bytes, total_num_bytes)
236236
} else {
@@ -242,7 +242,7 @@ pub trait FileExt: IsA<File> + 'static {
242242
} else {
243243
None
244244
};
245-
let super_callback0: &mut Option<&mut dyn (FnMut(i64, i64))> = &mut progress_callback_data;
245+
let super_callback0: &mut Option<&mut dyn FnMut(i64, i64)> = &mut progress_callback_data;
246246
unsafe {
247247
let mut error = std::ptr::null_mut();
248248
let is_ok = ffi::g_file_copy(
@@ -1246,15 +1246,15 @@ pub trait FileExt: IsA<File> + 'static {
12461246
destination: &impl IsA<File>,
12471247
flags: FileCopyFlags,
12481248
cancellable: Option<&impl IsA<Cancellable>>,
1249-
progress_callback: Option<&mut dyn (FnMut(i64, i64))>,
1249+
progress_callback: Option<&mut dyn FnMut(i64, i64)>,
12501250
) -> Result<(), glib::Error> {
1251-
let mut progress_callback_data: Option<&mut dyn (FnMut(i64, i64))> = progress_callback;
1251+
let mut progress_callback_data: Option<&mut dyn FnMut(i64, i64)> = progress_callback;
12521252
unsafe extern "C" fn progress_callback_func(
12531253
current_num_bytes: i64,
12541254
total_num_bytes: i64,
12551255
data: glib::ffi::gpointer,
12561256
) {
1257-
let callback = data as *mut Option<&mut dyn (FnMut(i64, i64))>;
1257+
let callback = data as *mut Option<&mut dyn FnMut(i64, i64)>;
12581258
if let Some(ref mut callback) = *callback {
12591259
callback(current_num_bytes, total_num_bytes)
12601260
} else {
@@ -1266,7 +1266,7 @@ pub trait FileExt: IsA<File> + 'static {
12661266
} else {
12671267
None
12681268
};
1269-
let super_callback0: &mut Option<&mut dyn (FnMut(i64, i64))> = &mut progress_callback_data;
1269+
let super_callback0: &mut Option<&mut dyn FnMut(i64, i64)> = &mut progress_callback_data;
12701270
unsafe {
12711271
let mut error = std::ptr::null_mut();
12721272
let is_ok = ffi::g_file_move(

‎gio/src/auto/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 3fcec321a85e)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
22
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)

‎gio/src/desktop_app_info.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub trait DesktopAppInfoExtManual: IsA<DesktopAppInfo> {
5454
launch_context: Option<&P>,
5555
spawn_flags: glib::SpawnFlags,
5656
user_setup: Option<Box_<dyn FnOnce() + 'static>>,
57-
pid_callback: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>,
57+
pid_callback: Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)>,
5858
stdin_fd: Option<impl AsFd>,
5959
stdout_fd: Option<impl AsFd>,
6060
stderr_fd: Option<impl AsFd>,
@@ -71,15 +71,15 @@ pub trait DesktopAppInfoExtManual: IsA<DesktopAppInfo> {
7171
} else {
7272
None
7373
};
74-
let pid_callback_data: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> = pid_callback;
74+
let pid_callback_data: Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)> = pid_callback;
7575
unsafe extern "C" fn pid_callback_func(
7676
appinfo: *mut ffi::GDesktopAppInfo,
7777
pid: glib::ffi::GPid,
7878
user_data: glib::ffi::gpointer,
7979
) {
8080
let appinfo = from_glib_borrow(appinfo);
8181
let pid = from_glib(pid);
82-
let callback = user_data as *mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>;
82+
let callback = user_data as *mut Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)>;
8383
if let Some(ref mut callback) = *callback {
8484
callback(&appinfo, pid)
8585
} else {
@@ -92,7 +92,7 @@ pub trait DesktopAppInfoExtManual: IsA<DesktopAppInfo> {
9292
None
9393
};
9494
let super_callback0: Box_<Option<Box_<dyn FnOnce() + 'static>>> = user_setup_data;
95-
let super_callback1: &Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> =
95+
let super_callback1: &Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)> =
9696
&pid_callback_data;
9797

9898
let stdin_raw_fd = stdin_fd.map_or(-1, |fd| fd.as_fd().as_raw_fd());

‎gio/sys/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 3fcec321a85e)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
22
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)

‎gir

Submodule gir updated 28 files

0 commit comments

Comments
 (0)