From d26c114b5d013d311929be177f97d2ce46617580 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 10 Jan 2025 12:10:26 -0800
Subject: [PATCH] apprt/gtk: make sure noop winproto never initializes

---
 src/apprt/gtk/App.zig           | 1 +
 src/apprt/gtk/winproto.zig      | 2 +-
 src/apprt/gtk/winproto/noop.zig | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/apprt/gtk/App.zig b/src/apprt/gtk/App.zig
index b041d29fb..6fa98a011 100644
--- a/src/apprt/gtk/App.zig
+++ b/src/apprt/gtk/App.zig
@@ -373,6 +373,7 @@ pub fn init(core_app: *CoreApp, opts: Options) !App {
         &config,
     );
     errdefer winproto_app.deinit(core_app.alloc);
+    log.debug("windowing protocol={s}", .{@tagName(winproto_app)});
 
     // This just calls the `activate` signal but its part of the normal startup
     // routine so we just call it, but only if the config allows it (this allows
diff --git a/src/apprt/gtk/winproto.zig b/src/apprt/gtk/winproto.zig
index 49d96bb02..cb873fe01 100644
--- a/src/apprt/gtk/winproto.zig
+++ b/src/apprt/gtk/winproto.zig
@@ -40,7 +40,7 @@ pub const App = union(Protocol) {
             }
         }
 
-        return .none;
+        return .{ .none = .{} };
     }
 
     pub fn deinit(self: *App, alloc: Allocator) void {
diff --git a/src/apprt/gtk/winproto/noop.zig b/src/apprt/gtk/winproto/noop.zig
index 54c14fe14..14f3dc6a7 100644
--- a/src/apprt/gtk/winproto/noop.zig
+++ b/src/apprt/gtk/winproto/noop.zig
@@ -13,7 +13,7 @@ pub const App = struct {
         _: [:0]const u8,
         _: *const Config,
     ) !?App {
-        return .{};
+        return null;
     }
 
     pub fn deinit(self: *App, alloc: Allocator) void {