Merge pull request #735 from sdroege/0.15-backports

sdroege · web-flow · commit 482e6d65956f · 2022-02-18T17:02:54.000+02:00
0.15 backports
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 @ 78e3d3c22343)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)
+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 @ 78e3d3c22343)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)
+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 @ 78e3d3c22343)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)
+from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)
diff --git a/gdk/src/visual.rs b/gdk/src/visual.rs
@@ -13,7 +13,11 @@ impl Visual {
 
         unsafe {
             ffi::gdk_query_depths(&mut ptr, &mut count);
-            Vec::from(slice::from_raw_parts(ptr as *const i32, count as usize))
+            if ptr.is_null() || count == 0 {
+                vec![]
+            } else {
+                Vec::from(slice::from_raw_parts(ptr as *const i32, count as usize))
+            }
         }
     }
 }
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 @ 78e3d3c22343)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)
+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 @ 78e3d3c22343)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)
+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 @ 78e3d3c22343)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)
+from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)
diff --git a/gir-files b/gir-files
@@ -1 +1 @@
-Subproject commit 5264fd0c3183f2f9552e904677bef0879e6734af
+Subproject commit 68003b4b40e5371e759725527e6490c9913bcbbf
diff --git a/gtk/Gir.toml b/gtk/Gir.toml
@@ -1047,7 +1047,6 @@ generate_builder = true
 [[object]]
 name = "Gtk.FileChooserWidgetAccessible"
 status = "generate"
-version = "3.24.30"
 
 [[object]]
 name = "Gtk.Fixed"
@@ -1239,7 +1238,6 @@ generate_builder = true
 name = "Gtk.HeaderBarAccessible"
 status = "generate"
 generate_builder = true
-version = "3.24.11"
 
 [[object]]
 name = "Gtk.IconTheme"
@@ -1768,7 +1766,6 @@ name = "Gtk.PlugAccessible"
 status = "generate"
 generate_builder = true
 cfg_condition = "gdk_backend = \"x11\""
-version = "3.24.30"
 
 [[object]]
 name = "Gtk.Popover"
@@ -2118,7 +2115,6 @@ name = "Gtk.SocketAccessible"
 status = "generate"
 generate_builder = true
 cfg_condition = "gdk_backend = \"x11\""
-version = "3.24.30"
 
 [[object]]
 name = "Gtk.SpinButton"
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 @ 78e3d3c22343)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)
+from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)
diff --git a/gtk/src/signal.rs b/gtk/src/signal.rs
@@ -115,7 +115,9 @@ mod editable {
     ) where
         T: IsA<Editable>,
     {
-        let buf = if new_text_length != -1 {
+        let buf = if new_text_length == 0 {
+            &[]
+        } else if new_text_length != -1 {
             slice::from_raw_parts(new_text as *mut c_uchar, new_text_length as usize)
         } else {
             CStr::from_ptr(new_text).to_bytes()
diff --git a/gtk/src/text_buffer.rs b/gtk/src/text_buffer.rs
@@ -223,10 +223,16 @@ impl<O: IsA<TextBuffer>> TextBufferExtManual for O {
             let f: &F = &*(f as *const F);
             let mut location_copy = from_glib_none(location);
 
+            let text = if len <= 0 {
+                &[]
+            } else {
+                slice::from_raw_parts(text as *const u8, len as usize)
+            };
+
             f(
                 TextBuffer::from_glib_borrow(this).unsafe_cast_ref(),
                 &mut location_copy,
-                str::from_utf8(slice::from_raw_parts(text as *const u8, len as usize)).unwrap(),
+                str::from_utf8(text).unwrap(),
             );
 
             *location = *location_copy.to_glib_none().0;
diff --git a/gtk/src/tree_path.rs b/gtk/src/tree_path.rs
@@ -14,7 +14,7 @@ impl TreePath {
                 mut_override(self.to_glib_none().0),
                 &mut count,
             );
-            if ptr.is_null() {
+            if ptr.is_null() || count == 0 {
                 vec![]
             } else {
                 slice::from_raw_parts(ptr, count as usize).to_owned()
diff --git a/gtk/sys/Gir.toml b/gtk/sys/Gir.toml
@@ -79,11 +79,6 @@ name = "Gtk.EventControllerScroll"
 status = "generate"
 version = "3.24"
 
-[[object]]
-name = "Gtk.FileChooserWidgetAccessible"
-status = "generate"
-version = "3.24.30"
-
 [[object]]
 name = "Gtk.FontChooserLevel"
 status = "generate"
@@ -94,11 +89,6 @@ name = "Gtk.GestureStyle"
 status = "generate"
 version = "3.24"
 
-[[object]]
-name = "Gtk.HeaderBarAccessible"
-status = "generate"
-version = "3.24.11"
-
 [[object]]
 name = "Gtk.PadActionType"
 status = "generate"
@@ -110,21 +100,11 @@ status = "generate"
 version = "3.22"
 
 [[object]]
-name = "Gtk.PlugAccessible"
-status = "generate"
-version = "3.24.30"
-
-[[object]]
-name = "Gtk.ShortcutLabel"
+name = "Gtk.StackAccessible"
 status = "generate"
 version = "3.22"
 
 [[object]]
-name = "Gtk.SocketAccessible"
-status = "generate"
-version = "3.24.30"
-
-[[object]]
-name = "Gtk.StackAccessible"
+name = "Gtk.ShortcutLabel"
 status = "generate"
 version = "3.22"
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 @ 78e3d3c22343)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)
+from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`Generated by gir (https://github.com/gtk-rs/gir @ 78e3d3c22343)`
`2`		`-from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)`
	`2`	`+from gir-files (https://github.com/gtk-rs/gir-files @ 68003b4b40e5)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,11 @@ impl Visual {`
`13`	`13`
`14`	`14`	`unsafe {`
`15`	`15`	`ffi::gdk_query_depths(&mut ptr, &mut count);`
`16`		`- Vec::from(slice::from_raw_parts(ptr as *const i32, count as usize))`
	`16`	`+ if ptr.is_null() \|\| count == 0 {`
	`17`	`+ vec![]`
	`18`	`+ } else {`
	`19`	`+ Vec::from(slice::from_raw_parts(ptr as *const i32, count as usize))`
	`20`	`+ }`
`17`	`21`	`}`
`18`	`22`	`}`
`19`	`23`	`}`