[gcr/main] gcr: Remove the GcrCollection interface
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcr/main] gcr: Remove the GcrCollection interface
- Date: Thu, 9 Dec 2021 10:24:27 +0000 (UTC)
commit 4023acd5d2015ffcd9697e9c4de67a3413a2c4a5
Author: Corentin Noël <corentin noel collabora com>
Date: Thu Dec 9 11:23:02 2021 +0100
gcr: Remove the GcrCollection interface
There is now the GListModel interface in GLib that should be used for this.
Signed-off-by: Corentin Noël <corentin noel collabora com>
gcr/gcr-callback-output-stream.h | 3 +-
gcr/gcr-collection.c | 169 ---------
gcr/gcr-collection.h | 80 -----
gcr/gcr-deprecated-base.h | 5 -
gcr/gcr-filter-collection.c | 372 --------------------
gcr/gcr-filter-collection.h | 76 ----
gcr/gcr-gnupg-collection.c | 738 ---------------------------------------
gcr/gcr-gnupg-collection.h | 69 ----
gcr/gcr-simple-collection.c | 193 ----------
gcr/gcr-simple-collection.h | 65 ----
gcr/gcr-single-collection.c | 151 --------
gcr/gcr-single-collection.h | 45 ---
gcr/gcr-union-collection.c | 339 ------------------
gcr/gcr-union-collection.h | 77 ----
gcr/gcr.h | 3 -
gcr/meson.build | 12 -
gcr/test-filter-collection.c | 272 ---------------
gcr/test-gnupg-collection.c | 249 -------------
18 files changed, 1 insertion(+), 2917 deletions(-)
---
diff --git a/gcr/gcr-callback-output-stream.h b/gcr/gcr-callback-output-stream.h
index b4ba031..668ce5f 100644
--- a/gcr/gcr-callback-output-stream.h
+++ b/gcr/gcr-callback-output-stream.h
@@ -22,9 +22,8 @@
#ifndef GCR_CALLBACK_OUTPUT_STREAM_H
#define GCR_CALLBACK_OUTPUT_STREAM_H
-#include "gcr-collection.h"
-
#include <glib-object.h>
+#include <gio/gio.h>
G_BEGIN_DECLS
diff --git a/gcr/gcr-deprecated-base.h b/gcr/gcr-deprecated-base.h
index 55dc087..3554823 100644
--- a/gcr/gcr-deprecated-base.h
+++ b/gcr/gcr-deprecated-base.h
@@ -32,7 +32,6 @@
#include "gcr-importer.h"
#include "gcr-parser.h"
-#include "gcr-simple-collection.h"
G_BEGIN_DECLS
@@ -41,10 +40,6 @@ G_BEGIN_DECLS
G_DEPRECATED
GQuark gcr_error_get_domain (void) G_GNUC_CONST;
-G_DEPRECATED_FOR(gcr_collection_contains)
-gboolean gcr_simple_collection_contains (GcrSimpleCollection *self,
- GObject *object);
-
G_DEPRECATED_FOR(gcr_importer_listen)
GcrParser * gcr_importer_get_parser (GcrImporter *self);
diff --git a/gcr/gcr.h b/gcr/gcr.h
index bbb7b12..91751bd 100644
--- a/gcr/gcr.h
+++ b/gcr/gcr.h
@@ -38,7 +38,6 @@
#include <gcr/gcr-column.h>
#include <gcr/gcr-deprecated-base.h>
#include <gcr/gcr-enum-types.h>
-#include <gcr/gcr-filter-collection.h>
#include <gcr/gcr-fingerprint.h>
#include <gcr/gcr-icons.h>
#include <gcr/gcr-importer.h>
@@ -50,12 +49,10 @@
#include <gcr/gcr-secret-exchange.h>
#include <gcr/gcr-secure-memory.h>
#include <gcr/gcr-simple-certificate.h>
-#include <gcr/gcr-simple-collection.h>
#include <gcr/gcr-ssh-askpass.h>
#include <gcr/gcr-system-prompt.h>
#include <gcr/gcr-system-prompter.h>
#include <gcr/gcr-trust.h>
-#include <gcr/gcr-union-collection.h>
#include <gcr/gcr-unlock-options.h>
#include <gcr/gcr-version.h>
diff --git a/gcr/meson.build b/gcr/meson.build
index 673c22c..66191b1 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -4,9 +4,7 @@ gcr_public_sources = files(
'gcr-certificate.c',
'gcr-certificate-chain.c',
'gcr-certificate-request.c',
- 'gcr-collection.c',
'gcr-comparable.c',
- 'gcr-filter-collection.c',
'gcr-fingerprint.c',
'gcr-icons.c',
'gcr-importer.c',
@@ -19,19 +17,16 @@ gcr_public_sources = files(
'gcr-secret-exchange.c',
'gcr-secure-memory.c',
'gcr-simple-certificate.c',
- 'gcr-simple-collection.c',
'gcr-ssh-askpass.c',
'gcr-system-prompt.c',
'gcr-system-prompter.c',
'gcr-trust.c',
- 'gcr-union-collection.c',
)
gcr_private_sources = files(
'gcr-callback-output-stream.c',
'gcr-certificate-extensions.c',
'gcr-column.c',
- 'gcr-gnupg-collection.c',
'gcr-gnupg-importer.c',
'gcr-gnupg-key.c',
'gcr-gnupg-process.c',
@@ -43,7 +38,6 @@ gcr_private_sources = files(
'gcr-openssh.c',
'gcr-pkcs11-importer.c',
'gcr-record.c',
- 'gcr-single-collection.c',
'gcr-subject-public-key.c',
'gcr-util.c',
)
@@ -53,12 +47,10 @@ gcr_headers = files(
'gcr-certificate.h',
'gcr-certificate-chain.h',
'gcr-certificate-request.h',
- 'gcr-collection.h',
'gcr-column.h',
'gcr-comparable.h',
'gcr-deprecated-base.h',
'gcr-fingerprint.h',
- 'gcr-filter-collection.h',
'gcr-icons.h',
'gcr-importer.h',
'gcr-import-interaction.h',
@@ -70,13 +62,11 @@ gcr_headers = files(
'gcr-secret-exchange.h',
'gcr-secure-memory.h',
'gcr-simple-certificate.h',
- 'gcr-simple-collection.h',
'gcr-ssh-askpass.h',
'gcr-system-prompt.h',
'gcr-system-prompter.h',
'gcr-trust.h',
'gcr-types.h',
- 'gcr-union-collection.h',
'gcr-unlock-options.h',
)
@@ -326,7 +316,6 @@ endforeach
# Tests
gcr_test_names = [
'util',
- 'filter-collection',
'secret-exchange',
'simple-certificate',
'certificate',
@@ -342,7 +331,6 @@ gcr_test_names = [
'record',
'memory-icon',
'gnupg-key',
- 'gnupg-collection',
'gnupg-process',
'system-prompt',
'ssh-askpass',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]