Skip to content

Small cleanup and fixes #790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtwebster merged 2 commits into from
Jan 30, 2026
+2 −40
Merged

Small cleanup and fixes #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2db5bc
Small cleanup and fixes
Sunderland93 Jan 29, 2026
e7a850f
Use g_qsort_with_data for compatibility
Sunderland93 Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions clutter/clutter/clutter-stage-view.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
4 changes: 2 additions & 2 deletions src/wayland/meta-xwayland-grab-keyboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Loading