From f2db5bcc1ce252216e12596525ebbe15bafc4bd4 Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Thu, 29 Jan 2026 15:16:53 +0400 Subject: [PATCH 1/2] Small cleanup and fixes --- clutter/clutter/clutter-box-layout.c | 6 ++-- clutter/clutter/clutter-grid-layout.c | 6 ++-- clutter/clutter/clutter-stage-view.c | 38 ----------------------- src/wayland/meta-xwayland-grab-keyboard.c | 4 +-- 4 files changed, 8 insertions(+), 46 deletions(-) diff --git a/clutter/clutter/clutter-box-layout.c b/clutter/clutter/clutter-box-layout.c index 73eefe477..cafb574ed 100644 --- a/clutter/clutter/clutter-box-layout.c +++ b/clutter/clutter/clutter-box-layout.c @@ -943,9 +943,9 @@ distribute_natural_allocation (float extra_space, */ /* Sort descending by gap and position. */ - g_qsort_with_data (spreading, - n_requested_sizes, sizeof (unsigned int), - compare_gap, sizes); + g_sort_array (spreading, + n_requested_sizes, sizeof (unsigned int), + compare_gap, sizes); /* Distribute available space. * This master piece of a loop was conceived by Behdad Esfahbod. diff --git a/clutter/clutter/clutter-grid-layout.c b/clutter/clutter/clutter-grid-layout.c index 29ec54759..560fea1cc 100644 --- a/clutter/clutter/clutter-grid-layout.c +++ b/clutter/clutter/clutter-grid-layout.c @@ -975,9 +975,9 @@ distribute_natural_allocation (gint extra_space, */ /* Sort descending by gap and position. */ - g_qsort_with_data (spreading, - n_requested_sizes, sizeof (guint), - compare_gap, sizes); + g_sort_array (spreading, + n_requested_sizes, sizeof (guint), + compare_gap, sizes); /* Distribute available space. * This master piece of a loop was conceived by Behdad Esfahbod. diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c index 0392d9eb6..d3a8f375a 100644 --- a/clutter/clutter/clutter-stage-view.c +++ b/clutter/clutter/clutter-stage-view.c @@ -122,44 +122,6 @@ clutter_stage_view_get_onscreen (ClutterStageView *view) return priv->framebuffer; } -static CoglPipeline * -clutter_stage_view_create_framebuffer_pipeline (CoglFramebuffer *framebuffer) -{ - CoglPipeline *pipeline; - - pipeline = cogl_pipeline_new (cogl_framebuffer_get_context (framebuffer)); - - cogl_pipeline_set_layer_filters (pipeline, 0, - COGL_PIPELINE_FILTER_NEAREST, - COGL_PIPELINE_FILTER_NEAREST); - cogl_pipeline_set_layer_texture (pipeline, 0, - cogl_offscreen_get_texture (framebuffer)); - cogl_pipeline_set_layer_wrap_mode (pipeline, 0, - COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE); - - return pipeline; -} - -static void -clutter_stage_view_ensure_offscreen_blit_pipeline (ClutterStageView *view) -{ - ClutterStageViewPrivate *priv = - clutter_stage_view_get_instance_private (view); - ClutterStageViewClass *view_class = - CLUTTER_STAGE_VIEW_GET_CLASS (view); - - g_assert (priv->offscreen != NULL); - - if (priv->offscreen_pipeline) - return; - - priv->offscreen_pipeline = - clutter_stage_view_create_framebuffer_pipeline (priv->offscreen); - - if (view_class->setup_offscreen_blit_pipeline) - view_class->setup_offscreen_blit_pipeline (view, priv->offscreen_pipeline); -} - void clutter_stage_view_invalidate_offscreen_blit_pipeline (ClutterStageView *view) { diff --git a/src/wayland/meta-xwayland-grab-keyboard.c b/src/wayland/meta-xwayland-grab-keyboard.c index c9eeca8d0..37d3f2bb4 100644 --- a/src/wayland/meta-xwayland-grab-keyboard.c +++ b/src/wayland/meta-xwayland-grab-keyboard.c @@ -170,8 +170,8 @@ application_is_in_pattern_array (MetaWindow *window, { GPatternSpec *pattern = (GPatternSpec *) g_ptr_array_index (pattern_array, i); - if ((window->res_class && g_pattern_match_string (pattern, window->res_class)) || - (window->res_name && g_pattern_match_string (pattern, window->res_name))) + if ((window->res_class && g_pattern_spec_match_string (pattern, window->res_class)) || + (window->res_name && g_pattern_spec_match_string (pattern, window->res_name))) return TRUE; } From e7a850fec6e9f50dec3cfa54ae989a263bf2d041 Mon Sep 17 00:00:00 2001 From: Aleksey Samoilov Date: Fri, 30 Jan 2026 21:41:55 +0400 Subject: [PATCH 2/2] Use g_qsort_with_data for compatibility --- clutter/clutter/clutter-box-layout.c | 6 +++--- clutter/clutter/clutter-grid-layout.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clutter/clutter/clutter-box-layout.c b/clutter/clutter/clutter-box-layout.c index cafb574ed..73eefe477 100644 --- a/clutter/clutter/clutter-box-layout.c +++ b/clutter/clutter/clutter-box-layout.c @@ -943,9 +943,9 @@ distribute_natural_allocation (float extra_space, */ /* Sort descending by gap and position. */ - g_sort_array (spreading, - n_requested_sizes, sizeof (unsigned int), - compare_gap, sizes); + g_qsort_with_data (spreading, + n_requested_sizes, sizeof (unsigned int), + compare_gap, sizes); /* Distribute available space. * This master piece of a loop was conceived by Behdad Esfahbod. diff --git a/clutter/clutter/clutter-grid-layout.c b/clutter/clutter/clutter-grid-layout.c index 560fea1cc..29ec54759 100644 --- a/clutter/clutter/clutter-grid-layout.c +++ b/clutter/clutter/clutter-grid-layout.c @@ -975,9 +975,9 @@ distribute_natural_allocation (gint extra_space, */ /* Sort descending by gap and position. */ - g_sort_array (spreading, - n_requested_sizes, sizeof (guint), - compare_gap, sizes); + g_qsort_with_data (spreading, + n_requested_sizes, sizeof (guint), + compare_gap, sizes); /* Distribute available space. * This master piece of a loop was conceived by Behdad Esfahbod.