Skip to content

Commit 3c0e253

Browse files
Regenerate with latest gir-files
1 parent 1bd7eb3 commit 3c0e253

File tree

173 files changed

+2543
-6288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+2543
-6288
lines changed

gdk-pixbuf/src/auto/pixbuf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ impl Pixbuf {
660660
unsafe { FromGlibPtrContainer::from_glib_container(ffi::gdk_pixbuf_get_formats()) }
661661
}
662662

663-
#[cfg(any(feature = "v2_40"))]
663+
#[cfg(feature = "v2_40")]
664664
#[cfg_attr(docsrs, doc(cfg(feature = "v2_40")))]
665665
#[doc(alias = "gdk_pixbuf_init_modules")]
666666
pub fn init_modules(path: &str) -> Result<(), glib::Error> {

gdk-pixbuf/src/auto/pixbuf_animation.rs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -137,28 +137,15 @@ impl PixbufAnimation {
137137
}
138138
}
139139

140-
pub trait PixbufAnimationExt: 'static {
140+
pub trait PixbufAnimationExt: IsA<PixbufAnimation> + 'static {
141141
#[doc(alias = "gdk_pixbuf_animation_get_height")]
142142
#[doc(alias = "get_height")]
143-
fn height(&self) -> i32;
144-
145-
#[doc(alias = "gdk_pixbuf_animation_get_static_image")]
146-
#[doc(alias = "get_static_image")]
147-
fn static_image(&self) -> Option<Pixbuf>;
148-
149-
#[doc(alias = "gdk_pixbuf_animation_get_width")]
150-
#[doc(alias = "get_width")]
151-
fn width(&self) -> i32;
152-
153-
#[doc(alias = "gdk_pixbuf_animation_is_static_image")]
154-
fn is_static_image(&self) -> bool;
155-
}
156-
157-
impl<O: IsA<PixbufAnimation>> PixbufAnimationExt for O {
158143
fn height(&self) -> i32 {
159144
unsafe { ffi::gdk_pixbuf_animation_get_height(self.as_ref().to_glib_none().0) }
160145
}
161146

147+
#[doc(alias = "gdk_pixbuf_animation_get_static_image")]
148+
#[doc(alias = "get_static_image")]
162149
fn static_image(&self) -> Option<Pixbuf> {
163150
unsafe {
164151
from_glib_none(ffi::gdk_pixbuf_animation_get_static_image(
@@ -167,10 +154,13 @@ impl<O: IsA<PixbufAnimation>> PixbufAnimationExt for O {
167154
}
168155
}
169156

157+
#[doc(alias = "gdk_pixbuf_animation_get_width")]
158+
#[doc(alias = "get_width")]
170159
fn width(&self) -> i32 {
171160
unsafe { ffi::gdk_pixbuf_animation_get_width(self.as_ref().to_glib_none().0) }
172161
}
173162

163+
#[doc(alias = "gdk_pixbuf_animation_is_static_image")]
174164
fn is_static_image(&self) -> bool {
175165
unsafe {
176166
from_glib(ffi::gdk_pixbuf_animation_is_static_image(
@@ -180,6 +170,8 @@ impl<O: IsA<PixbufAnimation>> PixbufAnimationExt for O {
180170
}
181171
}
182172

173+
impl<O: IsA<PixbufAnimation>> PixbufAnimationExt for O {}
174+
183175
impl fmt::Display for PixbufAnimation {
184176
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
185177
f.write_str("PixbufAnimation")

gdk-pixbuf/src/auto/pixbuf_loader.rs

Lines changed: 16 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -63,48 +63,8 @@ impl Default for PixbufLoader {
6363
}
6464
}
6565

66-
pub trait PixbufLoaderExt: 'static {
66+
pub trait PixbufLoaderExt: IsA<PixbufLoader> + 'static {
6767
#[doc(alias = "gdk_pixbuf_loader_close")]
68-
fn close(&self) -> Result<(), glib::Error>;
69-
70-
#[doc(alias = "gdk_pixbuf_loader_get_animation")]
71-
#[doc(alias = "get_animation")]
72-
fn animation(&self) -> Option<PixbufAnimation>;
73-
74-
#[doc(alias = "gdk_pixbuf_loader_get_format")]
75-
#[doc(alias = "get_format")]
76-
fn format(&self) -> Option<PixbufFormat>;
77-
78-
#[doc(alias = "gdk_pixbuf_loader_get_pixbuf")]
79-
#[doc(alias = "get_pixbuf")]
80-
fn pixbuf(&self) -> Option<Pixbuf>;
81-
82-
#[doc(alias = "gdk_pixbuf_loader_set_size")]
83-
fn set_size(&self, width: i32, height: i32);
84-
85-
#[doc(alias = "gdk_pixbuf_loader_write")]
86-
fn write(&self, buf: &[u8]) -> Result<(), glib::Error>;
87-
88-
#[doc(alias = "gdk_pixbuf_loader_write_bytes")]
89-
fn write_bytes(&self, buffer: &glib::Bytes) -> Result<(), glib::Error>;
90-
91-
#[doc(alias = "area-prepared")]
92-
fn connect_area_prepared<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
93-
94-
#[doc(alias = "area-updated")]
95-
fn connect_area_updated<F: Fn(&Self, i32, i32, i32, i32) + 'static>(
96-
&self,
97-
f: F,
98-
) -> SignalHandlerId;
99-
100-
#[doc(alias = "closed")]
101-
fn connect_closed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
102-
103-
#[doc(alias = "size-prepared")]
104-
fn connect_size_prepared<F: Fn(&Self, i32, i32) + 'static>(&self, f: F) -> SignalHandlerId;
105-
}
106-
107-
impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
10868
fn close(&self) -> Result<(), glib::Error> {
10969
unsafe {
11070
let mut error = ptr::null_mut();
@@ -118,6 +78,8 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
11878
}
11979
}
12080

81+
#[doc(alias = "gdk_pixbuf_loader_get_animation")]
82+
#[doc(alias = "get_animation")]
12183
fn animation(&self) -> Option<PixbufAnimation> {
12284
unsafe {
12385
from_glib_none(ffi::gdk_pixbuf_loader_get_animation(
@@ -126,6 +88,8 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
12688
}
12789
}
12890

91+
#[doc(alias = "gdk_pixbuf_loader_get_format")]
92+
#[doc(alias = "get_format")]
12993
fn format(&self) -> Option<PixbufFormat> {
13094
unsafe {
13195
from_glib_none(ffi::gdk_pixbuf_loader_get_format(
@@ -134,6 +98,8 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
13498
}
13599
}
136100

101+
#[doc(alias = "gdk_pixbuf_loader_get_pixbuf")]
102+
#[doc(alias = "get_pixbuf")]
137103
fn pixbuf(&self) -> Option<Pixbuf> {
138104
unsafe {
139105
from_glib_none(ffi::gdk_pixbuf_loader_get_pixbuf(
@@ -142,12 +108,14 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
142108
}
143109
}
144110

111+
#[doc(alias = "gdk_pixbuf_loader_set_size")]
145112
fn set_size(&self, width: i32, height: i32) {
146113
unsafe {
147114
ffi::gdk_pixbuf_loader_set_size(self.as_ref().to_glib_none().0, width, height);
148115
}
149116
}
150117

118+
#[doc(alias = "gdk_pixbuf_loader_write")]
151119
fn write(&self, buf: &[u8]) -> Result<(), glib::Error> {
152120
let count = buf.len() as _;
153121
unsafe {
@@ -167,6 +135,7 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
167135
}
168136
}
169137

138+
#[doc(alias = "gdk_pixbuf_loader_write_bytes")]
170139
fn write_bytes(&self, buffer: &glib::Bytes) -> Result<(), glib::Error> {
171140
unsafe {
172141
let mut error = ptr::null_mut();
@@ -184,6 +153,7 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
184153
}
185154
}
186155

156+
#[doc(alias = "area-prepared")]
187157
fn connect_area_prepared<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
188158
unsafe extern "C" fn area_prepared_trampoline<P: IsA<PixbufLoader>, F: Fn(&P) + 'static>(
189159
this: *mut ffi::GdkPixbufLoader,
@@ -205,6 +175,7 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
205175
}
206176
}
207177

178+
#[doc(alias = "area-updated")]
208179
fn connect_area_updated<F: Fn(&Self, i32, i32, i32, i32) + 'static>(
209180
&self,
210181
f: F,
@@ -242,6 +213,7 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
242213
}
243214
}
244215

216+
#[doc(alias = "closed")]
245217
fn connect_closed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
246218
unsafe extern "C" fn closed_trampoline<P: IsA<PixbufLoader>, F: Fn(&P) + 'static>(
247219
this: *mut ffi::GdkPixbufLoader,
@@ -263,6 +235,7 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
263235
}
264236
}
265237

238+
#[doc(alias = "size-prepared")]
266239
fn connect_size_prepared<F: Fn(&Self, i32, i32) + 'static>(&self, f: F) -> SignalHandlerId {
267240
unsafe extern "C" fn size_prepared_trampoline<
268241
P: IsA<PixbufLoader>,
@@ -294,6 +267,8 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
294267
}
295268
}
296269

270+
impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {}
271+
297272
impl fmt::Display for PixbufLoader {
298273
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
299274
f.write_str("PixbufLoader")

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 @ 6a0603f52c3c)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ b42700b30bb2)
1+
Generated by gir (https://github.com/gtk-rs/gir @ bf8c5e344a73)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 43cac7495ff5)

gdk-pixbuf/sys/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ extern "C" {
541541
error: *mut *mut glib::GError,
542542
) -> *mut GdkPixbufFormat;
543543
pub fn gdk_pixbuf_get_formats() -> *mut glib::GSList;
544-
#[cfg(any(feature = "v2_40"))]
544+
#[cfg(feature = "v2_40")]
545545
#[cfg_attr(docsrs, doc(cfg(feature = "v2_40")))]
546546
pub fn gdk_pixbuf_init_modules(path: *const c_char, error: *mut *mut glib::GError) -> gboolean;
547547
pub fn gdk_pixbuf_new_from_stream_async(

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 @ 6a0603f52c3c)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ b42700b30bb2)
1+
Generated by gir (https://github.com/gtk-rs/gir @ bf8c5e344a73)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 43cac7495ff5)

gio/src/auto/action.rs

Lines changed: 21 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -63,74 +63,35 @@ impl Action {
6363
}
6464
}
6565

66-
pub trait ActionExt: 'static {
66+
pub trait ActionExt: IsA<Action> + 'static {
6767
#[doc(alias = "g_action_activate")]
68-
fn activate(&self, parameter: Option<&glib::Variant>);
69-
70-
#[doc(alias = "g_action_change_state")]
71-
fn change_state(&self, value: &glib::Variant);
72-
73-
#[doc(alias = "g_action_get_enabled")]
74-
#[doc(alias = "get_enabled")]
75-
fn is_enabled(&self) -> bool;
76-
77-
#[doc(alias = "g_action_get_name")]
78-
#[doc(alias = "get_name")]
79-
fn name(&self) -> glib::GString;
80-
81-
#[doc(alias = "g_action_get_parameter_type")]
82-
#[doc(alias = "get_parameter_type")]
83-
fn parameter_type(&self) -> Option<glib::VariantType>;
84-
85-
#[doc(alias = "g_action_get_state")]
86-
#[doc(alias = "get_state")]
87-
fn state(&self) -> Option<glib::Variant>;
88-
89-
#[doc(alias = "g_action_get_state_hint")]
90-
#[doc(alias = "get_state_hint")]
91-
fn state_hint(&self) -> Option<glib::Variant>;
92-
93-
#[doc(alias = "g_action_get_state_type")]
94-
#[doc(alias = "get_state_type")]
95-
fn state_type(&self) -> Option<glib::VariantType>;
96-
97-
#[doc(alias = "enabled")]
98-
fn connect_enabled_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
99-
100-
#[doc(alias = "name")]
101-
fn connect_name_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
102-
103-
#[doc(alias = "parameter-type")]
104-
fn connect_parameter_type_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
105-
106-
#[doc(alias = "state")]
107-
fn connect_state_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
108-
109-
#[doc(alias = "state-type")]
110-
fn connect_state_type_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
111-
}
112-
113-
impl<O: IsA<Action>> ActionExt for O {
11468
fn activate(&self, parameter: Option<&glib::Variant>) {
11569
unsafe {
11670
ffi::g_action_activate(self.as_ref().to_glib_none().0, parameter.to_glib_none().0);
11771
}
11872
}
11973

74+
#[doc(alias = "g_action_change_state")]
12075
fn change_state(&self, value: &glib::Variant) {
12176
unsafe {
12277
ffi::g_action_change_state(self.as_ref().to_glib_none().0, value.to_glib_none().0);
12378
}
12479
}
12580

81+
#[doc(alias = "g_action_get_enabled")]
82+
#[doc(alias = "get_enabled")]
12683
fn is_enabled(&self) -> bool {
12784
unsafe { from_glib(ffi::g_action_get_enabled(self.as_ref().to_glib_none().0)) }
12885
}
12986

87+
#[doc(alias = "g_action_get_name")]
88+
#[doc(alias = "get_name")]
13089
fn name(&self) -> glib::GString {
13190
unsafe { from_glib_none(ffi::g_action_get_name(self.as_ref().to_glib_none().0)) }
13291
}
13392

93+
#[doc(alias = "g_action_get_parameter_type")]
94+
#[doc(alias = "get_parameter_type")]
13495
fn parameter_type(&self) -> Option<glib::VariantType> {
13596
unsafe {
13697
from_glib_none(ffi::g_action_get_parameter_type(
@@ -139,18 +100,25 @@ impl<O: IsA<Action>> ActionExt for O {
139100
}
140101
}
141102

103+
#[doc(alias = "g_action_get_state")]
104+
#[doc(alias = "get_state")]
142105
fn state(&self) -> Option<glib::Variant> {
143106
unsafe { from_glib_full(ffi::g_action_get_state(self.as_ref().to_glib_none().0)) }
144107
}
145108

109+
#[doc(alias = "g_action_get_state_hint")]
110+
#[doc(alias = "get_state_hint")]
146111
fn state_hint(&self) -> Option<glib::Variant> {
147112
unsafe { from_glib_full(ffi::g_action_get_state_hint(self.as_ref().to_glib_none().0)) }
148113
}
149114

115+
#[doc(alias = "g_action_get_state_type")]
116+
#[doc(alias = "get_state_type")]
150117
fn state_type(&self) -> Option<glib::VariantType> {
151118
unsafe { from_glib_none(ffi::g_action_get_state_type(self.as_ref().to_glib_none().0)) }
152119
}
153120

121+
#[doc(alias = "enabled")]
154122
fn connect_enabled_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
155123
unsafe extern "C" fn notify_enabled_trampoline<P: IsA<Action>, F: Fn(&P) + 'static>(
156124
this: *mut ffi::GAction,
@@ -173,6 +141,7 @@ impl<O: IsA<Action>> ActionExt for O {
173141
}
174142
}
175143

144+
#[doc(alias = "name")]
176145
fn connect_name_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
177146
unsafe extern "C" fn notify_name_trampoline<P: IsA<Action>, F: Fn(&P) + 'static>(
178147
this: *mut ffi::GAction,
@@ -195,6 +164,7 @@ impl<O: IsA<Action>> ActionExt for O {
195164
}
196165
}
197166

167+
#[doc(alias = "parameter-type")]
198168
fn connect_parameter_type_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
199169
unsafe extern "C" fn notify_parameter_type_trampoline<
200170
P: IsA<Action>,
@@ -220,6 +190,7 @@ impl<O: IsA<Action>> ActionExt for O {
220190
}
221191
}
222192

193+
#[doc(alias = "state")]
223194
fn connect_state_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
224195
unsafe extern "C" fn notify_state_trampoline<P: IsA<Action>, F: Fn(&P) + 'static>(
225196
this: *mut ffi::GAction,
@@ -242,6 +213,7 @@ impl<O: IsA<Action>> ActionExt for O {
242213
}
243214
}
244215

216+
#[doc(alias = "state-type")]
245217
fn connect_state_type_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
246218
unsafe extern "C" fn notify_state_type_trampoline<P: IsA<Action>, F: Fn(&P) + 'static>(
247219
this: *mut ffi::GAction,
@@ -265,6 +237,8 @@ impl<O: IsA<Action>> ActionExt for O {
265237
}
266238
}
267239

240+
impl<O: IsA<Action>> ActionExt for O {}
241+
268242
impl fmt::Display for Action {
269243
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
270244
f.write_str("Action")

0 commit comments

Comments
 (0)