Skip to content

Commit 6653861

Browse files
authored
Merge pull request gtk-rs#829 from sdroege/update-gir-files
Update gir files
2 parents d593925 + 9a8c70d commit 6653861

File tree

8 files changed

+21
-18
lines changed

8 files changed

+21
-18
lines changed

gio/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ v2_68 = ["v2_66", "ffi/v2_68", "glib/v2_68"]
2929
v2_70 = ["v2_68", "ffi/v2_70", "glib/v2_70"]
3030
v2_72 = ["v2_70", "ffi/v2_72", "glib/v2_72"]
3131
v2_74 = ["v2_72", "ffi/v2_74", "glib/v2_74"]
32+
v2_76 = ["v2_74", "ffi/v2_76", "glib/v2_76"]
3233
dox = ["ffi/dox", "glib/dox"]
3334

3435
[package.metadata.docs.rs]

gio/sys/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ version = "2.70"
7878
version = "2.72"
7979

8080
[package.metadata.system-deps.gio_2_0.v2_74]
81-
version = "2.73"
81+
version = "2.74"
8282

8383
[package.metadata.system-deps.gio_2_0.v2_76]
84-
version = "2.76"
84+
version = "2.75"

glib/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ v2_68 = ["v2_66", "ffi/v2_68", "gobject_ffi/v2_68"]
5151
v2_70 = ["v2_68", "ffi/v2_70", "gobject_ffi/v2_70"]
5252
v2_72 = ["v2_70", "ffi/v2_72", "gobject_ffi/v2_72"]
5353
v2_74 = ["v2_72", "ffi/v2_74", "gobject_ffi/v2_74"]
54+
v2_76 = ["v2_74", "ffi/v2_76", "gobject_ffi/v2_76"]
5455
log = ["rs-log"]
5556
log_macros = ["log"]
5657
dox = ["ffi/dox", "gobject_ffi/dox", "log_macros"]

glib/gobject-sys/Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ v2_68 = ["v2_66"]
2121
v2_70 = ["v2_68"]
2222
v2_72 = ["v2_70"]
2323
v2_74 = ["v2_72"]
24+
v2_76 = ["v2_74"]
2425

2526
[lib]
2627
name = "gobject_sys"
@@ -62,4 +63,7 @@ version = "2.70"
6263
version = "2.72"
6364

6465
[package.metadata.system-deps.gobject_2_0.v2_74]
65-
version = "2.73"
66+
version = "2.74"
67+
68+
[package.metadata.system-deps.gobject_2_0.v2_76]
69+
version = "2.75"

glib/sys/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ version = "2.70"
6767
version = "2.72"
6868

6969
[package.metadata.system-deps.glib_2_0.v2_74]
70-
version = "2.73"
70+
version = "2.74"
7171

7272
[package.metadata.system-deps.glib_2_0.v2_76]
73-
version = "2.76"
73+
version = "2.75"
7474

7575
[package.metadata.system-deps.gobject_2_0]
7676
name = "gobject-2.0"

pango/Gir.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,8 @@ concurrency = "send+sync"
335335
name = "Pango.Language"
336336
status = "generate"
337337
[[object.function]]
338-
pattern = "get_(scripts|preferred)"
339-
manual = true # probably needs annotation fixes upstream (array zero-terminated=1)
338+
pattern = "get_scripts"
339+
manual = true # enum arrays don't seem to be possible to be autogenerated
340340
[[object.function]]
341341
pattern = "(get_sample_string|includes_script|matches|to_string)"
342342
[[object.function.parameter]]

pango/src/auto/language.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ impl Language {
6969
pub fn default() -> Language {
7070
unsafe { from_glib_none(ffi::pango_language_get_default()) }
7171
}
72+
73+
#[cfg(any(feature = "v1_48", feature = "dox"))]
74+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_48")))]
75+
#[doc(alias = "pango_language_get_preferred")]
76+
#[doc(alias = "get_preferred")]
77+
pub fn preferred() -> Vec<Language> {
78+
unsafe { FromGlibPtrContainer::from_glib_none(ffi::pango_language_get_preferred()) }
79+
}
7280
}
7381

7482
impl fmt::Display for Language {

pango/src/language.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,6 @@ impl Language {
3030
ret
3131
}
3232
}
33-
34-
#[cfg(any(feature = "v1_48", feature = "dox"))]
35-
#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_48")))]
36-
#[doc(alias = "get_preferred")]
37-
#[doc(alias = "pango_language_get_preferred")]
38-
pub fn preferred() -> Vec<Self> {
39-
unsafe {
40-
let ptr = ffi::pango_language_get_preferred();
41-
Self::from_glib_full_as_vec(ptr)
42-
}
43-
}
4433
}
4534

4635
impl FromStr for Language {

0 commit comments

Comments
 (0)