[gcr/nielsdg/drop-gcr-column: 2/2] gcr: Drop GcrColumn

[Niels De Graef <nielsdg src gnome org>]

commit 06b8ed27b547aa9ae4adb25326bd3cd5302bb0cf
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Mon Jun 27 17:27:54 2022 +0200

    gcr: Drop GcrColumn
    
    These were just used for display treeviews. We're not really interested
    in putting that kind of stuff inside gcr itself, so just remove it.

 gcr/gcr-certificate.c | 54 ------------------------------------------------
 gcr/gcr-certificate.h |  4 ----
 gcr/gcr-column.c      | 56 --------------------------------------------------
 gcr/gcr-column.h      | 57 ---------------------------------------------------
 gcr/gcr-gnupg-key.c   | 21 -------------------
 gcr/gcr-gnupg-key.h   |  4 ----
 gcr/gcr.h             |  1 -
 gcr/meson.build       |  2 --
 8 files changed, 199 deletions(-)
---
diff --git a/gcr/gcr-certificate.c b/gcr/gcr-certificate.c
index 71a14168..84b666c1 100644
--- a/gcr/gcr-certificate.c
+++ b/gcr/gcr-certificate.c
@@ -68,15 +68,6 @@
  * The interface that implementors of #GcrCertificate must implement.
  */
 
-/**
- * GCR_CERTIFICATE_COLUMNS:
- *
- * The columns that are valid for a certificate. This is to be used with
- * the [class@TreeSelector] or [class@CollectionModel].
- *
- * This is an array of #GcrColumn, owned by the gcr library.
- */
-
 /*
  * The DER data in this structure is owned by the derived class.
  * It is only valid for the duration of the current call stack
@@ -218,27 +209,6 @@ gcr_certificate_get_markup_text (GcrCertificate *self)
        return markup;
 }
 
-static void
-on_transform_date_to_string (const GValue *src, GValue *dest)
-{
-       static const gsize len = 256;
-       GDate *date;
-       gchar *result;
-
-       g_return_if_fail (G_VALUE_TYPE (src) == G_TYPE_DATE);
-
-       date = g_value_get_boxed (src);
-       g_return_if_fail (date);
-
-       result = g_malloc0 (len);
-       if (!g_date_strftime (result, len, "%x", date)) {
-               g_free (result);
-               result = NULL;
-       }
-
-       g_value_take_string (dest, result);
-}
-
 /* ---------------------------------------------------------------------------------
  * INTERFACE
  */
@@ -317,30 +287,6 @@ G_DEFINE_INTERFACE (GcrCertificate, gcr_certificate, GCR_TYPE_COMPARABLE);
  * PUBLIC
  */
 
-/**
- * gcr_certificate_get_columns: (skip)
- *
- * Get the columns appropriate for a certificate
- *
- * Returns: (transfer none): the columns
- */
-const GcrColumn*
-gcr_certificate_get_columns (void)
-{
-       static GcrColumn columns[] = {
-               { "label", G_TYPE_STRING, G_TYPE_STRING, NC_("column", "Name"),
-                 GCR_COLUMN_SORTABLE },
-               { "issuer", G_TYPE_STRING, G_TYPE_STRING, NC_("column", "Issued By"),
-                 GCR_COLUMN_SORTABLE },
-               { "expiry", /* later */ 0, G_TYPE_STRING, NC_("column", "Expires"),
-                 GCR_COLUMN_SORTABLE, on_transform_date_to_string },
-               { NULL }
-       };
-
-       columns[3].property_type = G_TYPE_DATE;
-       return columns;
-}
-
 /**
  * gcr_certificate_compare:
  * @first: (nullable): the certificate to compare
diff --git a/gcr/gcr-certificate.h b/gcr/gcr-certificate.h
index d6a60b92..444b2f58 100644
--- a/gcr/gcr-certificate.h
+++ b/gcr/gcr-certificate.h
@@ -25,7 +25,6 @@
 #endif
 
 #include "gcr-types.h"
-#include "gcr-column.h"
 #include "gcr-comparable.h"
 
 #include <glib-object.h>
@@ -33,7 +32,6 @@
 
 G_BEGIN_DECLS
 
-#define GCR_CERTIFICATE_COLUMNS                 (gcr_certificate_get_columns ())
 #define GCR_TYPE_CERTIFICATE                    (gcr_certificate_get_type ())
 #define GCR_CERTIFICATE(obj)                    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCR_TYPE_CERTIFICATE, 
GcrCertificate))
 #define GCR_IS_CERTIFICATE(obj)                 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GCR_TYPE_CERTIFICATE))
@@ -74,8 +72,6 @@ GType               gcr_certificate_get_type               (void);
 const guint8 *      gcr_certificate_get_der_data           (GcrCertificate *self,
                                                             gsize *n_data);
 
-const GcrColumn*    gcr_certificate_get_columns            (void);
-
 gint                gcr_certificate_compare                (GcrComparable *first,
                                                             GcrComparable *other);
 
diff --git a/gcr/gcr-gnupg-key.c b/gcr/gcr-gnupg-key.c
index defeaaf8..9dd6dc43 100644
--- a/gcr/gcr-gnupg-key.c
+++ b/gcr/gcr-gnupg-key.c
@@ -373,24 +373,3 @@ _gcr_gnupg_key_get_keyid (GcrGnupgKey *self)
        g_return_val_if_fail (GCR_IS_GNUPG_KEY (self), NULL);
        return _gcr_gnupg_records_get_keyid (self->pv->public_records);
 }
-
-/**
- * _gcr_gnupg_key_get_columns:
- *
- * Get the columns that we should display for gnupg keys.
- *
- * Returns: (transfer none): The columns, %NULL terminated, should not be freed.
- */
-const GcrColumn*
-_gcr_gnupg_key_get_columns (void)
-{
-       static GcrColumn columns[] = {
-               { "label", G_TYPE_STRING, G_TYPE_STRING, NC_("column", "Name"),
-                 GCR_COLUMN_SORTABLE, NULL, 0 },
-               { "short-keyid", G_TYPE_STRING, G_TYPE_STRING, NC_("column", "Key ID"),
-                 GCR_COLUMN_SORTABLE, NULL, 0 },
-               { NULL }
-       };
-
-       return columns;
-}
diff --git a/gcr/gcr-gnupg-key.h b/gcr/gcr-gnupg-key.h
index cceb71b9..daab378b 100644
--- a/gcr/gcr-gnupg-key.h
+++ b/gcr/gcr-gnupg-key.h
@@ -26,12 +26,10 @@
 
 #include <glib-object.h>
 
-#include "gcr-column.h"
 #include "gcr-types.h"
 
 G_BEGIN_DECLS
 
-#define GCR_GNUPG_KEY_COLUMNS            (_gcr_gnupg_key_get_columns ())
 #define GCR_TYPE_GNUPG_KEY               (_gcr_gnupg_key_get_type ())
 #define GCR_GNUPG_KEY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCR_TYPE_GNUPG_KEY, 
GcrGnupgKey))
 #define GCR_GNUPG_KEY_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GCR_TYPE_GNUPG_KEY, 
GcrGnupgKeyClass))
@@ -55,8 +53,6 @@ struct _GcrGnupgKeyClass {
 
 GType               _gcr_gnupg_key_get_type                      (void);
 
-const GcrColumn*    _gcr_gnupg_key_get_columns                   (void);
-
 GcrGnupgKey*        _gcr_gnupg_key_new                           (GPtrArray *pubset,
                                                                   GPtrArray *secset);
 
diff --git a/gcr/gcr.h b/gcr/gcr.h
index 7135e819..17b4da02 100644
--- a/gcr/gcr.h
+++ b/gcr/gcr.h
@@ -35,7 +35,6 @@
 #include <gcr/gcr-certificate.h>
 #include <gcr/gcr-certificate-chain.h>
 #include <gcr/gcr-certificate-request.h>
-#include <gcr/gcr-column.h>
 #include <gcr/gcr-enum-types.h>
 #include <gcr/gcr-fingerprint.h>
 #include <gcr/gcr-importer.h>
diff --git a/gcr/meson.build b/gcr/meson.build
index 7ccb6425..d3f231d9 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -26,7 +26,6 @@ gcr_public_sources = files(
 gcr_private_sources = files(
   'gcr-callback-output-stream.c',
   'gcr-certificate-extensions.c',
-  'gcr-column.c',
   'gcr-gnupg-importer.c',
   'gcr-gnupg-key.c',
   'gcr-gnupg-process.c',
@@ -46,7 +45,6 @@ gcr_headers = files(
   'gcr-certificate.h',
   'gcr-certificate-chain.h',
   'gcr-certificate-request.h',
-  'gcr-column.h',
   'gcr-comparable.h',
   'gcr-fingerprint.h',
   'gcr-importer.h',