Merge branch 'matthiasc/for-main' into 'main'

gsk: Cosmetics

See merge request GNOME/gtk!5983

4 files changed, 11 insertions, 4 deletions

diff --git a/gsk/gl/gskglcompiler.c b/gsk/gl/gskglcompiler.c
index 3449dac50d..d825eb5844 100644
--- a/gsk/gl/gskglcompiler.c
+++ b/gsk/gl/gskglcompiler.c
@@ -124,7 +124,7 @@ gsk_gl_compiler_new (GskGLDriver *driver,
   self->driver = g_object_ref (driver);
   self->debug_shaders = !!debug_shaders;
 
-  context = gsk_gl_command_queue_get_context (self->driver->shared_command_queue);
+  context = gsk_gl_driver_get_context (self->driver);
 
   if (gdk_gl_context_get_use_es (context))
     {
diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c
index e81502cbe7..dec77c947a 100644
--- a/gsk/gl/gskgldriver.c
+++ b/gsk/gl/gskgldriver.c
@@ -1131,7 +1131,7 @@ gsk_gl_driver_lookup_shader (GskGLDriver  *self,
   return program;
 }
 
-#ifdef G_ENABLE_DEBUG
+#if 0
 void
 gsk_gl_driver_save_texture_to_png (GskGLDriver       *driver,
                                    int                texture_id,
diff --git a/gsk/gl/gskgldriverprivate.h b/gsk/gl/gskgldriverprivate.h
index 666d20090b..021792bd8c 100644
--- a/gsk/gl/gskgldriverprivate.h
+++ b/gsk/gl/gskgldriverprivate.h
@@ -175,7 +175,7 @@ GskGLProgram      * gsk_gl_driver_lookup_shader          (GskGLDriver         *s
                                                           GskGLShader         *shader,
                                                           GError             **error);
 
-#ifdef G_ENABLE_DEBUG
+#if 0
 void                gsk_gl_driver_save_texture_to_png    (GskGLDriver         *self,
                                                           int                  texture_id,
                                                           int                  width,
diff --git a/testsuite/gtk/propertylookuplistmodel.c b/testsuite/gtk/propertylookuplistmodel.c
index a2e87d1fde..1970868306 100644
--- a/testsuite/gtk/propertylookuplistmodel.c
+++ b/testsuite/gtk/propertylookuplistmodel.c
@@ -165,6 +165,7 @@ test_create_empty (void)
   GType type;
   guint n_items;
   char *property;
+  GObject *object;
 
   model = new_model (FALSE);
   assert_model (model, "");
@@ -173,10 +174,12 @@ test_create_empty (void)
   g_assert_true (g_list_model_get_item_type (G_LIST_MODEL (model)) == GTK_TYPE_WIDGET);
   g_object_get (model,
                 "item-type", &type,
+                "object", &object,
                 "n-items", &n_items,
                 "property", &property,
                 NULL);
   g_assert_true (type == GTK_TYPE_WIDGET);
+  g_assert_null (object);
   g_assert_true (n_items == 0);
   g_assert_cmpstr (property, ==, "parent");
 
@@ -217,8 +220,12 @@ test_set_object (void)
   gtk_property_lookup_list_model_set_object (model, widget);
   assert_model (model, "GtkLabel GtkGrid GtkBox GtkWindow");
   assert_changes (model, "0+4*");
-  g_object_unref (model);
 
+  g_object_set (model, "object", NULL, NULL);
+  assert_model (model, "");
+  assert_changes (model, "0-4*");
+
+  g_object_unref (model);
   destroy_widgets ();
 }