bug#32975: Emacs 26.1; GTK Warnings

[Robert Pluim]

martin rudalics <rudalics@gmx.at> writes:

>> How about moving the
>> check for USE_TOOLKIT_SCROLL_BARS down into xg_set_background_color
>> like so (which I think was your original suggestion):
>
> That's what I would do for Emacs 26.2.

Sure. Eli, is the following OK for you? Itʼs a pretty rare setup, so
master would probably be fine as well.

Robert

>From 21e193c8211d21cd46c2ee90902ae627e837a62f Mon Sep 17 00:00:00 2001
From: Robert Pluim <rpluim@gmail.com>
Date: Thu, 11 Oct 2018 16:02:51 +0200
Subject: [PATCH] Call GTK functions only on GTK scrollbars
To: emacs-devel@gnu.org

* src/gtkutil.c (xg_set_background_color) [USE_TOOLKIT_SCROLL_BARS]:
Don't call GTK functions on non-GTK scrollbars (Bug#32975).
---
 src/gtkutil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6b72671da9..5879ab683e 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1498,6 +1498,7 @@ xg_set_background_color (struct frame *f, unsigned long 
bg)
       block_input ();
       xg_set_widget_bg (f, FRAME_GTK_WIDGET (f), FRAME_BACKGROUND_PIXEL (f));
 
+#ifdef USE_TOOLKIT_SCROLL_BARS
       Lisp_Object bar;
       for (bar = FRAME_SCROLL_BARS (f);
            !NILP (bar);
@@ -1508,7 +1509,7 @@ xg_set_background_color (struct frame *f, unsigned long 
bg)
           GtkWidget *webox = gtk_widget_get_parent (scrollbar);
           xg_set_widget_bg (f, webox, FRAME_BACKGROUND_PIXEL (f));
         }
-
+#endif
       unblock_input ();
     }
 }
-- 
2.19.0.271.gfe8321ec05