Merge pull request #429 from GuillaumeGomez/regen

Regen

Author: sdroege

Gir.toml

@@ -286,6 +286,38 @@ status = "generate"
     [[object.function]]
     name = "intern_string"
     ignore = true
+    [[object.function]]
+    # Pid conversion issue
+    name = "child_watch_add"
+    ignore = true
+    [[object.function]]
+    # Pid conversion issue
+    name = "child_watch_add_full"
+    ignore = true
+    [[object.function]]
+    name = "idle_add"
+    ignore = true
+    [[object.function]]
+    name = "idle_add_full"
+    ignore = true
+    [[object.function]]
+    name = "timeout_add"
+    ignore = true
+    [[object.function]]
+    name = "timeout_add_full"
+    ignore = true
+    [[object.function]]
+    name = "timeout_add_seconds"
+    ignore = true
+    [[object.function]]
+    name = "timeout_add_seconds_full"
+    ignore = true
+    [[object.function]]
+    name = "unix_signal_add"
+    ignore = true
+    [[object.function]]
+    name = "unix_signal_add_full"
+    ignore = true
     [[object.constant]]
     pattern = "DIR_SEPARATOR(_S)?"
     #not cross-platform
@@ -423,6 +455,12 @@ concurrency = "send+sync"
        name = "ref_thread_default"
            [object.function.return]
            nullable = false
+       [[object.function]]
+       name = "invoke"
+       ignore = true
+       [[object.function]]
+       name = "invoke_full"
+       ignore = true
 
 [[object]]
 name = "GLib.MainLoop"

gir

@@ -31,7 +31,7 @@ impl DateTime {
     }
 
     #[cfg(any(feature = "v2_56", feature = "dox"))]
-    pub fn new_from_iso8601<'a, P: Into<Option<&'a TimeZone>>>(text: &str, default_tz: P) -> DateTime {
+    pub fn new_from_iso8601<'a, P: Into<Option<&'a TimeZone>>>(text: &str, default_tz: P) -> Option<DateTime> {
         let default_tz = default_tz.into();
         unsafe {
             from_glib_full(ffi::g_date_time_new_from_iso8601(text.to_glib_none().0, default_tz.to_glib_none().0))

src/auto/date_time.rs

@@ -43,26 +43,18 @@ impl MainContext {
         }
     }
 
-    //pub fn find_source_by_funcs_user_data<P: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, funcs: /*Ignored*/&mut SourceFuncs, user_data: P) -> Option<Source> {
+    //pub fn find_source_by_funcs_user_data(&self, funcs: /*Ignored*/&mut SourceFuncs, user_data: /*Unimplemented*/Option<Fundamental: Pointer>) -> Option<Source> {
     //    unsafe { TODO: call ffi::g_main_context_find_source_by_funcs_user_data() }
     //}
 
-    //pub fn find_source_by_user_data<P: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, user_data: P) -> Option<Source> {
+    //pub fn find_source_by_user_data(&self, user_data: /*Unimplemented*/Option<Fundamental: Pointer>) -> Option<Source> {
     //    unsafe { TODO: call ffi::g_main_context_find_source_by_user_data() }
     //}
 
-    //pub fn get_poll_func(&self) -> /*Unknown conversion*//*Unimplemented*/PollFunc {
+    //pub fn get_poll_func(&self) -> /*Unimplemented*/Fn(/*Ignored*/PollFD, u32, i32) -> i32 {
     //    unsafe { TODO: call ffi::g_main_context_get_poll_func() }
     //}
 
-    //pub fn invoke<P: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, function: /*Unknown conversion*//*Unimplemented*/SourceFunc, data: P) {
-    //    unsafe { TODO: call ffi::g_main_context_invoke() }
-    //}
-
-    //pub fn invoke_full<'a, P: Into<Option</*Unimplemented*/Fundamental: Pointer>>, Q: Into<Option<&'a /*Unimplemented*/DestroyNotify>>>(&self, priority: i32, function: /*Unknown conversion*//*Unimplemented*/SourceFunc, data: P, notify: Q) {
-    //    unsafe { TODO: call ffi::g_main_context_invoke_full() }
-    //}
-
     pub fn is_owner(&self) -> bool {
         unsafe {
             from_glib(ffi::g_main_context_is_owner(self.to_glib_none().0))
@@ -107,7 +99,7 @@ impl MainContext {
     //    unsafe { TODO: call ffi::g_main_context_remove_poll() }
     //}
 
-    //pub fn set_poll_func(&self, func: /*Unknown conversion*//*Unimplemented*/PollFunc) {
+    //pub fn set_poll_func(&self, func: /*Unimplemented*/Fn(/*Ignored*/PollFD, u32, i32) -> i32) {
     //    unsafe { TODO: call ffi::g_main_context_set_poll_func() }
     //}
 

src/auto/functions.rs

@@ -135,11 +135,11 @@ impl Source {
         }
     }
 
-    //pub fn remove_by_funcs_user_data<P: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(funcs: /*Ignored*/&mut SourceFuncs, user_data: P) -> bool {
+    //pub fn remove_by_funcs_user_data(funcs: /*Ignored*/&mut SourceFuncs, user_data: /*Unimplemented*/Option<Fundamental: Pointer>) -> bool {
     //    unsafe { TODO: call ffi::g_source_remove_by_funcs_user_data() }
     //}
 
-    //pub fn remove_by_user_data<P: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(user_data: P) -> bool {
+    //pub fn remove_by_user_data(user_data: /*Unimplemented*/Option<Fundamental: Pointer>) -> bool {
     //    unsafe { TODO: call ffi::g_source_remove_by_user_data() }
     //}
 }

src/auto/main_context.rs

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 3766446)
+Generated by gir (https://github.com/gtk-rs/gir @ f5d3eab)
 from gir-files (https://github.com/gtk-rs/gir-files @ 62f3bf0)

src/auto/source.rs

@@ -59,8 +59,6 @@ impl Binding {
 unsafe impl Send for Binding {}
 unsafe impl Sync for Binding {}
 
-pub const NONE_BINDING: Option<&Binding> = None;
-
 impl fmt::Display for Binding {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "Binding")

src/auto/versions.txt

@@ -3,7 +3,7 @@
 // DO NOT EDIT
 
 mod binding;
-pub use self::binding::{Binding, BindingClass, NONE_BINDING};
+pub use self::binding::{Binding, BindingClass};
 
 mod flags;
 pub use self::flags::BindingFlags;