diff --git a/js/ui/environment.js b/js/ui/environment.js index 83df7bcce..4853a83d5 100644 --- a/js/ui/environment.js +++ b/js/ui/environment.js @@ -8,7 +8,7 @@ imports.gi.versions.Atk = '1.0'; imports.gi.versions.Atspi = '2.0'; imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; imports.gi.versions.Cogl = Config.LIBMUTTER_API_VERSION; -imports.gi.versions.Gcr = '3'; +imports.gi.versions.Gcr = '4'; imports.gi.versions.Gdk = '3.0'; imports.gi.versions.Gdm = '1.0'; imports.gi.versions.Geoclue = '2.0'; diff --git a/meson.build b/meson.build index ea13eba17..a7a24c61a 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ libmutter_test_pc = 'libmutter-test-' + mutter_api_version ecal_req = '>= 3.33.1' eds_req = '>= 3.33.1' -gcr_req = '>= 3.7.5' +gcr_req = '>= 3.90.0' gio_req = '>= 2.56.0' gi_req = '>= 1.49.1' gjs_req = '>= 1.73.1' @@ -71,7 +71,7 @@ endif atk_bridge_dep = dependency('atk-bridge-2.0') ecal_dep = dependency('libecal-2.0', version: ecal_req) eds_dep = dependency('libedataserver-1.2', version: eds_req) -gcr_dep = dependency('gcr-base-3', version: gcr_req) +gcr_dep = dependency('gcr-4', version: gcr_req) gdk_x11_dep = dependency('gdk-x11-3.0') gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') gi_dep = dependency('gobject-introspection-1.0', version: gi_req) diff --git a/src/meson.build b/src/meson.build index 112782d86..e784a5132 100644 --- a/src/meson.build +++ b/src/meson.build @@ -213,7 +213,7 @@ libshell_dep = declare_dependency(link_with: libshell) libshell_gir_includes = [ 'Clutter-@0@'.format(mutter_api_version), 'Meta-@0@'.format(mutter_api_version), - 'Gcr-3', + 'Gcr-4', 'PolkitAgent-1.0' ] diff --git a/src/shell-keyring-prompt.c b/src/shell-keyring-prompt.c index 83c674638..bb0327966 100644 --- a/src/shell-keyring-prompt.c +++ b/src/shell-keyring-prompt.c @@ -26,7 +26,7 @@ #include "shell-secure-text-buffer.h" #define GCR_API_SUBJECT_TO_CHANGE -#include +#include #include @@ -91,7 +91,7 @@ enum { static GParamSpec *props[N_PROPS] = { NULL, }; -static void shell_keyring_prompt_iface (GcrPromptIface *iface); +static void shell_keyring_prompt_iface (GcrPromptInterface *iface); G_DEFINE_TYPE_WITH_CODE (ShellKeyringPrompt, shell_keyring_prompt, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (GCR_TYPE_PROMPT, shell_keyring_prompt_iface); @@ -531,7 +531,7 @@ shell_keyring_prompt_close (GcrPrompt *prompt) } static void -shell_keyring_prompt_iface (GcrPromptIface *iface) +shell_keyring_prompt_iface (GcrPromptInterface *iface) { iface->prompt_password_async = shell_keyring_prompt_password_async; iface->prompt_password_finish = shell_keyring_prompt_password_finish; diff --git a/src/shell-secure-text-buffer.c b/src/shell-secure-text-buffer.c index 03af451ba..8271410e2 100644 --- a/src/shell-secure-text-buffer.c +++ b/src/shell-secure-text-buffer.c @@ -26,7 +26,7 @@ #include "shell-secure-text-buffer.h" #define GCR_API_SUBJECT_TO_CHANGE -#include +#include #include