[libnma] cert-chooser-button: adjust the gck version check
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libnma] cert-chooser-button: adjust the gck version check
- Date: Sun, 28 Aug 2022 10:33:22 +0000 (UTC)
commit 32628e8435569c2b9157cbdcc7855d7a122ff934
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Wed Aug 3 13:40:32 2022 +0200
cert-chooser-button: adjust the gck version check
It's no longer necessary to consult the GCR version. We, however, have
to dance around some GCK version oddity.
https://gitlab.gnome.org/GNOME/libnma/-/merge_requests/36
src/nma-cert-chooser-button.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/nma-cert-chooser-button.c b/src/nma-cert-chooser-button.c
index f5f99b87..4b14587c 100644
--- a/src/nma-cert-chooser-button.c
+++ b/src/nma-cert-chooser-button.c
@@ -15,9 +15,9 @@
#if GTK_CHECK_VERSION(4,0,0) ? WITH_GCR_GTK4 : WITH_GCR_GTK3
#include "nma-pkcs11-cert-chooser-dialog.h"
#include <gck/gck.h>
-#include <gcr/gcr.h> // FIXME: Only here to detect GCK version
- // Remove once new GCK is released with version bumped
-#if !GCR_CHECK_VERSION(3,90,0)
+/* GCK version numbers are funny: version 3 is older than version 1.9x.
+ * See: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/109 */
+#if !GCK_CHECK_VERSION(1,90,0) || (GCK_MAJOR_VERSION == 3 && GCK_MINOR_VERSION < 90)
#define gck_uri_data_parse gck_uri_parse
#endif
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]