Merge pull request #660 from EPashkin/regen

Regen

Author: GuillaumeGomez

Cargo.toml

@@ -30,6 +30,8 @@ purge-lgpl-docs = ["gtk-rs-lgpl-docs", "gdk/purge-lgpl-docs"]
 v3_22 = ["v3_20", "gtk-sys/v3_22", "gdk/v3_22"]
 v3_22_20 = ["v3_22", "gtk-sys/v3_22_26", "gdk/v3_22"]
 v3_22_26 = ["v3_22_20", "gtk-sys/v3_22_26", "gdk/v3_22"]
+v3_22_27 = ["v3_22_26", "gtk-sys/v3_22_27"]
+v3_22_29 = ["v3_22_27", "gtk-sys/v3_22_29"]
 v3_12 = ["v3_10", "gtk-sys/v3_12", "gdk/v3_12"]
 v3_8 = ["v3_6", "gtk-sys/v3_8", "gdk/v3_8"]
 embed-lgpl-docs = ["gtk-rs-lgpl-docs", "gdk/embed-lgpl-docs"]

Gir.toml

@@ -96,7 +96,6 @@ generate = [
     "Gtk.IconViewDropPosition",
     "Gtk.ImageMenuItem",
     "Gtk.ImageType",
-    "Gtk.InfoBar",
     "Gtk.Invisible",
     "Gtk.IMMulticontext",
     "Gtk.IMPreeditStyle",
@@ -906,6 +905,13 @@ status = "generate"
     name = "input-purpose"
     version = "3.6"
 
+[[object]]
+name = "Gtk.InfoBar"
+status = "generate"
+    [[object.property]]
+    name = "revealed"
+    version = "3.22.29"
+
 [[object]]
 name = "Gtk.InputHints"
 status = "generate"

gir

@@ -371,6 +371,12 @@ pub trait EntryExt {
 
     fn emit_insert_at_cursor(&self, string: &str);
 
+    #[cfg(any(feature = "v3_22_27", feature = "dox"))]
+    fn connect_insert_emoji<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
+
+    #[cfg(any(feature = "v3_22_27", feature = "dox"))]
+    fn emit_insert_emoji(&self);
+
     fn connect_move_cursor<F: Fn(&Self, MovementStep, i32, bool) + 'static>(&self, f: F) -> SignalHandlerId;
 
     fn emit_move_cursor(&self, step: MovementStep, count: i32, extend_selection: bool);
@@ -1429,6 +1435,20 @@ impl<O: IsA<Entry> + IsA<glib::object::Object> + glib::object::ObjectExt> EntryE
         let _ = self.emit("insert-at-cursor", &[&string]).unwrap();
     }
 
+    #[cfg(any(feature = "v3_22_27", feature = "dox"))]
+    fn connect_insert_emoji<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
+        unsafe {
+            let f: Box_<Box_<Fn(&Self) + 'static>> = Box_::new(Box_::new(f));
+            connect(self.to_glib_none().0, "insert-emoji",
+                transmute(insert_emoji_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
+        }
+    }
+
+    #[cfg(any(feature = "v3_22_27", feature = "dox"))]
+    fn emit_insert_emoji(&self) {
+        let _ = self.emit("insert-emoji", &[]).unwrap();
+    }
+
     fn connect_move_cursor<F: Fn(&Self, MovementStep, i32, bool) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe {
             let f: Box_<Box_<Fn(&Self, MovementStep, i32, bool) + 'static>> = Box_::new(Box_::new(f));
@@ -1931,6 +1951,14 @@ where P: IsA<Entry> {
     f(&Entry::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(string))
 }
 
+#[cfg(any(feature = "v3_22_27", feature = "dox"))]
+unsafe extern "C" fn insert_emoji_trampoline<P>(this: *mut ffi::GtkEntry, f: glib_ffi::gpointer)
+where P: IsA<Entry> {
+    callback_guard!();
+    let f: &&(Fn(&P) + 'static) = transmute(f);
+    f(&Entry::from_glib_borrow(this).downcast_unchecked())
+}
+
 unsafe extern "C" fn move_cursor_trampoline<P>(this: *mut ffi::GtkEntry, step: ffi::GtkMovementStep, count: libc::c_int, extend_selection: glib_ffi::gboolean, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
     callback_guard!();

gir-files

@@ -2250,6 +2250,7 @@ pub enum License {
     Lgpl21Only,
     Lgpl30Only,
     Agpl30,
+    Agpl30Only,
     #[doc(hidden)]
     __Unknown(i32),
 }
@@ -2274,6 +2275,7 @@ impl ToGlib for License {
             License::Lgpl21Only => ffi::GTK_LICENSE_LGPL_2_1_ONLY,
             License::Lgpl30Only => ffi::GTK_LICENSE_LGPL_3_0_ONLY,
             License::Agpl30 => ffi::GTK_LICENSE_AGPL_3_0,
+            License::Agpl30Only => ffi::GTK_LICENSE_AGPL_3_0_ONLY,
             License::__Unknown(value) => value
         }
     }
@@ -2298,6 +2300,7 @@ impl FromGlib<ffi::GtkLicense> for License {
             11 => License::Lgpl21Only,
             12 => License::Lgpl30Only,
             13 => License::Agpl30,
+            14 => License::Agpl30Only,
             value => License::__Unknown(value),
         }
     }

src/auto/entry.rs

@@ -54,6 +54,7 @@ impl Default for FontButton {
 }
 
 pub trait FontButtonExt {
+    #[cfg_attr(feature = "v3_22", deprecated)]
     fn get_font_name(&self) -> Option<String>;
 
     fn get_show_size(&self) -> bool;
@@ -66,6 +67,7 @@ pub trait FontButtonExt {
 
     fn get_use_size(&self) -> bool;
 
+    #[cfg_attr(feature = "v3_22", deprecated)]
     fn set_font_name(&self, fontname: &str) -> bool;
 
     fn set_show_size(&self, show_size: bool);
@@ -80,6 +82,7 @@ pub trait FontButtonExt {
 
     fn connect_font_set<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
+    #[cfg_attr(feature = "v3_22", deprecated)]
     fn connect_property_font_name_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
     fn connect_property_show_size_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;

src/auto/enums.rs

@@ -275,20 +275,20 @@ impl<O: IsA<IconInfo> + IsA<glib::object::Object> + Clone + 'static> IconInfoExt
 
         let fg = fg.clone();
         let success_color = success_color.into();
-        let success_color = success_color.cloned();
+        let success_color = success_color.map(ToOwned::to_owned);
         let warning_color = warning_color.into();
-        let warning_color = warning_color.cloned();
+        let warning_color = warning_color.map(ToOwned::to_owned);
         let error_color = error_color.into();
-        let error_color = error_color.cloned();
+        let error_color = error_color.map(ToOwned::to_owned);
         GioFuture::new(self, move |obj, send| {
             let cancellable = gio::Cancellable::new();
             let send = SendCell::new(send);
             let obj_clone = SendCell::new(obj.clone());
             obj.load_symbolic_async(
                  &fg,
-                 success_color.as_ref(),
-                 warning_color.as_ref(),
-                 error_color.as_ref(),
+                 success_color.as_ref().map(::std::borrow::Borrow::borrow),
+                 warning_color.as_ref().map(::std::borrow::Borrow::borrow),
+                 error_color.as_ref().map(::std::borrow::Borrow::borrow),
                  Some(&cancellable),
                  move |res| {
                      let obj = obj_clone.into_inner();

src/auto/font_button.rs

@@ -340,7 +340,7 @@ impl<O: IsA<IconView> + IsA<glib::object::Object> + glib::object::ObjectExt> Ico
             let mut path = ptr::null_mut();
             let mut cell = ptr::null_mut();
             let ret = from_glib(ffi::gtk_icon_view_get_item_at_pos(self.to_glib_none().0, x, y, &mut path, &mut cell));
-            if ret { Some((from_glib_full(path), from_glib_full(cell))) } else { None }
+            if ret { Some((from_glib_full(path), from_glib_none(cell))) } else { None }
         }
     }
 

src/auto/icon_info.rs

@@ -64,6 +64,9 @@ pub trait InfoBarExt {
 
     fn get_message_type(&self) -> MessageType;
 
+    #[cfg(any(feature = "v3_22_29", feature = "dox"))]
+    fn get_revealed(&self) -> bool;
+
     #[cfg(any(feature = "v3_10", feature = "dox"))]
     fn get_show_close_button(&self) -> bool;
 
@@ -75,6 +78,9 @@ pub trait InfoBarExt {
 
     fn set_response_sensitive(&self, response_id: i32, setting: bool);
 
+    #[cfg(any(feature = "v3_22_29", feature = "dox"))]
+    fn set_revealed(&self, revealed: bool);
+
     #[cfg(any(feature = "v3_10", feature = "dox"))]
     fn set_show_close_button(&self, setting: bool);
 
@@ -86,6 +92,9 @@ pub trait InfoBarExt {
 
     fn connect_property_message_type_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
+    #[cfg(any(feature = "v3_22_29", feature = "dox"))]
+    fn connect_property_revealed_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
+
     #[cfg(any(feature = "v3_10", feature = "dox"))]
     fn connect_property_show_close_button_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 }
@@ -125,6 +134,13 @@ impl<O: IsA<InfoBar> + IsA<glib::object::Object> + glib::object::ObjectExt> Info
         }
     }
 
+    #[cfg(any(feature = "v3_22_29", feature = "dox"))]
+    fn get_revealed(&self) -> bool {
+        unsafe {
+            from_glib(ffi::gtk_info_bar_get_revealed(self.to_glib_none().0))
+        }
+    }
+
     #[cfg(any(feature = "v3_10", feature = "dox"))]
     fn get_show_close_button(&self) -> bool {
         unsafe {
@@ -156,6 +172,13 @@ impl<O: IsA<InfoBar> + IsA<glib::object::Object> + glib::object::ObjectExt> Info
         }
     }
 
+    #[cfg(any(feature = "v3_22_29", feature = "dox"))]
+    fn set_revealed(&self, revealed: bool) {
+        unsafe {
+            ffi::gtk_info_bar_set_revealed(self.to_glib_none().0, revealed.to_glib());
+        }
+    }
+
     #[cfg(any(feature = "v3_10", feature = "dox"))]
     fn set_show_close_button(&self, setting: bool) {
         unsafe {
@@ -191,6 +214,15 @@ impl<O: IsA<InfoBar> + IsA<glib::object::Object> + glib::object::ObjectExt> Info
         }
     }
 
+    #[cfg(any(feature = "v3_22_29", feature = "dox"))]
+    fn connect_property_revealed_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
+        unsafe {
+            let f: Box_<Box_<Fn(&Self) + 'static>> = Box_::new(Box_::new(f));
+            connect(self.to_glib_none().0, "notify::revealed",
+                transmute(notify_revealed_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
+        }
+    }
+
     #[cfg(any(feature = "v3_10", feature = "dox"))]
     fn connect_property_show_close_button_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe {
@@ -222,6 +254,14 @@ where P: IsA<InfoBar> {
     f(&InfoBar::from_glib_borrow(this).downcast_unchecked())
 }
 
+#[cfg(any(feature = "v3_22_29", feature = "dox"))]
+unsafe extern "C" fn notify_revealed_trampoline<P>(this: *mut ffi::GtkInfoBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
+where P: IsA<InfoBar> {
+    callback_guard!();
+    let f: &&(Fn(&P) + 'static) = transmute(f);
+    f(&InfoBar::from_glib_borrow(this).downcast_unchecked())
+}
+
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn notify_show_close_button_trampoline<P>(this: *mut ffi::GtkInfoBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<InfoBar> {

src/auto/icon_view.rs

@@ -2,6 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use Actionable;
 use Bin;
 use Buildable;
 use Container;
@@ -10,18 +11,22 @@ use ffi;
 use glib;
 use glib::object::Downcast;
 use glib::object::IsA;
+#[cfg(any(feature = "v3_10", feature = "dox"))]
 use glib::signal::SignalHandlerId;
+#[cfg(any(feature = "v3_10", feature = "dox"))]
 use glib::signal::connect;
 use glib::translate::*;
 use glib_ffi;
 use gobject_ffi;
+#[cfg(any(feature = "v3_10", feature = "dox"))]
 use std::boxed::Box as Box_;
 use std::mem;
+#[cfg(any(feature = "v3_10", feature = "dox"))]
 use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct ListBoxRow(Object<ffi::GtkListBoxRow, ffi::GtkListBoxRowClass>): Bin, Container, Widget, Buildable;
+    pub struct ListBoxRow(Object<ffi::GtkListBoxRow, ffi::GtkListBoxRowClass>): Bin, Container, Widget, Buildable, Actionable;
 
     match fn {
         get_type => || ffi::gtk_list_box_row_get_type(),
@@ -73,8 +78,10 @@ pub trait ListBoxRowExt {
     #[cfg(any(feature = "v3_14", feature = "dox"))]
     fn set_selectable(&self, selectable: bool);
 
+    #[cfg(any(feature = "v3_10", feature = "dox"))]
     fn connect_activate<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
+    #[cfg(any(feature = "v3_10", feature = "dox"))]
     fn emit_activate(&self);
 
     #[cfg(any(feature = "v3_14", feature = "dox"))]
@@ -150,6 +157,7 @@ impl<O: IsA<ListBoxRow> + IsA<glib::object::Object> + glib::object::ObjectExt> L
         }
     }
 
+    #[cfg(any(feature = "v3_10", feature = "dox"))]
     fn connect_activate<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe {
             let f: Box_<Box_<Fn(&Self) + 'static>> = Box_::new(Box_::new(f));
@@ -158,6 +166,7 @@ impl<O: IsA<ListBoxRow> + IsA<glib::object::Object> + glib::object::ObjectExt> L
         }
     }
 
+    #[cfg(any(feature = "v3_10", feature = "dox"))]
     fn emit_activate(&self) {
         let _ = self.emit("activate", &[]).unwrap();
     }
@@ -181,6 +190,7 @@ impl<O: IsA<ListBoxRow> + IsA<glib::object::Object> + glib::object::ObjectExt> L
     }
 }
 
+#[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn activate_trampoline<P>(this: *mut ffi::GtkListBoxRow, f: glib_ffi::gpointer)
 where P: IsA<ListBoxRow> {
     callback_guard!();

src/auto/info_bar.rs

@@ -77,7 +77,7 @@ impl StatusIcon {
         }
     }
 
-    #[cfg_attr(feature = "v3_10", deprecated)]
+    #[cfg_attr(feature = "v3_14", deprecated)]
     pub fn new_from_stock(stock_id: &str) -> StatusIcon {
         assert_initialized_main_thread!();
         unsafe {

src/auto/list_box_row.rs

@@ -176,7 +176,7 @@ pub trait TreeViewExt {
 
     //fn insert_column_with_data_func<P: IsA<CellRenderer>, Q: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, position: i32, title: &str, cell: &P, func: /*Unknown conversion*//*Unimplemented*/TreeCellDataFunc, data: Q, dnotify: /*Unknown conversion*//*Unimplemented*/DestroyNotify) -> i32;
 
-    fn is_blank_at_pos(&self, x: i32, y: i32) -> Option<(TreePath, TreeViewColumn, i32, i32)>;
+    fn is_blank_at_pos(&self, x: i32, y: i32) -> Option<(Option<TreePath>, Option<TreeViewColumn>, i32, i32)>;
 
     fn is_rubber_banding_active(&self) -> bool;
 
@@ -712,14 +712,14 @@ impl<O: IsA<TreeView> + IsA<glib::object::Object> + glib::object::ObjectExt> Tre
     //    unsafe { TODO: call ffi::gtk_tree_view_insert_column_with_data_func() }
     //}
 
-    fn is_blank_at_pos(&self, x: i32, y: i32) -> Option<(TreePath, TreeViewColumn, i32, i32)> {
+    fn is_blank_at_pos(&self, x: i32, y: i32) -> Option<(Option<TreePath>, Option<TreeViewColumn>, i32, i32)> {
         unsafe {
             let mut path = ptr::null_mut();
             let mut column = ptr::null_mut();
             let mut cell_x = mem::uninitialized();
             let mut cell_y = mem::uninitialized();
             let ret = from_glib(ffi::gtk_tree_view_is_blank_at_pos(self.to_glib_none().0, x, y, &mut path, &mut column, &mut cell_x, &mut cell_y));
-            if ret { Some((from_glib_full(path), from_glib_full(column), cell_x, cell_y)) } else { None }
+            if ret { Some((from_glib_full(path), from_glib_none(column), cell_x, cell_y)) } else { None }
         }
     }
 

src/auto/status_icon.rs

@@ -1,4 +1,4 @@
 All files in this directory
-were generated by gir (https://github.com/gtk-rs/gir @ 5ec9961)
-from gir-files (https://github.com/gtk-rs/gir-files @ 3fde76b)
+were generated by gir (https://github.com/gtk-rs/gir @ c530bb9)
+from gir-files (https://github.com/gtk-rs/gir-files @ a788da4)
 DO NOT EDIT THEM

src/auto/tree_view.rs

@@ -29,6 +29,7 @@ macro_rules! to_u16 {
     )
 }
 
+#[cfg_attr(feature = "cargo-clippy", allow(cast_lossless))]
 impl EntryBuffer {
     pub fn new(initial_chars: Option<&str>) -> EntryBuffer {
         assert_initialized_main_thread!();

src/auto/versions.txt

@@ -19,8 +19,8 @@ impl TargetEntry {
         assert_initialized_main_thread!();
         TargetEntry {
             target: target.to_owned(),
-            flags: flags,
-            info: info,
+            flags,
+            info,
         }
     }