isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 17:10:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

xwayland-grab-keyboard: Switch to g_pattern_spec_match_string()

Browse Source 
The g_pattern_match_string() variant is deprecated, switch to the
properly namespaced one.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1941>
This commit is contained in:
Jonas Ådahl 2021-07-27 17:33:38 +02:00 committed by Marge Bot
parent 641bed44a3
commit 23bebf3385
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -15,7 +15,7 @@ variables:
.mutter.fedora:34@common: .mutter.fedora:34@common:
variables: variables:
FDO_DISTRIBUTION_VERSION: 34 FDO_DISTRIBUTION_VERSION: 34
BASE_TAG: '2021-07-22.0' BASE_TAG: '2021-08-01.0'
FDO_DISTRIBUTION_PACKAGES: 'gdm gnome-shell xorg-x11-server-Xvfb sassc gcovr clang' FDO_DISTRIBUTION_PACKAGES: 'gdm gnome-shell xorg-x11-server-Xvfb sassc gcovr clang'
FDO_DISTRIBUTION_EXEC: | FDO_DISTRIBUTION_EXEC: |
@ -24,6 +24,10 @@ variables:
dnf builddep -y mutter --setopt=install_weak_deps=False && dnf builddep -y mutter --setopt=install_weak_deps=False &&
dnf builddep -y gnome-shell --setopt=install_weak_deps=False && dnf builddep -y gnome-shell --setopt=install_weak_deps=False &&
./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/GNOME/glib.git \
main . 02742ef957b532789c003eef80ec7f51c370e3d5 &&
./.gitlab-ci/install-meson-project.sh \ ./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \ https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \
41.alpha . && 41.alpha . &&

2
meson.build
View File

@ -13,7 +13,7 @@ libmutter_api_version = '@0@'.format(api_version)
# generic version requirements # generic version requirements
fribidi_req = '>= 1.0.0' fribidi_req = '>= 1.0.0'
glib_req = '>= 2.67.3' glib_req = '>= 2.69.0'
gi_req = '>= 0.9.5' gi_req = '>= 0.9.5'
graphene_req = '>= 1.10.2' graphene_req = '>= 1.10.2'
gtk3_req = '>= 3.19.8' gtk3_req = '>= 3.19.8'

4
src/wayland/meta-xwayland-grab-keyboard.c
View File

@ -182,8 +182,8 @@ application_is_in_pattern_array (MetaWindow *window,
{ {
GPatternSpec *pattern = (GPatternSpec *) g_ptr_array_index (pattern_array, i); GPatternSpec *pattern = (GPatternSpec *) g_ptr_array_index (pattern_array, i);
if (g_pattern_match_string (pattern, class) || if (g_pattern_spec_match_string (pattern, class) ||
g_pattern_match_string (pattern, name)) g_pattern_spec_match_string (pattern, name))
return TRUE; return TRUE;
} }