From d65cef176efc8d5f78698169340c3dbdd8269700 Mon Sep 17 00:00:00 2001 From: deepend Date: Fri, 23 Jan 2026 00:43:30 -0700 Subject: [PATCH] Guarded the tray icon X11 code path with GDK_WINDOWING_X11 while preserving the non-X11 fallback behavior in gtkutil_tray_icon_supported. Switched Win32 window handle retrieval to gdk_win32_window_get_handle and wrapped the usage in GDK_WINDOWING_WIN32 in fe_gui_info_ptr. --- src/fe-gtk/fe-gtk.c | 4 ++-- src/fe-gtk/gtkutil.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 1b2944ed..246262c7 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -1080,8 +1080,8 @@ fe_gui_info_ptr (session *sess, int info_type) switch (info_type) { case 0: /* native window pointer (for plugins) */ -#ifdef WIN32 - return gdk_win32_window_get_impl_hwnd (gtk_widget_get_window (sess->gui->window)); +#ifdef GDK_WINDOWING_WIN32 + return gdk_win32_window_get_handle (gtk_widget_get_window (sess->gui->window)); #else return sess->gui->window; #endif diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c index 22463555..364ec24f 100644 --- a/src/fe-gtk/gtkutil.c +++ b/src/fe-gtk/gtkutil.c @@ -752,9 +752,7 @@ gtkutil_treeview_get_selected (GtkTreeView *view, GtkTreeIter *iter_ret, ...) gboolean gtkutil_tray_icon_supported (GtkWindow *window) { -#ifndef GDK_WINDOWING_X11 - return TRUE; -#else +#ifdef GDK_WINDOWING_X11 GdkScreen *screen = gtk_window_get_screen (window); GdkDisplay *display = gdk_screen_get_display (screen); int screen_number = gdk_screen_get_number (screen); @@ -772,6 +770,8 @@ gtkutil_tray_icon_supported (GtkWindow *window) g_free (selection_name); return (tray_window != None); +#else + return TRUE; #endif }