deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-17 03:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guarded the tray icon X11 code path with GDK_WINDOWING_X11 while preserving the non-X11 fallback behavior in gtkutil_tray_icon_supported.

Browse Source 
Switched Win32 window handle retrieval to gdk_win32_window_get_handle and wrapped the usage in GDK_WINDOWING_WIN32 in fe_gui_info_ptr.
This commit is contained in:
deepend
2026-01-23 00:43:30 -07:00
parent 5715245080
commit d65cef176e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fe-gtk/fe-gtk.c
View File

@@ -1080,8 +1080,8 @@ fe_gui_info_ptr (session *sess, int info_type)
switch (info_type) switch (info_type)
{ {
case 0: /* native window pointer (for plugins) */ case 0: /* native window pointer (for plugins) */
#ifdef WIN32 #ifdef GDK_WINDOWING_WIN32
return gdk_win32_window_get_impl_hwnd (gtk_widget_get_window (sess->gui->window)); return gdk_win32_window_get_handle (gtk_widget_get_window (sess->gui->window));
#else #else
return sess->gui->window; return sess->gui->window;
#endif #endif

6
src/fe-gtk/gtkutil.c
View File

@@ -752,9 +752,7 @@ gtkutil_treeview_get_selected (GtkTreeView *view, GtkTreeIter *iter_ret, ...)
gboolean gboolean
gtkutil_tray_icon_supported (GtkWindow *window) gtkutil_tray_icon_supported (GtkWindow *window)
{ {
#ifndef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
return TRUE;
#else
GdkScreen *screen = gtk_window_get_screen (window); GdkScreen *screen = gtk_window_get_screen (window);
GdkDisplay *display = gdk_screen_get_display (screen); GdkDisplay *display = gdk_screen_get_display (screen);
int screen_number = gdk_screen_get_number (screen); int screen_number = gdk_screen_get_number (screen);
@@ -772,6 +770,8 @@ gtkutil_tray_icon_supported (GtkWindow *window)
g_free (selection_name); g_free (selection_name);
return (tray_window != None); return (tray_window != None);
#else
return TRUE;
#endif #endif
} }