mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-07-26 18:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

gtk-ng: better handling of weak references

Browse Source 
The upstream GIR for g_weak_ref_get is incorrect - it does not allow the
returned value to be NULL. This PR pulls in a new version of our GObject
bindings with that patched and improves the safety of dealing with the
command palette weak reference held by the window.

See ianprime0509/zig-gobject#117
This commit is contained in:
Jeffrey C. Ollie
2025-08-08 21:45:41 -05:00
committed by Mitchell Hashimoto
parent 5c088d10a4
commit 2de0c108ba
6 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/apprt/gtk-ng/class/window.zig
View File

@@ -1065,11 +1065,7 @@ pub const Window = extern struct {
fn dispose(self: *Self) callconv(.c) void {
const priv = self.private();
command_palette: {
// TODO: this can be simplified once WeakRef.get() can return a null.
const command_palette = gobject.ext.cast(CommandPalette, priv.command_palette.get()) orelse break :command_palette;
command_palette.unref();
}
if (priv.command_palette.get()) |object| object.unref();
if (priv.config) |v| {
v.unref();
@@ -1720,9 +1716,11 @@ pub const Window = extern struct {
// Get a reference to a command palette. First check the weak reference
// that we save to see if we already have one stored. If we don't then
// create a new one.
//
// TODO: once WeakRef.get() can return a null this will need to be fixed up.
const command_palette = gobject.ext.cast(CommandPalette, priv.command_palette.get()) orelse command_palette: {
const command_palette = command_palette: {
if (priv.command_palette.get()) |object| not_command_palette: {
break :command_palette gobject.ext.cast(CommandPalette, object) orelse break :not_command_palette;
}
// Create a fresh command palette.
const command_palette = CommandPalette.new();