gcr: Remove deprecated methods

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>

5 files changed, 0 insertions, 189 deletions

diff --git a/gcr/gcr-deprecated-base.h b/gcr/gcr-deprecated-base.h
deleted file mode 100644
index 3554823..0000000
--- a/gcr/gcr-deprecated-base.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * gnome-keyring
- *
- * Copyright (C) 2011 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
-#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly."
-#endif
-
-#ifndef GCR_BASE_DEPRECATED_H_
-#define GCR_BASE_DEPRECATED_H_
-#ifndef GCR_DISABLE_DEPRECATED
-#ifndef __GI_SCANNER__
-
-#include <glib.h>
-
-#include "gcr-importer.h"
-#include "gcr-parser.h"
-
-G_BEGIN_DECLS
-
-#define           GCR_ERROR                                   (gcr_error_get_domain ())
-
-G_DEPRECATED
-GQuark            gcr_error_get_domain                        (void) G_GNUC_CONST;
-
-G_DEPRECATED_FOR(gcr_importer_listen)
-GcrParser *       gcr_importer_get_parser                     (GcrImporter *self);
-
-G_DEPRECATED_FOR(gcr_importer_listen)
-void              gcr_importer_set_parser                     (GcrImporter *self,
-                                                               GcrParser *parser);
-
-G_DEPRECATED
-GckSlot *         gcr_importer_get_slot                       (GcrImporter *self);
-
-G_DEPRECATED
-void              gcr_importer_set_slot                       (GcrImporter *self,
-                                                               GckSlot *slot);
-
-typedef enum {
-	GCR_IMPORTER_PROMPT_NEEDED,
-	GCR_IMPORTER_PROMPT_ALWAYS,
-	GCR_IMPORTER_PROMPT_NEVER
-} GcrImporterPromptBehavior;
-
-G_DEPRECATED
-GcrImporterPromptBehavior  gcr_importer_get_prompt_behavior   (GcrImporter *self);
-
-G_DEPRECATED
-void                       gcr_importer_set_prompt_behavior   (GcrImporter *self,
-                                                               GcrImporterPromptBehavior behavior);
-
-G_END_DECLS
-
-#endif /* __GI_SCANNER__ */
-#endif /* GCR_DISABLE_DEPRECATED */
-#endif /* GCRTYPES_H_ */
diff --git a/gcr/gcr-importer.c b/gcr/gcr-importer.c
index 802ded0..516e97a 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 44460ee..efc4b4a 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 91751bd..aaa2982 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 8b1448d..59ec0fa 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -50,7 +50,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',