Regenerate gir

gtk-rs · Mar 11, 2022 · d9b9bac · d9b9bac
1 parent c4e91b7
commit d9b9bac
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/atk/src/auto/versions.txt b/atk/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ 64d7d6e1bd0d)
 from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)
diff --git a/atk/sys/versions.txt b/atk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ 64d7d6e1bd0d)
 from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)
diff --git a/gdk/src/auto/versions.txt b/gdk/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ 64d7d6e1bd0d)
 from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)
diff --git a/gdk/sys/versions.txt b/gdk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ 64d7d6e1bd0d)
 from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)
diff --git a/gdkx11/src/auto/versions.txt b/gdkx11/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ 64d7d6e1bd0d)
 from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)
diff --git a/gdkx11/sys/versions.txt b/gdkx11/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ 64d7d6e1bd0d)
 from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)
diff --git a/gir b/gir
diff --git a/gtk/src/auto/clipboard.rs b/gtk/src/auto/clipboard.rs
@@ -126,7 +126,12 @@ impl Clipboard {
             let format = from_glib_borrow(format);
             let text: Borrowed<Option<glib::GString>> = from_glib_borrow(text);
             let callback: Box_<P> = Box_::from_raw(data as *mut _);
-            (*callback)(&clipboard, &format, text.as_ref().as_deref(), length);
+            (*callback)(
+                &clipboard,
+                &format,
+                (*text).as_ref().map(|s| s.as_str()),
+                length,
+            );
         }
         let callback = Some(callback_func::<P> as _);
         let super_callback0: Box_<P> = callback_data;
@@ -151,7 +156,7 @@ impl Clipboard {
             let clipboard = from_glib_borrow(clipboard);
             let text: Borrowed<Option<glib::GString>> = from_glib_borrow(text);
             let callback: Box_<P> = Box_::from_raw(data as *mut _);
-            (*callback)(&clipboard, text.as_ref().as_deref());
+            (*callback)(&clipboard, (*text).as_ref().map(|s| s.as_str()));
         }
         let callback = Some(callback_func::<P> as _);
         let super_callback0: Box_<P> = callback_data;

diff --git a/gtk/src/auto/versions.txt b/gtk/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ 64d7d6e1bd0d)
 from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)
diff --git a/gtk/sys/versions.txt b/gtk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ 64d7d6e1bd0d)
 from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)
+1 −1		src/codegen/function_body_chunk.rs
+2 −2		src/codegen/trampoline_from_glib.rs