Merge pull request gtk-rs#621 from GuillaumeGomez/clipboard-request-img

Make Clipboard::request_image pixbuf an Option

Author: GuillaumeGomez

gtk/Gir.toml

@@ -742,6 +742,10 @@ status = "generate"
     name = "set_with_owner"
     #array with size
     ignore = true
+    [[object.function]]
+    name = "request_image"
+    # nullable callback parameter
+    ignore = true
 
 [[object]]
 name = "Gtk.ColorButton"

gtk/src/auto/clipboard.rs

@@ -77,30 +77,6 @@ impl Clipboard {
         }
     }
 
-    #[doc(alias = "gtk_clipboard_request_image")]
-    pub fn request_image<P: FnOnce(&Clipboard, &gdk_pixbuf::Pixbuf) + 'static>(&self, callback: P) {
-        let callback_data: Box_<P> = Box_::new(callback);
-        unsafe extern "C" fn callback_func<P: FnOnce(&Clipboard, &gdk_pixbuf::Pixbuf) + 'static>(
-            clipboard: *mut ffi::GtkClipboard,
-            pixbuf: *mut gdk_pixbuf::ffi::GdkPixbuf,
-            data: glib::ffi::gpointer,
-        ) {
-            let clipboard = from_glib_borrow(clipboard);
-            let pixbuf = from_glib_borrow(pixbuf);
-            let callback: Box_<P> = Box_::from_raw(data as *mut _);
-            (*callback)(&clipboard, &pixbuf);
-        }
-        let callback = Some(callback_func::<P> as _);
-        let super_callback0: Box_<P> = callback_data;
-        unsafe {
-            ffi::gtk_clipboard_request_image(
-                self.to_glib_none().0,
-                callback,
-                Box_::into_raw(super_callback0) as *mut _,
-            );
-        }
-    }
-
     #[doc(alias = "gtk_clipboard_request_rich_text")]
     pub fn request_rich_text<
         P: IsA<TextBuffer>,

gtk/src/clipboard.rs

@@ -90,4 +90,35 @@ impl Clipboard {
             );
         }
     }
+
+    #[doc(alias = "gtk_clipboard_request_image")]
+    pub fn request_image<P: FnOnce(&Clipboard, Option<&gdk_pixbuf::Pixbuf>) + 'static>(
+        &self,
+        callback: P,
+    ) {
+        unsafe extern "C" fn callback_func<
+            P: FnOnce(&Clipboard, Option<&gdk_pixbuf::Pixbuf>) + 'static,
+        >(
+            clipboard: *mut ffi::GtkClipboard,
+            pixbuf: *mut gdk_pixbuf::ffi::GdkPixbuf,
+            data: glib::ffi::gpointer,
+        ) {
+            let clipboard = from_glib_borrow(clipboard);
+            let callback: Box_<P> = Box_::from_raw(data as *mut _);
+            (*callback)(
+                &clipboard,
+                Option::<gdk_pixbuf::Pixbuf>::from_glib_borrow(pixbuf)
+                    .as_ref()
+                    .as_ref(),
+            );
+        }
+        let callback: Box_<P> = Box::new(callback);
+        unsafe {
+            ffi::gtk_clipboard_request_image(
+                self.to_glib_none().0,
+                Some(callback_func::<P> as _),
+                Box_::into_raw(callback) as *mut _,
+            );
+        }
+    }
 }