Merge pull request #437 from EPashkin/disco

Regen

Author: sdroege

Cargo.toml

@@ -43,6 +43,7 @@ v2_50 = ["v2_48", "glib-sys/v2_50"]
 v2_52 = ["v2_50", "glib-sys/v2_52"]
 v2_54 = ["v2_52", "glib-sys/v2_54", "gobject-sys/v2_54"]
 v2_56 = ["v2_54", "glib-sys/v2_56"]
+v2_58 = ["v2_56", "glib-sys/v2_58"]
 futures = ["futures-preview", "v2_36"]
 subclassing = []
 dox = ["glib-sys/dox", "gobject-sys/dox"]

Gir.toml

@@ -318,6 +318,18 @@ status = "generate"
     [[object.function]]
     name = "unix_signal_add_full"
     ignore = true
+    [[object.function]]
+    pattern = "rc_box_.+"
+    #need manual implementation
+    ignore = true
+    [[object.function]]
+    pattern = "ref_count_.+"
+    #need manual implementation
+    ignore = true
+    [[object.function]]
+    pattern = "ref_string_.+"
+    #need manual implementation
+    ignore = true
     [[object.constant]]
     pattern = "DIR_SEPARATOR(_S)?"
     #not cross-platform

gir-files

@@ -208,6 +208,13 @@ impl DateTime {
         }
     }
 
+    #[cfg(any(feature = "v2_58", feature = "dox"))]
+    pub fn get_timezone(&self) -> Option<TimeZone> {
+        unsafe {
+            from_glib_none(ffi::g_date_time_get_timezone(self.to_glib_none().0))
+        }
+    }
+
     pub fn get_timezone_abbreviation(&self) -> Option<GString> {
         unsafe {
             from_glib_none(ffi::g_date_time_get_timezone_abbreviation(self.to_glib_none().0))

src/auto/date_time.rs

@@ -142,6 +142,13 @@ pub fn build_pathv(separator: &str, args: &[&std::path::Path]) -> Option<std::pa
     }
 }
 
+#[cfg(any(feature = "v2_58", feature = "dox"))]
+pub fn canonicalize_filename<P: AsRef<std::path::Path>, Q: AsRef<std::path::Path>>(filename: P, relative_to: Q) -> Option<std::path::PathBuf> {
+    unsafe {
+        from_glib_full(ffi::g_canonicalize_filename(filename.as_ref().to_glib_none().0, relative_to.as_ref().to_glib_none().0))
+    }
+}
+
 pub fn chdir<P: AsRef<std::path::Path>>(path: P) -> i32 {
     unsafe {
         ffi::g_chdir(path.as_ref().to_glib_none().0)
@@ -468,6 +475,13 @@ pub fn get_language_names() -> Vec<GString> {
     }
 }
 
+#[cfg(any(feature = "v2_58", feature = "dox"))]
+pub fn get_language_names_with_category(category_name: &str) -> Vec<GString> {
+    unsafe {
+        FromGlibPtrContainer::from_glib_none(ffi::g_get_language_names_with_category(category_name.to_glib_none().0))
+    }
+}
+
 pub fn get_locale_variants(locale: &str) -> Vec<GString> {
     unsafe {
         FromGlibPtrContainer::from_glib_full(ffi::g_get_locale_variants(locale.to_glib_none().0))
@@ -1032,6 +1046,11 @@ pub fn spaced_primes_closest(num: u32) -> u32 {
 //    unsafe { TODO: call ffi::g_spawn_async() }
 //}
 
+//#[cfg(any(feature = "v2_58", feature = "dox"))]
+//pub fn spawn_async_with_fds<P: AsRef<std::path::Path>>(working_directory: P, argv: &[&str], envp: &[&str], flags: /*Ignored*/SpawnFlags, child_setup: Option<Box<dyn FnOnce() + 'static>>, stdin_fd: i32, stdout_fd: i32, stderr_fd: i32) -> Result<Pid, Error> {
+//    unsafe { TODO: call ffi::g_spawn_async_with_fds() }
+//}
+
 //pub fn spawn_async_with_pipes<P: AsRef<std::path::Path>>(working_directory: P, argv: &[&std::path::Path], envp: &[&std::path::Path], flags: /*Ignored*/SpawnFlags, child_setup: Option<Box<dyn FnOnce() + 'static>>) -> Result<(Pid, i32, i32, i32), Error> {
 //    unsafe { TODO: call ffi::g_spawn_async_with_pipes() }
 //}

src/auto/functions.rs

@@ -103,6 +103,7 @@ impl MainContext {
     //    unsafe { TODO: call ffi::g_main_context_set_poll_func() }
     //}
 
+    //#[cfg_attr(feature = "v2_58", deprecated)]
     //pub fn wait(&self, cond: /*Ignored*/&mut Cond, mutex: /*Ignored*/&mut Mutex) -> bool {
     //    unsafe { TODO: call ffi::g_main_context_wait() }
     //}

src/auto/main_context.rs

@@ -32,6 +32,13 @@ impl TimeZone {
         }
     }
 
+    #[cfg(any(feature = "v2_58", feature = "dox"))]
+    pub fn new_offset(seconds: i32) -> TimeZone {
+        unsafe {
+            from_glib_full(ffi::g_time_zone_new_offset(seconds))
+        }
+    }
+
     pub fn new_utc() -> TimeZone {
         unsafe {
             from_glib_full(ffi::g_time_zone_new_utc())
@@ -50,6 +57,13 @@ impl TimeZone {
         }
     }
 
+    #[cfg(any(feature = "v2_58", feature = "dox"))]
+    pub fn get_identifier(&self) -> Option<GString> {
+        unsafe {
+            from_glib_none(ffi::g_time_zone_get_identifier(self.to_glib_none().0))
+        }
+    }
+
     pub fn get_offset(&self, interval: i32) -> i32 {
         unsafe {
             ffi::g_time_zone_get_offset(self.to_glib_none().0, interval)

src/auto/time_zone.rs

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

src/auto/versions.txt

@@ -39,7 +39,7 @@ impl Closure {
 
     pub unsafe fn new_unsafe<F: Fn(&[Value]) -> Option<Value>>(callback: F) -> Self {
         unsafe extern "C" fn marshal<F>(_closure: *mut gobject_ffi::GClosure, return_value: *mut gobject_ffi::GValue,
-            n_param_values: c_uint, param_values: *mut gobject_ffi::GValue, _invocation_hint: *mut c_void,
+            n_param_values: c_uint, param_values: *const gobject_ffi::GValue, _invocation_hint: *mut c_void,
             marshal_data: *mut c_void)
             where F: Fn(&[Value]) -> Option<Value>
         {

src/closure.rs

@@ -656,6 +656,45 @@ macro_rules! impl_to_glib_container_from_slice_string {
                 }
             }
         }
+        impl<'a> ToGlibContainerFromSlice<'a, *const $ffi_name> for $name {
+            type Storage = (Vec<Stash<'a, $ffi_name, $name>>, Option<Vec<$ffi_name>>);
+
+            fn to_glib_none_from_slice(t: &'a [$name]) -> (*const $ffi_name, Self::Storage) {
+                let v: Vec<_> = t.iter().map(|s| s.to_glib_none()).collect();
+                let mut v_ptr: Vec<_> = v.iter().map(|s| s.0).collect();
+                v_ptr.push(ptr::null_mut() as $ffi_name);
+
+                (v_ptr.as_ptr() as *const $ffi_name, (v, Some(v_ptr)))
+            }
+
+            fn to_glib_container_from_slice(t: &'a [$name]) -> (*const $ffi_name, Self::Storage) {
+                let v: Vec<_> = t.iter().map(|s| s.to_glib_none()).collect();
+
+                let v_ptr = unsafe {
+                    let v_ptr = glib_ffi::g_malloc0(mem::size_of::<$ffi_name>() * (t.len() + 1)) as *mut $ffi_name;
+
+                    for (i, s) in v.iter().enumerate() {
+                        ptr::write(v_ptr.add(i), s.0);
+                    }
+
+                    v_ptr as *const $ffi_name
+                };
+
+                (v_ptr, (v, None))
+            }
+
+            fn to_glib_full_from_slice(t: &[$name]) -> *const $ffi_name {
+                unsafe {
+                    let v_ptr = glib_ffi::g_malloc0(mem::size_of::<$ffi_name>() * (t.len() + 1)) as *mut $ffi_name;
+
+                    for (i, s) in t.iter().enumerate() {
+                        ptr::write(v_ptr.add(i), s.to_glib_full());
+                    }
+
+                    v_ptr as *const $ffi_name
+                }
+            }
+        }
     }
 }