From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 6 Apr 2023 14:37:58 +0000 (-0400)
Subject: glarea: Fix property notification
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~433^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a65dc036b19a26a9922cd8f68fb2d71e4bd888d5;p=gtk4.git

glarea: Fix property notification

This was broken in 9c26262e3e083006.
---

diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
index cbd18aebf7..0104fa1c96 100644
--- a/gtk/gtkglarea.c
+++ b/gtk/gtkglarea.c
@@ -1098,6 +1098,9 @@ gtk_gl_area_set_use_es (GtkGLArea *area,
   g_return_if_fail (GTK_IS_GL_AREA (area));
   g_return_if_fail (!gtk_widget_get_realized (GTK_WIDGET (area)));
 
+  if ((priv->allowed_apis == GDK_GL_API_GLES) == use_es)
+    return;
+
   priv->allowed_apis = use_es ? GDK_GL_API_GLES : GDK_GL_API_GL;
 
   g_object_notify_by_pspec (G_OBJECT (area), obj_props[PROP_USE_ES]);
@@ -1149,6 +1152,7 @@ gtk_gl_area_set_allowed_apis (GtkGLArea *area,
                               GdkGLAPI   apis)
 {
   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
+  GdkGLAPI old_allowed_apis;
 
   g_return_if_fail (GTK_IS_GL_AREA (area));
   g_return_if_fail (!gtk_widget_get_realized (GTK_WIDGET (area)));
@@ -1156,9 +1160,12 @@ gtk_gl_area_set_allowed_apis (GtkGLArea *area,
   if (priv->allowed_apis == apis)
     return;
 
+  old_allowed_apis = priv->allowed_apis;
+
   priv->allowed_apis = apis;
 
-  g_object_notify_by_pspec (G_OBJECT (area), obj_props[PROP_USE_ES]);
+  if ((old_allowed_apis == GDK_GL_API_GLES) != (apis == GDK_GL_API_GLES))
+    g_object_notify_by_pspec (G_OBJECT (area), obj_props[PROP_USE_ES]);
   g_object_notify_by_pspec (G_OBJECT (area), obj_props[PROP_ALLOWED_APIS]);
 }