From 8250cc7f7bbd0a1d34cc0ade8d6c4beee84ee4f2 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Mon, 24 Jun 2024 09:30:07 +0200 Subject: Wayland: account for old versions of the GTK shell protocol - cont'd --- src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx | 2 +- src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx index 80bcaa1a3..c06db00b9 100644 --- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx @@ -288,7 +288,7 @@ static void pointer_button(void *data, struct gtk_surface1 *gtk_surface = gtk_shell1_get_gtk_surface(seat->gtk_shell,gtk_shell_surface); gtk_surface1_titlebar_gesture(gtk_surface, serial, seat->wl_seat, GTK_SURFACE1_GESTURE_MIDDLE_CLICK); - if (gtk_shell1_get_version(seat->gtk_shell) >= GTK_SURFACE1_RELEASE_SINCE_VERSION) + if (gtk_surface1_get_version(gtk_surface) >= GTK_SURFACE1_RELEASE_SINCE_VERSION) gtk_surface1_release(gtk_surface); // very necessary return; } diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index 5388f6ee9..07076bb0a 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -1526,7 +1526,7 @@ void Fl_Wayland_Window_Driver::makeWindow() struct gtk_surface1 *gtk_surface = gtk_shell1_get_gtk_surface(scr_driver->seat->gtk_shell, new_window->wl_surface); gtk_surface1_set_modal(gtk_surface); - if (gtk_shell1_get_version(scr_driver->seat->gtk_shell) >= GTK_SURFACE1_RELEASE_SINCE_VERSION) + if (gtk_surface1_get_version(gtk_surface) >= GTK_SURFACE1_RELEASE_SINCE_VERSION) gtk_surface1_release(gtk_surface); // very necessary } } -- cgit v1.2.3