gcr-gtk3: Remove deprecated files

10 files changed, 1 insertions, 406 deletions

diff --git a/gcr-gtk3/gcr-certificate-basics-widget.c b/gcr-gtk3/gcr-certificate-basics-widget.c
deleted file mode 100644
index 6646134..0000000
--- a/gcr-gtk3/gcr-certificate-basics-widget.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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/>.
- *
- * Stef Walter <stefw@collabora.co.uk>
- */
-
-#include "config.h"
-#include "gcr-certificate-basics-widget.h"
-
-#ifndef GCR_DISABLE_DEPRECATED
-
-/* These are all stubs for GcrCertificateWidget */
-
-GType
-gcr_certificate_basics_widget_get_type (void)
-{
-	return gcr_certificate_widget_get_type ();
-}
-
-/**
- * gcr_certificate_basics_widget_new: (skip)
- *
- * Create new certificate viewer.
- *
- * Deprecated: Since 2.30
- *
- * Returns: (transfer full) (type GcrUi.CertificateWidget): a new certificate widget
- */
-GcrCertificateBasicsWidget *
-gcr_certificate_basics_widget_new (GcrCertificate *cert)
-{
-	return gcr_certificate_widget_new (cert);
-}
-
-/**
- * gcr_certificate_basics_widget_get_certificate: (skip)
- *
- * Get certificate on viewer.
- *
- * Deprecated: Since 2.30
- *
- * Returns: (transfer none): the certificate
- */
-GcrCertificate *
-gcr_certificate_basics_widget_get_certificate (GcrCertificateBasicsWidget *basics)
-{
-	return gcr_certificate_widget_get_certificate (basics);
-}
-
-/**
- * gcr_certificate_basics_widget_set_certificate: (skip)
- * @basics: the certificate widget
- * @cert: the certificate
- *
- * Set certificate on viewer.
- *
- * Deprecated: Since 2.30
- */
-void
-gcr_certificate_basics_widget_set_certificate (GcrCertificateBasicsWidget *basics,
-                                                GcrCertificate *cert)
-{
-	return gcr_certificate_widget_set_certificate (basics, cert);
-}
-
-#endif /* GCR_DISABLE_DEPRECATED */
diff --git a/gcr-gtk3/gcr-certificate-basics-widget.h b/gcr-gtk3/gcr-certificate-basics-widget.h
deleted file mode 100644
index 9715ee9..0000000
--- a/gcr-gtk3/gcr-certificate-basics-widget.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2008 Stefan Walter
- *
- * 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/>.
- */
-
-#ifndef __GCR_CERTIFICATE_BASICS_WIDGET_H__
-#define __GCR_CERTIFICATE_BASICS_WIDGET_H__
-
-/*
- * GcrCertificateBasicsWidget has been replaced with GcrCertificateWidget.
- * These functions are stubs for GcrCertificateWidget.
- */
-
-#ifndef GCR_DISABLE_DEPRECATED
-
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include "gcr/gcr-certificate.h"
-#include "gcr/gcr-types.h"
-
-#include "gcr-certificate-widget.h"
-
-G_BEGIN_DECLS
-
-#define GCR_TYPE_CERTIFICATE_BASICS_WIDGET               (gcr_certificate_basics_widget_get_type ())
-#define GCR_CERTIFICATE_BASICS_WIDGET(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCR_TYPE_CERTIFICATE_BASICS_WIDGET, GcrCertificateBasicsWidget))
-#define GCR_CERTIFICATE_BASICS_WIDGET_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GCR_TYPE_CERTIFICATE_BASICS_WIDGET, GcrCertificateBasicsWidgetClass))
-#define GCR_IS_CERTIFICATE_BASICS_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GCR_TYPE_CERTIFICATE_BASICS_WIDGET))
-#define GCR_IS_CERTIFICATE_BASICS_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GCR_TYPE_CERTIFICATE_BASICS_WIDGET))
-#define GCR_CERTIFICATE_BASICS_WIDGET_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GCR_TYPE_CERTIFICATE_BASICS_WIDGET, GcrCertificateBasicsWidgetClass))
-
-typedef GcrCertificateWidget GcrCertificateBasicsWidget;
-typedef GcrCertificateWidgetClass GcrCertificateBasicsWidgetClass;
-
-G_DEPRECATED_FOR(gcr_certificate_widget_get_type)
-GType                        gcr_certificate_basics_widget_get_type               (void);
-
-G_DEPRECATED_FOR(gcr_certificate_widget_new)
-GcrCertificateBasicsWidget*  gcr_certificate_basics_widget_new                    (GcrCertificate *cert);
-
-G_DEPRECATED_FOR(gcr_certificate_widget_get_certificate)
-GcrCertificate*              gcr_certificate_basics_widget_get_certificate        (GcrCertificateBasicsWidget *basics);
-
-G_DEPRECATED_FOR(gcr_certificate_widget_set_certificate)
-void                         gcr_certificate_basics_widget_set_certificate        (GcrCertificateBasicsWidget *basics,
-                                                                                   GcrCertificate *cert);
-
-G_END_DECLS
-
-#endif /* GCR_DISABLE_DEPRECATED */
-
-#endif /* __GCR_CERTIFICATE_BASICS_WIDGET_H__ */
diff --git a/gcr-gtk3/gcr-certificate-details-widget.c b/gcr-gtk3/gcr-certificate-details-widget.c
deleted file mode 100644
index 79e215c..0000000
--- a/gcr-gtk3/gcr-certificate-details-widget.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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/>.
- *
- * Stef Walter <stefw@collabora.co.uk>
- */
-
-#include "config.h"
-#include "gcr-certificate-details-widget.h"
-
-#ifndef GCR_DISABLE_DEPRECATED
-
-/* These are all stubs for GcrCertificateWidget */
-
-GType
-gcr_certificate_details_widget_get_type (void)
-{
-	return gcr_certificate_widget_get_type ();
-}
-
-/**
- * gcr_certificate_details_widget_new: (skip)
- *
- * Create a new certificate viewer.
- *
- * Deprecated: Since 2.30
- *
- * Returns: (transfer full) (type GcrUi.CertificateWidget): a new certificate widget
- */
-GcrCertificateDetailsWidget *
-gcr_certificate_details_widget_new (GcrCertificate *cert)
-{
-	return gcr_certificate_widget_new (cert);
-}
-
-/**
- * gcr_certificate_details_widget_get_certificate: (skip)
- *
- * Get certificate displayed in viewer.
- *
- * Deprecated: Since 2.30
- *
- * Returns: (transfer none): the certificate
- */
-GcrCertificate*
-gcr_certificate_details_widget_get_certificate (GcrCertificateDetailsWidget *details)
-{
-	return gcr_certificate_widget_get_certificate (details);
-}
-
-/**
- * gcr_certificate_details_widget_set_certificate: (skip)
- * @details: the certificate widget
- * @cert: the certificate
- *
- * Set certificate displayed in viewer.
- *
- * Deprecated: Since 2.30
- */
-void
-gcr_certificate_details_widget_set_certificate (GcrCertificateDetailsWidget *details,
-                                                GcrCertificate *cert)
-{
-	return gcr_certificate_widget_set_certificate (details, cert);
-}
-
-#endif /* GCR_DISABLE_DEPRECATED */
diff --git a/gcr-gtk3/gcr-certificate-details-widget.h b/gcr-gtk3/gcr-certificate-details-widget.h
deleted file mode 100644
index 2a1de50..0000000
--- a/gcr-gtk3/gcr-certificate-details-widget.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2008 Stefan Walter
- *
- * 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/>.
- */
-
-#ifndef __GCR_CERTIFICATE_DETAILS_WIDGET_H__
-#define __GCR_CERTIFICATE_DETAILS_WIDGET_H__
-
-/*
- * GcrCertificateDetailsWidget has been replaced with GcrCertificateWidget.
- * These functions are stubs for GcrCertificateWidget.
- */
-
-#ifndef GCR_DISABLE_DEPRECATED
-
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include "gcr/gcr-certificate.h"
-#include "gcr/gcr-types.h"
-
-#include "gcr-certificate-widget.h"
-
-G_BEGIN_DECLS
-
-#define GCR_TYPE_CERTIFICATE_DETAILS_WIDGET               (gcr_certificate_details_widget_get_type ())
-#define GCR_CERTIFICATE_DETAILS_WIDGET(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCR_TYPE_CERTIFICATE_DETAILS_WIDGET, GcrCertificateDetailsWidget))
-#define GCR_CERTIFICATE_DETAILS_WIDGET_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GCR_TYPE_CERTIFICATE_DETAILS_WIDGET, GcrCertificateDetailsWidgetClass))
-#define GCR_IS_CERTIFICATE_DETAILS_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GCR_TYPE_CERTIFICATE_DETAILS_WIDGET))
-#define GCR_IS_CERTIFICATE_DETAILS_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GCR_TYPE_CERTIFICATE_DETAILS_WIDGET))
-#define GCR_CERTIFICATE_DETAILS_WIDGET_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GCR_TYPE_CERTIFICATE_DETAILS_WIDGET, GcrCertificateDetailsWidgetClass))
-
-typedef GcrCertificateWidget GcrCertificateDetailsWidget;
-typedef GcrCertificateWidgetClass GcrCertificateDetailsWidgetClass;
-
-G_DEPRECATED_FOR(gcr_certificate_widget_get_type)
-GType                         gcr_certificate_details_widget_get_type               (void);
-
-G_DEPRECATED_FOR(gcr_certificate_widget_new)
-GcrCertificateDetailsWidget*  gcr_certificate_details_widget_new                    (GcrCertificate *cert);
-
-G_DEPRECATED_FOR(gcr_certificate_widget_get_certificate)
-GcrCertificate*               gcr_certificate_details_widget_get_certificate        (GcrCertificateDetailsWidget *details);
-
-G_DEPRECATED_FOR(gcr_certificate_widget_set_certificate)
-void                          gcr_certificate_details_widget_set_certificate        (GcrCertificateDetailsWidget *details,
-                                                                                     GcrCertificate *cert);
-
-G_END_DECLS
-
-#endif /* GCR_DISABLE_DEPRECATED */
-
-#endif /* __GCR_CERTIFICATE_DETAILS_WIDGET_H__ */
diff --git a/gcr-gtk3/gcr-certificate-renderer.c b/gcr-gtk3/gcr-certificate-renderer.c
index 70bfb5d..65be5ba 100644
--- a/gcr-gtk3/gcr-certificate-renderer.c
+++ b/gcr-gtk3/gcr-certificate-renderer.c
@@ -27,7 +27,6 @@
 #include "gcr-certificate-exporter.h"
 #include "gcr-certificate-renderer.h"
 #include "gcr-certificate-renderer-private.h"
-#include "gcr-deprecated.h"
 #include "gcr-display-view.h"
 #include "gcr-renderer.h"
 
@@ -744,40 +743,6 @@ gcr_certificate_renderer_set_certificate (GcrCertificateRenderer *self, GcrCerti
 	g_object_notify (G_OBJECT (self), "certificate");
 }
 
-/**
- * gcr_certificate_renderer_get_attributes:
- * @self: The renderer
- *
- * Get the PKCS#11 attributes, if any, set for this renderer to display.
- *
- * Returns: (nullable) (transfer none): the attributes, owned by the renderer
- *
- * Deprecated: 3.6: Use gcr_renderer_get_attributes() instead
- */
-GckAttributes *
-gcr_certificate_renderer_get_attributes (GcrCertificateRenderer *self)
-{
-	g_return_val_if_fail (GCR_IS_CERTIFICATE_RENDERER (self), NULL);
-	return gcr_renderer_get_attributes (GCR_RENDERER (self));
-}
-
-/**
- * gcr_certificate_renderer_set_attributes:
- * @self: The renderer
- * @attrs: (nullable): attributes to set
- *
- * Set the PKCS#11 attributes for this renderer to display. One of the attributes
- * should be a `CKA_VALUE` type attribute containing a DER encoded certificate.
- *
- * Deprecated: 3.6: Use gcr_renderer_set_attributes() instead
- */
-void
-gcr_certificate_renderer_set_attributes (GcrCertificateRenderer *self, GckAttributes *attrs)
-{
-	g_return_if_fail (GCR_IS_CERTIFICATE_RENDERER (self));
-	gcr_renderer_set_attributes (GCR_RENDERER (self), attrs);
-}
-
 typedef struct {
 	GcrRenderer *renderer;
 	GcrDisplayView *view;
diff --git a/gcr-gtk3/gcr-certificate-widget.c b/gcr-gtk3/gcr-certificate-widget.c
index 731ccee..bfc6b36 100644
--- a/gcr-gtk3/gcr-certificate-widget.c
+++ b/gcr-gtk3/gcr-certificate-widget.c
@@ -21,7 +21,6 @@
 
 #include "gcr-certificate-renderer.h"
 #include "gcr-certificate-widget.h"
-#include "gcr-deprecated.h"
 #include "gcr-renderer.h"
 #include "gcr-viewer.h"
 
diff --git a/gcr-gtk3/gcr-deprecated.h b/gcr-gtk3/gcr-deprecated.h
deleted file mode 100644
index c374eb1..0000000
--- a/gcr-gtk3/gcr-deprecated.h
+++ /dev/null
@@ -1,55 +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_DEPRECATED_H_
-#define GCR_DEPRECATED_H_
-#ifndef GCR_DISABLE_DEPRECATED
-#ifndef __GI_SCANNER__
-
-#include <glib.h>
-
-#include "gcr-certificate-basics-widget.h"
-#include "gcr-certificate-details-widget.h"
-#include "gcr-certificate-renderer.h"
-#include "gcr-viewer.h"
-
-G_BEGIN_DECLS
-
-G_DEPRECATED_FOR(gcr_renderer_render_view)
-void              gcr_renderer_render                         (GcrRenderer *self,
-                                                               GcrViewer *viewer);
-
-G_DEPRECATED_FOR(gcr_renderer_get_attributes)
-GckAttributes *   gcr_certificate_renderer_get_attributes     (GcrCertificateRenderer *self);
-
-G_DEPRECATED_FOR(gcr_renderer_set_attributes)
-void              gcr_certificate_renderer_set_attributes     (GcrCertificateRenderer *self,
-                                                               GckAttributes *attrs);
-
-G_END_DECLS
-
-#endif /* __GI_SCANNER__ */
-#endif /* GCR_DISABLE_DEPRECATED */
-#endif /* GCRTYPES_H_ */
diff --git a/gcr-gtk3/gcr-gtk3.h b/gcr-gtk3/gcr-gtk3.h
index 8320bbd..67b99d8 100644
--- a/gcr-gtk3/gcr-gtk3.h
+++ b/gcr-gtk3/gcr-gtk3.h
@@ -36,7 +36,6 @@
 #include <gcr-gtk3/gcr-certificate-widget.h>
 #include <gcr-gtk3/gcr-collection-model.h>
 #include <gcr-gtk3/gcr-combo-selector.h>
-#include <gcr-gtk3/gcr-deprecated.h>
 #include <gcr-gtk3/gcr-enum-types.h>
 #include <gcr-gtk3/gcr-key-renderer.h>
 #include <gcr-gtk3/gcr-key-widget.h>
diff --git a/gcr-gtk3/gcr-renderer.c b/gcr-gtk3/gcr-renderer.c
index 46adae5..a10d639 100644
--- a/gcr-gtk3/gcr-renderer.c
+++ b/gcr-gtk3/gcr-renderer.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include "gcr-deprecated.h"
 #include "gcr-renderer.h"
 
 #include "gcr-certificate-renderer.h"
@@ -132,22 +131,6 @@ gcr_renderer_render_view (GcrRenderer *self, GcrViewer *viewer)
 }
 
 /**
- * gcr_renderer_render:
- * @self: the renderer
- * @viewer: the viewer to render to
- *
- * Render a renderer to the viewer.
- *
- * Deprecated: 3.2: Use gcr_renderer_render_view() instead
- */
-void
-gcr_renderer_render (GcrRenderer *self,
-                     GcrViewer *viewer)
-{
-	gcr_renderer_render_view (self, viewer);
-}
-
-/**
  * gcr_renderer_popuplate_popup:
  * @self: The renderer
  * @viewer: The viewer that is displaying a popup
diff --git a/gcr-gtk3/meson.build b/gcr-gtk3/meson.build
index c4da762..b35fe01 100644
--- a/gcr-gtk3/meson.build
+++ b/gcr-gtk3/meson.build
@@ -23,8 +23,6 @@ gcr_gtk3_public_sources = files(
 
 gcr_gtk3_private_sources = files(
   'eggimagemenuitem.c',
-  'gcr-certificate-basics-widget.c',
-  'gcr-certificate-details-widget.c',
   'gcr-certificate-exporter.c',
   'gcr-certificate-request-renderer.c',
   'gcr-dialog-util.c',
@@ -43,7 +41,6 @@ gcr_gtk3_headers = files(
   'gcr-certificate-widget.h',
   'gcr-collection-model.h',
   'gcr-combo-selector.h',
-  'gcr-deprecated.h',
   'gcr-failure-renderer.h',
   'gcr-key-renderer.h',
   'gcr-key-widget.h',
@@ -58,11 +55,6 @@ gcr_gtk3_headers = files(
   'gcr-viewer-widget.h',
 )
 
-gcr_gtk3_deprecated_headers = files(
-  'gcr-certificate-basics-widget.h',
-  'gcr-certificate-details-widget.h',
-)
-
 # Generated sources
 gcr_gtk3_enums_gen = gnome.mkenums_simple('gcr-enum-types',
   sources: gcr_gtk3_headers,
@@ -124,7 +116,7 @@ pkgconfig.generate(gcr_gtk3_lib,
   description: 'GObject and GUI library for high level crypto parsing and display',
 )
 
-install_headers([gcr_gtk3_headers, gcr_gtk3_deprecated_headers ],
+install_headers(gcr_gtk3_headers,
   subdir: gcr_gtk3_headers_install_dir,
 )