[gcr/main: 7/24] gcr-gtk3: Remove deprecated files




commit e90f1d3fb633f0c5e63a069c6cd86548d198da1d
Author: Corentin Noël <corentin noel collabora com>
Date:   Thu Dec 2 17:37:42 2021 +0100

    gcr-gtk3: Remove deprecated files

 gcr-gtk3/gcr-certificate-basics-widget.c  | 79 -------------------------------
 gcr-gtk3/gcr-certificate-basics-widget.h  | 65 -------------------------
 gcr-gtk3/gcr-certificate-details-widget.c | 79 -------------------------------
 gcr-gtk3/gcr-certificate-details-widget.h | 65 -------------------------
 gcr-gtk3/gcr-certificate-renderer.c       | 35 --------------
 gcr-gtk3/gcr-certificate-widget.c         |  1 -
 gcr-gtk3/gcr-deprecated.h                 | 55 ---------------------
 gcr-gtk3/gcr-gtk3.h                       |  1 -
 gcr-gtk3/gcr-renderer.c                   | 17 -------
 gcr-gtk3/meson.build                      | 10 +---
 10 files changed, 1 insertion(+), 406 deletions(-)
---
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-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"
@@ -131,22 +130,6 @@ gcr_renderer_render_view (GcrRenderer *self, GcrViewer *viewer)
        GCR_RENDERER_GET_INTERFACE (self)->render_view (self, 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
diff --git a/gcr-gtk3/meson.build b/gcr-gtk3/meson.build
index c4cc451..3daa567 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,
@@ -126,7 +118,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,
 )
 


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