[gcr/main: 5/21] gcr: Remove deprecated methods




commit 32c8652e4e0dbb75e7d8e209cf4d6aead119bdca
Author: Corentin Noël <corentin noel collabora com>
Date:   Thu Dec 9 11:30:30 2021 +0100

    gcr: Remove deprecated methods
    
    Signed-off-by: Corentin Noël <corentin noel collabora com>

 gcr/gcr-deprecated-base.h |  74 ---------------------------------
 gcr/gcr-importer.c        | 103 ----------------------------------------------
 gcr/gcr-library.c         |  10 -----
 gcr/gcr.h                 |   1 -
 gcr/meson.build           |   1 -
 5 files changed, 189 deletions(-)
---
diff --git a/gcr/gcr-importer.c b/gcr/gcr-importer.c
index 802ded09..516e97a1 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"
@@ -546,105 +545,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 44460eed..efc4b4a4 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"
@@ -95,15 +94,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.h b/gcr/gcr.h
index 91751bd4..aaa2982d 100644
--- a/gcr/gcr.h
+++ b/gcr/gcr.h
@@ -36,7 +36,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.h>
 #include <gcr/gcr-fingerprint.h>
 #include <gcr/gcr-icons.h>
diff --git a/gcr/meson.build b/gcr/meson.build
index 9eb7ec93..84caa231 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -49,7 +49,6 @@ gcr_headers = files(
   'gcr-certificate-request.h',
   'gcr-column.h',
   'gcr-comparable.h',
-  'gcr-deprecated-base.h',
   'gcr-fingerprint.h',
   'gcr-icons.h',
   'gcr-importer.h',


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