[gcr/wip/gcr4] gcr: Remove deprecated symbols



commit 48f0ea2d27a4de35bc32300b93853beb09ba1995
Author: Corentin Noël <corentin noel collabora com>
Date:   Mon Oct 4 20:36:41 2021 +0200

    gcr: Remove deprecated symbols
    
    Remove deprecated structs and functions.

 gcr/gcr-base.h              |   1 -
 gcr/gcr-deprecated-base.h   |  79 ---------------------------------
 gcr/gcr-importer.c          | 103 --------------------------------------------
 gcr/gcr-library.c           |  10 -----
 gcr/gcr-simple-collection.c |  20 ---------
 gcr/meson.build             |   1 -
 6 files changed, 214 deletions(-)
---
diff --git a/gcr/gcr-base.h b/gcr/gcr-base.h
index ea80d8e..72244a8 100644
--- a/gcr/gcr-base.h
+++ b/gcr/gcr-base.h
@@ -38,7 +38,6 @@
 #include <gcr/gcr-certificate-chain.h>
 #include <gcr/gcr-certificate-request.h>
 #include <gcr/gcr-column.h>
-#include <gcr/gcr-deprecated-base.h>
 #include <gcr/gcr-enum-types-base.h>
 #include <gcr/gcr-filter-collection.h>
 #include <gcr/gcr-icons.h>
diff --git a/gcr/gcr-importer.c b/gcr/gcr-importer.c
index 0a119e8..4b04b3b 100644
--- a/gcr/gcr-importer.c
+++ b/gcr/gcr-importer.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include "gcr-deprecated-base.h"
 #include "gcr-importer.h"
 #include "gcr-internal.h"
 #include "gcr-gnupg-importer.h"
@@ -553,105 +552,3 @@ gcr_importer_register_well_known (void)
        g_type_class_unref (g_type_class_ref (GCR_TYPE_PKCS11_IMPORTER));
        g_type_class_unref (g_type_class_ref (GCR_TYPE_GNUPG_IMPORTER));
 }
-
-#ifndef GCR_DISABLE_DEPRECATED
-
-/**
- * gcr_importer_get_parser:
- * @self: An importer
- *
- * Has no effect. Use gcr_importer_listen() instead.
- *
- * Returns: %NULL is always returned.
- * Deprecated: Since 3.0.0
- */
-GcrParser*
-gcr_importer_get_parser (GcrImporter *self)
-{
-        g_warning ("gcr_importer_get_parser() is no longer supported "
-                   "Use gcr_importer_listen() instead.");
-        return NULL;
-}
-
-/**
- * gcr_importer_set_parser:
- * @self: An importer
- * @parser: A parser
- *
- * Has no effect. Use gcr_importer_listen() instead.
- *
- * Deprecated: Since 3.0.0
- */
-void
-gcr_importer_set_parser (GcrImporter *self,
-                         GcrParser *parser)
-{
-        g_warning ("gcr_importer_set_parser() is no longer supported "
-                   "Use gcr_importer_listen() instead.");
-}
-
-/*
- * gcr_importer_get_slot:
- * @self: The importer
- *
- * Returns %NULL.
- *
- * Deprecated: since 3.4.0
- */
-GckSlot *
-gcr_importer_get_slot (GcrImporter *self)
-{
-        g_warning ("gcr_importer_get_slot() is no longer supported.");
-        return NULL;
-}
-
-/**
- * gcr_importer_set_slot:
- * @self: The importer
- * @slot: The slot to import to
- *
- * Has no effect.
- *
- * Deprecated: since 3.4.0
- */
-void
-gcr_importer_set_slot (GcrImporter *self,
-                       GckSlot *slot)
-{
-        g_warning ("gcr_importer_set_slot() is no longer supported.");
-}
-
-/**
- * gcr_importer_get_prompt_behavior:
- * @self: The importer
- *
- * Does nothing.
- *
- * Returns: zero
- *
- * Deprecated: since 3.4.0
- */
-GcrImporterPromptBehavior
-gcr_importer_get_prompt_behavior (GcrImporter *self)
-{
-       g_warning ("gcr_importer_get_prompt_behavior() is no longer supported.");
-       return 0;
-}
-
-/**
- * gcr_importer_set_prompt_behavior:
- * @self: The importer
- * @behavior: The prompt behavior flag
- *
- * Has no effect.
- *
- * Deprecated: since 3.4.0
- */
-void
-gcr_importer_set_prompt_behavior (GcrImporter *self,
-                                  GcrImporterPromptBehavior behavior)
-{
-       g_warning ("gcr_importer_set_prompt_behavior() is no longer supported.");
-}
-
-#endif /* GCR_DISABLE_DEPRECATED */
diff --git a/gcr/gcr-library.c b/gcr/gcr-library.c
index 399c7e2..dad981b 100644
--- a/gcr/gcr-library.c
+++ b/gcr/gcr-library.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include "gcr-deprecated-base.h"
 #include "gcr-internal.h"
 #include "gcr-library.h"
 #include "gcr-types.h"
@@ -135,15 +134,6 @@ gcr_data_error_get_domain (void)
        return domain;
 }
 
-GQuark
-gcr_error_get_domain (void)
-{
-       static GQuark domain = 0;
-       if (domain == 0)
-               domain = g_quark_from_static_string ("gcr-error");
-       return domain;
-}
-
 /* -----------------------------------------------------------------------------
  * INITIALIZATION
  */
diff --git a/gcr/gcr-simple-collection.c b/gcr/gcr-simple-collection.c
index c90149b..00d187b 100644
--- a/gcr/gcr-simple-collection.c
+++ b/gcr/gcr-simple-collection.c
@@ -20,7 +20,6 @@
 #include "config.h"
 
 #include "gcr-collection.h"
-#include "gcr-deprecated-base.h"
 #include "gcr-internal.h"
 #include "gcr-simple-collection.h"
 
@@ -185,22 +184,3 @@ gcr_simple_collection_remove (GcrSimpleCollection *self, GObject *object)
        gcr_collection_emit_removed (GCR_COLLECTION (self), object);
        g_object_unref (object);
 }
-
-/**
- * gcr_simple_collection_contains:
- * @self: The collection
- * @object: The object to check
- *
- * Check if the collection contains a certain object.
- *
- * Deprecated: use gcr_collection_contains() instead
- *
- * Returns: %TRUE if the collection contains the object.
- */
-gboolean
-gcr_simple_collection_contains (GcrSimpleCollection *self, GObject *object)
-{
-       g_return_val_if_fail (GCR_IS_SIMPLE_COLLECTION (self), FALSE);
-       g_return_val_if_fail (G_IS_OBJECT (object), FALSE);
-       return gcr_collection_contains (GCR_COLLECTION (self), object);
-}
diff --git a/gcr/meson.build b/gcr/meson.build
index 2233a44..0d5672c 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -56,7 +56,6 @@ gcr_base_headers = files(
   'gcr-collection.h',
   'gcr-column.h',
   'gcr-comparable.h',
-  'gcr-deprecated-base.h',
   'gcr-fingerprint.h',
   'gcr-filter-collection.h',
   'gcr-icons.h',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]