Merge pull request #2838 from cgwalters/more-binding-fixes

More binding fixes

10 files changed, 13 insertions, 147 deletions

diff --git a/rust-bindings/src/auto/functions.rs b/rust-bindings/src/auto/functions.rs
index 9f895217..56c40835 100644
--- a/rust-bindings/src/auto/functions.rs
+++ b/rust-bindings/src/auto/functions.rs
@@ -82,7 +82,7 @@ pub fn commit_get_object_sizes(commit_variant: &glib::Variant) -> Result<Vec<Com
 }
 
 #[doc(alias = "ostree_commit_get_parent")]
-pub fn commit_get_parent(commit_variant: &glib::Variant) -> glib::GString {
+pub fn commit_get_parent(commit_variant: &glib::Variant) -> Option<glib::GString> {
     unsafe {
         from_glib_full(ffi::ostree_commit_get_parent(commit_variant.to_glib_none().0))
     }
diff --git a/rust-bindings/src/auto/gpg_verify_result.rs b/rust-bindings/src/auto/gpg_verify_result.rs
index f4c139fc..869d5171 100644
--- a/rust-bindings/src/auto/gpg_verify_result.rs
+++ b/rust-bindings/src/auto/gpg_verify_result.rs
@@ -34,7 +34,7 @@ impl GpgVerifyResult {
     }
 
     //#[doc(alias = "ostree_gpg_verify_result_get")]
-    //pub fn get(&self, signature_index: u32, attrs: /*Unimplemented*/&CArray TypeId { ns_id: 1, id: 29 }) -> glib::Variant {
+    //pub fn get(&self, signature_index: u32, attrs: /*Unimplemented*/&CArray TypeId { ns_id: 1, id: 19 }) -> glib::Variant {
     //    unsafe { TODO: call ffi:ostree_gpg_verify_result_get() }
     //}
 
diff --git a/rust-bindings/src/auto/mutable_tree.rs b/rust-bindings/src/auto/mutable_tree.rs
index d70941c7..88602ed4 100644
--- a/rust-bindings/src/auto/mutable_tree.rs
+++ b/rust-bindings/src/auto/mutable_tree.rs
@@ -115,7 +115,7 @@ impl MutableTree {
 
     //#[doc(alias = "ostree_mutable_tree_get_subdirs")]
     //#[doc(alias = "get_subdirs")]
-    //pub fn subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 42 } {
+    //pub fn subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 24 } {
     //    unsafe { TODO: call ffi:ostree_mutable_tree_get_subdirs() }
     //}
 
diff --git a/rust-bindings/src/auto/remote.rs b/rust-bindings/src/auto/remote.rs
index 9b80a8c3..d0925ae8 100644
--- a/rust-bindings/src/auto/remote.rs
+++ b/rust-bindings/src/auto/remote.rs
@@ -27,7 +27,7 @@ impl Remote {
 
     #[doc(alias = "ostree_remote_get_url")]
     #[doc(alias = "get_url")]
-    pub fn url(&self) -> glib::GString {
+    pub fn url(&self) -> Option<glib::GString> {
         unsafe {
             from_glib_full(ffi::ostree_remote_get_url(self.to_glib_none().0))
         }
diff --git a/rust-bindings/src/auto/repo_file.rs b/rust-bindings/src/auto/repo_file.rs
index 31fe363c..d480e763 100644
--- a/rust-bindings/src/auto/repo_file.rs
+++ b/rust-bindings/src/auto/repo_file.rs
@@ -77,28 +77,28 @@ impl RepoFile {
     }
 
     #[doc(alias = "ostree_repo_file_tree_get_contents")]
-    pub fn tree_get_contents(&self) -> glib::Variant {
+    pub fn tree_get_contents(&self) -> Option<glib::Variant> {
         unsafe {
             from_glib_full(ffi::ostree_repo_file_tree_get_contents(self.to_glib_none().0))
         }
     }
 
     #[doc(alias = "ostree_repo_file_tree_get_contents_checksum")]
-    pub fn tree_get_contents_checksum(&self) -> glib::GString {
+    pub fn tree_get_contents_checksum(&self) -> Option<glib::GString> {
         unsafe {
             from_glib_none(ffi::ostree_repo_file_tree_get_contents_checksum(self.to_glib_none().0))
         }
     }
 
     #[doc(alias = "ostree_repo_file_tree_get_metadata")]
-    pub fn tree_get_metadata(&self) -> glib::Variant {
+    pub fn tree_get_metadata(&self) -> Option<glib::Variant> {
         unsafe {
             from_glib_full(ffi::ostree_repo_file_tree_get_metadata(self.to_glib_none().0))
         }
     }
 
     #[doc(alias = "ostree_repo_file_tree_get_metadata_checksum")]
-    pub fn tree_get_metadata_checksum(&self) -> glib::GString {
+    pub fn tree_get_metadata_checksum(&self) -> Option<glib::GString> {
         unsafe {
             from_glib_none(ffi::ostree_repo_file_tree_get_metadata_checksum(self.to_glib_none().0))
         }
diff --git a/rust-bindings/src/auto/se_policy.rs b/rust-bindings/src/auto/se_policy.rs
index 13199326..8bbb9ece 100644
--- a/rust-bindings/src/auto/se_policy.rs
+++ b/rust-bindings/src/auto/se_policy.rs
@@ -55,7 +55,7 @@ impl SePolicy {
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
     #[doc(alias = "ostree_sepolicy_get_csum")]
     #[doc(alias = "get_csum")]
-    pub fn csum(&self) -> glib::GString {
+    pub fn csum(&self) -> Option<glib::GString> {
         unsafe {
             from_glib_none(ffi::ostree_sepolicy_get_csum(self.to_glib_none().0))
         }
@@ -83,7 +83,7 @@ impl SePolicy {
 
     #[doc(alias = "ostree_sepolicy_get_path")]
     #[doc(alias = "get_path")]
-    pub fn path(&self) -> gio::File {
+    pub fn path(&self) -> Option<gio::File> {
         unsafe {
             from_glib_none(ffi::ostree_sepolicy_get_path(self.to_glib_none().0))
         }
diff --git a/rust-bindings/src/auto/versions.txt b/rust-bindings/src/auto/versions.txt
index 0e56c33d..8135982b 100644
--- a/rust-bindings/src/auto/versions.txt
+++ b/rust-bindings/src/auto/versions.txt
@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
-from gir-files (@ 1b758c141dda)
+from gir-files (@ 00c41eacd26a)
diff --git a/rust-bindings/sys/src/auto/versions.txt b/rust-bindings/sys/src/auto/versions.txt
index 0e56c33d..8135982b 100644
--- a/rust-bindings/sys/src/auto/versions.txt
+++ b/rust-bindings/sys/src/auto/versions.txt
@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
-from gir-files (@ 1b758c141dda)
+from gir-files (@ 00c41eacd26a)
diff --git a/rust-bindings/sys/src/lib.rs b/rust-bindings/sys/src/lib.rs
index fe17c5d5..fb0d660d 100644
--- a/rust-bindings/sys/src/lib.rs
+++ b/rust-bindings/sys/src/lib.rs
@@ -309,62 +309,6 @@ impl ::std::fmt::Debug for OstreeAsyncProgressClass {
     }
 }
 
-#[repr(C)]
-pub struct _OstreeBootloader {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloader = *mut _OstreeBootloader;
-
-#[repr(C)]
-pub struct _OstreeBootloaderAboot {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloaderAboot = *mut _OstreeBootloaderAboot;
-
-#[repr(C)]
-pub struct _OstreeBootloaderGrub2 {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloaderGrub2 = *mut _OstreeBootloaderGrub2;
-
-#[repr(C)]
-pub struct _OstreeBootloaderSyslinux {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloaderSyslinux = *mut _OstreeBootloaderSyslinux;
-
-#[repr(C)]
-pub struct _OstreeBootloaderUboot {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloaderUboot = *mut _OstreeBootloaderUboot;
-
-#[repr(C)]
-pub struct _OstreeBootloaderZipl {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloaderZipl = *mut _OstreeBootloaderZipl;
-
-#[repr(C)]
-pub struct _OstreeChecksumInputStreamPrivate {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeChecksumInputStreamPrivate = *mut _OstreeChecksumInputStreamPrivate;
-
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct OstreeCollectionRef {
@@ -466,14 +410,6 @@ impl ::std::fmt::Debug for OstreeDiffItem {
 }
 
 #[repr(C)]
-pub struct _OstreeGpgVerifier {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeGpgVerifier = *mut _OstreeGpgVerifier;
-
-#[repr(C)]
 pub struct _OstreeKernelArgs {
     _data: [u8; 0],
     _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
@@ -489,30 +425,6 @@ pub struct _OstreeKernelArgsEntry {
 
 pub type OstreeKernelArgsEntry = *mut _OstreeKernelArgsEntry;
 
-#[repr(C)]
-pub struct _OstreeLibarchiveInputStreamPrivate {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeLibarchiveInputStreamPrivate = *mut _OstreeLibarchiveInputStreamPrivate;
-
-#[repr(C)]
-pub struct _OstreeLzmaCompressor {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeLzmaCompressor = *mut _OstreeLzmaCompressor;
-
-#[repr(C)]
-pub struct _OstreeLzmaDecompressor {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeLzmaDecompressor = *mut _OstreeLzmaDecompressor;
-
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct OstreeMutableTreeClass {
@@ -699,14 +611,6 @@ impl ::std::fmt::Debug for OstreeRepoFileClass {
     }
 }
 
-#[repr(C)]
-pub struct _OstreeRepoFileEnumerator {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeRepoFileEnumerator = *mut _OstreeRepoFileEnumerator;
-
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct OstreeRepoFinderAvahiClass {
@@ -1666,12 +1570,6 @@ extern "C" {
     ) -> gboolean;
 
     //=========================================================================
-    // OstreeChecksumInputStream
-    //=========================================================================
-    pub fn ostree_checksum_input_stream_get_type() -> GType;
-    //pub fn ostree_checksum_input_stream_new(stream: *mut gio::GInputStream, checksum: *mut glib::GChecksum) -> /*Ignored*/*mut OstreeChecksumInputStream;
-
-    //=========================================================================
     // OstreeContentWriter
     //=========================================================================
     pub fn ostree_content_writer_get_type() -> GType;
@@ -3545,38 +3443,6 @@ extern "C" {
         out_success_message: *mut *mut c_char,
         error: *mut *mut glib::GError,
     ) -> gboolean;
-    pub fn ostree_sign_dummy_add_pk(
-        self_: *mut OstreeSign,
-        key: *mut glib::GVariant,
-        error: *mut *mut glib::GError,
-    ) -> gboolean;
-    pub fn ostree_sign_dummy_data(
-        self_: *mut OstreeSign,
-        data: *mut glib::GBytes,
-        signature: *mut *mut glib::GBytes,
-        cancellable: *mut gio::GCancellable,
-        error: *mut *mut glib::GError,
-    ) -> gboolean;
-    pub fn ostree_sign_dummy_data_verify(
-        self_: *mut OstreeSign,
-        data: *mut glib::GBytes,
-        signatures: *mut glib::GVariant,
-        success_message: *mut *mut c_char,
-        error: *mut *mut glib::GError,
-    ) -> gboolean;
-    pub fn ostree_sign_dummy_get_name(self_: *mut OstreeSign) -> *const c_char;
-    pub fn ostree_sign_dummy_metadata_format(self_: *mut OstreeSign) -> *const c_char;
-    pub fn ostree_sign_dummy_metadata_key(self_: *mut OstreeSign) -> *const c_char;
-    pub fn ostree_sign_dummy_set_pk(
-        self_: *mut OstreeSign,
-        key: *mut glib::GVariant,
-        error: *mut *mut glib::GError,
-    ) -> gboolean;
-    pub fn ostree_sign_dummy_set_sk(
-        self_: *mut OstreeSign,
-        key: *mut glib::GVariant,
-        error: *mut *mut glib::GError,
-    ) -> gboolean;
     pub fn ostree_sign_ed25519_add_pk(
         self_: *mut OstreeSign,
         public_key: *mut glib::GVariant,
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 15bfb4ef..282970e6 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -982,7 +982,7 @@ _ostree_repo_remote_name_is_file (const char *remote_name)
  * underneath that group, or @default_value if the remote exists but not the
  * option name.  If an error is returned, @out_value will be set to %NULL.
  *
- * Returns: (nullable): %TRUE on success, otherwise %FALSE with @error set
+ * Returns: %TRUE on success, otherwise %FALSE with @error set
  *
  * Since: 2016.5
  */