Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gdk-pixbuf/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
4 changes: 2 additions & 2 deletions gdk-pixbuf/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
8 changes: 6 additions & 2 deletions gio/src/auto/app_launch_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,15 @@ pub trait AppLaunchContextExt: IsA<AppLaunchContext> + 'static {

#[doc(alias = "g_app_launch_context_get_startup_notify_id")]
#[doc(alias = "get_startup_notify_id")]
fn startup_notify_id(&self, info: &impl IsA<AppInfo>, files: &[File]) -> Option<glib::GString> {
fn startup_notify_id(
&self,
info: Option<&impl IsA<AppInfo>>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Breaking change but as we discussed we'd backport these now because of correctness

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, it would be nice to backport it actually as it blocks some work we have in ashpd :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do

files: &[File],
) -> Option<glib::GString> {
unsafe {
from_glib_full(ffi::g_app_launch_context_get_startup_notify_id(
self.as_ref().to_glib_none().0,
info.as_ref().to_glib_none().0,
info.map(|p| p.as_ref()).to_glib_none().0,
files.to_glib_none().0,
))
}
Expand Down
7 changes: 7 additions & 0 deletions gio/src/auto/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,13 @@ pub fn resources_get_info(
}
}

#[cfg(feature = "v2_84")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))]
#[doc(alias = "g_resources_has_children")]
pub fn resources_has_children(path: &str) -> bool {
unsafe { from_glib(ffi::g_resources_has_children(path.to_glib_none().0)) }
}

#[doc(alias = "g_resources_lookup_data")]
pub fn resources_lookup_data(
path: &str,
Expand Down
12 changes: 12 additions & 0 deletions gio/src/auto/resource.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,18 @@ impl Resource {
}
}

#[cfg(feature = "v2_84")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))]
#[doc(alias = "g_resource_has_children")]
pub fn has_children(&self, path: &str) -> bool {
unsafe {
from_glib(ffi::g_resource_has_children(
self.to_glib_none().0,
path.to_glib_none().0,
))
}
}

#[doc(alias = "g_resource_lookup_data")]
pub fn lookup_data(
&self,
Expand Down
4 changes: 2 additions & 2 deletions gio/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
4 changes: 4 additions & 0 deletions gio/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ v2_76 = ["v2_74"]
v2_78 = ["v2_76"]
v2_80 = ["v2_78"]
v2_82 = ["v2_80"]
v2_84 = ["v2_82"]

[lib]
name = "gio_sys"
Expand Down Expand Up @@ -109,6 +110,9 @@ version = "2.80"
[package.metadata.system-deps.gio_2_0.v2_82]
version = "2.81"

[package.metadata.system-deps.gio_2_0.v2_84]
version = "2.84"

[package.metadata.docs.rs]
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
Expand Down
22 changes: 22 additions & 0 deletions gio/sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3404,6 +3404,7 @@ pub struct GFileIface {
*mut *mut glib::GError,
) -> gboolean,
>,
pub query_exists: Option<unsafe extern "C" fn(*mut GFile, *mut GCancellable) -> gboolean>,
}

impl ::std::fmt::Debug for GFileIface {
Expand Down Expand Up @@ -3555,6 +3556,7 @@ impl ::std::fmt::Debug for GFileIface {
.field("measure_disk_usage", &self.measure_disk_usage)
.field("measure_disk_usage_async", &self.measure_disk_usage_async)
.field("measure_disk_usage_finish", &self.measure_disk_usage_finish)
.field("query_exists", &self.query_exists)
.finish()
}
}
Expand Down Expand Up @@ -10043,6 +10045,9 @@ extern "C" {
flags: *mut u32,
error: *mut *mut glib::GError,
) -> gboolean;
#[cfg(feature = "v2_84")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))]
pub fn g_resource_has_children(resource: *mut GResource, path: *const c_char) -> gboolean;
pub fn g_resource_lookup_data(
resource: *mut GResource,
path: *const c_char,
Expand Down Expand Up @@ -17251,6 +17256,9 @@ extern "C" {
flags: *mut u32,
error: *mut *mut glib::GError,
) -> gboolean;
#[cfg(feature = "v2_84")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))]
pub fn g_resources_has_children(path: *const c_char) -> gboolean;
pub fn g_resources_lookup_data(
path: *const c_char,
lookup_flags: GResourceLookupFlags,
Expand Down Expand Up @@ -17313,7 +17321,21 @@ extern "C" {
pub fn g_unix_mount_is_system_internal(mount_entry: *mut GUnixMountEntry) -> gboolean;
pub fn g_unix_mount_points_changed_since(time: u64) -> gboolean;
pub fn g_unix_mount_points_get(time_read: *mut u64) -> *mut glib::GList;
#[cfg(feature = "v2_82")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_82")))]
pub fn g_unix_mount_points_get_from_file(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be conditional for non-Windows

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm we don't do that for any others so it probably doesn't matter after all

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't those be in the gio-unix gi file nowadays anyway?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that was not done for backwards compatibility reasons

table_path: *const c_char,
time_read_out: *mut u64,
n_points_out: *mut size_t,
) -> *mut *mut GUnixMountPoint;
pub fn g_unix_mounts_changed_since(time: u64) -> gboolean;
pub fn g_unix_mounts_get(time_read: *mut u64) -> *mut glib::GList;
#[cfg(feature = "v2_82")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_82")))]
pub fn g_unix_mounts_get_from_file(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be conditional for non-Windows

table_path: *const c_char,
time_read_out: *mut u64,
n_entries_out: *mut size_t,
) -> *mut *mut GUnixMountEntry;

}
4 changes: 2 additions & 2 deletions gio/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
2 changes: 1 addition & 1 deletion gir
Submodule gir updated 1 files
+4 −1 src/parser.rs
2 changes: 1 addition & 1 deletion gir-files
4 changes: 2 additions & 2 deletions glib/gobject-sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
2 changes: 2 additions & 0 deletions glib/src/auto/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@ pub fn shell_unquote(
}
}

//#[cfg(feature = "v2_82")]
//#[cfg_attr(docsrs, doc(cfg(feature = "v2_82")))]
//#[doc(alias = "g_sort_array")]
//pub fn sort_array(array: /*Unimplemented*/&[&Basic: Pointer], element_size: usize, compare_func: /*Unimplemented*/FnMut(/*Unimplemented*/Option<Basic: Pointer>, /*Unimplemented*/Option<Basic: Pointer>) -> i32, user_data: /*Unimplemented*/Option<Basic: Pointer>) {
// unsafe { TODO: call ffi:g_sort_array() }
Expand Down
14 changes: 14 additions & 0 deletions glib/src/auto/main_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ impl MainContext {
unsafe { from_glib(ffi::g_main_context_pending(self.to_glib_none().0)) }
}

//#[cfg(feature = "v2_64")]
//#[cfg_attr(docsrs, doc(cfg(feature = "v2_64")))]
//#[doc(alias = "g_main_context_pusher_new")]
//pub fn pusher_new(&self) -> /*Unknown conversion*//*Unimplemented*/MainContextPusher {
// unsafe { TODO: call ffi:g_main_context_pusher_new() }
//}

//#[doc(alias = "g_main_context_query")]
//pub fn query(&self, max_priority: i32, fds: /*Ignored*/Vec<PollFD>) -> (i32, i32) {
// unsafe { TODO: call ffi:g_main_context_query() }
Expand Down Expand Up @@ -126,6 +133,13 @@ impl MainContext {
unsafe { from_glib_none(ffi::g_main_context_get_thread_default()) }
}

//#[cfg(feature = "v2_64")]
//#[cfg_attr(docsrs, doc(cfg(feature = "v2_64")))]
//#[doc(alias = "g_main_context_pusher_free")]
//pub fn pusher_free(pusher: /*Unknown conversion*//*Unimplemented*/MainContextPusher) {
// unsafe { TODO: call ffi:g_main_context_pusher_free() }
//}

#[doc(alias = "g_main_context_ref_thread_default")]
pub fn ref_thread_default() -> MainContext {
unsafe { from_glib_full(ffi::g_main_context_ref_thread_default()) }
Expand Down
4 changes: 2 additions & 2 deletions glib/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
4 changes: 4 additions & 0 deletions glib/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ v2_76 = ["v2_74"]
v2_78 = ["v2_76"]
v2_80 = ["v2_78"]
v2_82 = ["v2_80"]
v2_84 = ["v2_82"]

[lib]
name = "glib_sys"
Expand Down Expand Up @@ -99,6 +100,9 @@ version = "2.80"
[package.metadata.system-deps.glib_2_0.v2_82]
version = "2.81"

[package.metadata.system-deps.glib_2_0.v2_84]
version = "2.84"

[package.metadata.system-deps.gobject_2_0]
name = "gobject-2.0"
version = "2.56"
Expand Down
12 changes: 12 additions & 0 deletions glib/sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4150,6 +4150,9 @@ extern "C" {
pub fn g_main_context_pop_thread_default(context: *mut GMainContext);
pub fn g_main_context_prepare(context: *mut GMainContext, priority: *mut c_int) -> gboolean;
pub fn g_main_context_push_thread_default(context: *mut GMainContext);
#[cfg(feature = "v2_64")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_64")))]
pub fn g_main_context_pusher_new(main_context: *mut GMainContext) -> *mut GMainContextPusher;
pub fn g_main_context_query(
context: *mut GMainContext,
max_priority: c_int,
Expand All @@ -4170,6 +4173,9 @@ extern "C" {
pub fn g_main_context_wakeup(context: *mut GMainContext);
pub fn g_main_context_default() -> *mut GMainContext;
pub fn g_main_context_get_thread_default() -> *mut GMainContext;
#[cfg(feature = "v2_64")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_64")))]
pub fn g_main_context_pusher_free(pusher: *mut GMainContextPusher);
pub fn g_main_context_ref_thread_default() -> *mut GMainContext;

//=========================================================================
Expand Down Expand Up @@ -6000,6 +6006,9 @@ extern "C" {
pub fn g_variant_builder_close(builder: *mut GVariantBuilder);
pub fn g_variant_builder_end(builder: *mut GVariantBuilder) -> *mut GVariant;
pub fn g_variant_builder_init(builder: *mut GVariantBuilder, type_: *const GVariantType);
#[cfg(feature = "v2_84")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))]
pub fn g_variant_builder_init_static(builder: *mut GVariantBuilder, type_: *const GVariantType);
pub fn g_variant_builder_open(builder: *mut GVariantBuilder, type_: *const GVariantType);
pub fn g_variant_builder_ref(builder: *mut GVariantBuilder) -> *mut GVariantBuilder;
pub fn g_variant_builder_unref(builder: *mut GVariantBuilder);
Expand Down Expand Up @@ -6946,6 +6955,9 @@ extern "C" {
#[cfg(feature = "v2_58")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_58")))]
pub fn g_ref_string_acquire(str: *mut c_char) -> *mut c_char;
#[cfg(feature = "v2_84")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))]
pub fn g_ref_string_equal(str1: *const c_char, str2: *const c_char) -> gboolean;
#[cfg(feature = "v2_58")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_58")))]
pub fn g_ref_string_length(str: *mut c_char) -> size_t;
Expand Down
4 changes: 2 additions & 2 deletions glib/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
4 changes: 2 additions & 2 deletions graphene/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
4 changes: 2 additions & 2 deletions graphene/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
4 changes: 2 additions & 2 deletions pango/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
4 changes: 2 additions & 2 deletions pango/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
4 changes: 2 additions & 2 deletions pangocairo/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)
4 changes: 2 additions & 2 deletions pangocairo/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)
Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545)
from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)