From e4ef42fb9c95ddbe6bc86e6317caef341cdf9928 Mon Sep 17 00:00:00 2001
From: Helmut Eller <eller.helmut@gmail.com>
Date: Sun, 2 Nov 2025 17:13:10 +0100
Subject: [PATCH] Fix GTK scrollbars

* src/xterm.c (xg_scroll_callback, xg_end_scroll_callback): Adapt to
gc_handles.
---
 src/xterm.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index 3395ca7ceb8..e9ec3801744 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -15826,12 +15826,8 @@ xg_scroll_callback (GtkRange *range, GtkScrollType scroll,
 
   whole = 0;
   portion = 0;
-#ifdef HAVE_MPS
-  struct scroll_bar** bar_cell = user_data;
-  bar = *bar_cell;
-#else
-  bar = user_data;
-#endif
+  gc_handle bar_gch = user_data;
+  bar = XSCROLL_BAR (gc_handle_value (bar_gch));
   part = scroll_bar_nowhere;
   adj = GTK_ADJUSTMENT (gtk_range_get_adjustment (range));
   f = g_object_get_data (G_OBJECT (range), XG_FRAME_DATA);
@@ -15908,14 +15904,8 @@ xg_end_scroll_callback (GtkWidget *widget,
                         GdkEventButton *event,
                         gpointer user_data)
 {
-#ifdef HAVE_MPS
-  struct scroll_bar **bar_cell = user_data;
-  struct scroll_bar *bar = *bar_cell;
-#else
-  struct scroll_bar *bar;
-
-  bar = user_data;
-#endif
+  gc_handle bar_gch = user_data;
+  struct scroll_bar *bar = XSCROLL_BAR (gc_handle_value (bar_gch));
   bar->dragging = -1;
 
   if (WINDOWP (window_being_scrolled))