Merge pull request #689 from lucab/ups/gtk-print-operation-get-error

gtk: manually implement gtk_print_operation_get_error

Author: sdroege

gtk/Gir.toml

@@ -1772,6 +1772,10 @@ status = "generate"
 name = "Gtk.PrintOperation"
 status = "generate"
 generate_builder = true
+    [[object.function]]
+    name = "get_error"
+    # It quacks like a fallible function, but it isn't.
+    ignore = true
 
 [[object]]
 name = "Gtk.PrintSettings"

gtk/src/auto/print_operation.rs

@@ -233,10 +233,6 @@ pub trait PrintOperationExt: 'static {
     #[doc(alias = "get_embed_page_setup")]
     fn embeds_page_setup(&self) -> bool;
 
-    #[doc(alias = "gtk_print_operation_get_error")]
-    #[doc(alias = "get_error")]
-    fn error(&self) -> Result<(), glib::Error>;
-
     #[doc(alias = "gtk_print_operation_get_has_selection")]
     #[doc(alias = "get_has_selection")]
     fn has_selection(&self) -> bool;
@@ -486,18 +482,6 @@ impl<O: IsA<PrintOperation>> PrintOperationExt for O {
         }
     }
 
-    fn error(&self) -> Result<(), glib::Error> {
-        unsafe {
-            let mut error = ptr::null_mut();
-            let _ = ffi::gtk_print_operation_get_error(self.as_ref().to_glib_none().0, &mut error);
-            if error.is_null() {
-                Ok(())
-            } else {
-                Err(from_glib_full(error))
-            }
-        }
-    }
-
     fn has_selection(&self) -> bool {
         unsafe {
             from_glib(ffi::gtk_print_operation_get_has_selection(

gtk/src/lib.rs

@@ -99,6 +99,7 @@ mod pad_action_entry;
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 mod pad_controller;
 mod page_range;
+mod print_operation;
 mod print_settings;
 mod radio_button;
 mod radio_menu_item;

gtk/src/print_operation.rs

@@ -0,0 +1,21 @@
+// Take a look at the license at the top of the repository in the LICENSE file.
+
+use crate::PrintOperation;
+use glib::translate::*;
+use std::ptr;
+
+impl PrintOperation {
+    #[doc(alias = "gtk_print_operation_get_error")]
+    #[doc(alias = "get_error")]
+    pub fn error(&self) -> Option<glib::Error> {
+        unsafe {
+            let mut error = ptr::null_mut();
+            ffi::gtk_print_operation_get_error(self.to_glib_none().0, &mut error);
+            if error.is_null() {
+                None
+            } else {
+                Some(from_glib_full(error))
+            }
+        }
+    }
+}