[seahorse/object-list-bye: 2/4] libseahorse: Remove SeahorseObjectList
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/object-list-bye: 2/4] libseahorse: Remove SeahorseObjectList
- Date: Mon, 22 Feb 2021 17:34:46 +0000 (UTC)
commit 7d1f32ba5850a78d6ed4aefd4897c2bcea84f9e9
Author: Niels De Graef <nielsdegraef gmail com>
Date: Mon Feb 22 18:20:47 2021 +0100
libseahorse: Remove SeahorseObjectList
These days, we have `GListModel` for a list of objects, as well as
proper `GList` functions to do deep copying, free-ing, ...
libseahorse/meson.build | 1 -
libseahorse/seahorse-object-list.c | 84 --------------------------------------
libseahorse/seahorse-object-list.h | 41 -------------------
pgp/seahorse-gpgme-key-op.c | 1 -
pgp/seahorse-gpgme-uid.c | 2 -
pgp/seahorse-pgp-actions.c | 1 -
pgp/seahorse-pgp-key.c | 1 -
pgp/seahorse-pgp-uid.c | 2 -
pgp/seahorse-transfer.c | 5 +--
9 files changed, 2 insertions(+), 136 deletions(-)
---
diff --git a/libseahorse/meson.build b/libseahorse/meson.build
index b37777bd..a2dab02f 100644
--- a/libseahorse/meson.build
+++ b/libseahorse/meson.build
@@ -6,7 +6,6 @@ libseahorse_marshaller = gnome.genmarshal('seahorse-marshal',
libseahorse_sources = files(
'seahorse-bind.c',
- 'seahorse-object-list.c',
'seahorse-object-model.c',
'seahorse-progress.c',
'seahorse-util.c',
diff --git a/pgp/seahorse-gpgme-key-op.c b/pgp/seahorse-gpgme-key-op.c
index 93bb3eba..8c75f018 100644
--- a/pgp/seahorse-gpgme-key-op.c
+++ b/pgp/seahorse-gpgme-key-op.c
@@ -28,7 +28,6 @@
#include "seahorse-gpgme-data.h"
#include "seahorse-gpg-op.h"
-#include "libseahorse/seahorse-object-list.h"
#include "libseahorse/seahorse-progress.h"
#include "libseahorse/seahorse-util.h"
diff --git a/pgp/seahorse-gpgme-uid.c b/pgp/seahorse-gpgme-uid.c
index eac4c248..b5acb425 100644
--- a/pgp/seahorse-gpgme-uid.c
+++ b/pgp/seahorse-gpgme-uid.c
@@ -24,8 +24,6 @@
#include "seahorse-pgp-key.h"
#include "seahorse-pgp-signature.h"
-#include "libseahorse/seahorse-object-list.h"
-
#include <string.h>
#include <glib/gi18n.h>
diff --git a/pgp/seahorse-pgp-actions.c b/pgp/seahorse-pgp-actions.c
index 1dd6774c..4daedd07 100644
--- a/pgp/seahorse-pgp-actions.c
+++ b/pgp/seahorse-pgp-actions.c
@@ -37,7 +37,6 @@
#include "seahorse-common.h"
-#include "libseahorse/seahorse-object-list.h"
#include "libseahorse/seahorse-util.h"
GType seahorse_pgp_backend_actions_get_type (void) G_GNUC_CONST;
diff --git a/pgp/seahorse-pgp-key.c b/pgp/seahorse-pgp-key.c
index 66cf53f3..2859e8ec 100644
--- a/pgp/seahorse-pgp-key.c
+++ b/pgp/seahorse-pgp-key.c
@@ -24,7 +24,6 @@
#include "seahorse-pgp-uid.h"
#include "seahorse-pgp-subkey.h"
-#include "libseahorse/seahorse-object-list.h"
#include "libseahorse/seahorse-util.h"
#include <gcr/gcr.h>
diff --git a/pgp/seahorse-pgp-uid.c b/pgp/seahorse-pgp-uid.c
index ac8377e4..ab4b8718 100644
--- a/pgp/seahorse-pgp-uid.c
+++ b/pgp/seahorse-pgp-uid.c
@@ -23,8 +23,6 @@
#include "seahorse-pgp-uid.h"
#include "seahorse-pgp-signature.h"
-#include "libseahorse/seahorse-object-list.h"
-
#include <string.h>
#include <glib/gi18n.h>
diff --git a/pgp/seahorse-transfer.c b/pgp/seahorse-transfer.c
index 292acd6a..c7e91851 100644
--- a/pgp/seahorse-transfer.c
+++ b/pgp/seahorse-transfer.c
@@ -31,7 +31,6 @@
#include "seahorse-common.h"
-#include "libseahorse/seahorse-object-list.h"
#include "libseahorse/seahorse-progress.h"
#include "libseahorse/seahorse-util.h"
@@ -53,7 +52,7 @@ transfer_closure_free (gpointer user_data)
g_clear_object (&closure->from);
g_clear_object (&closure->to);
g_strfreev (closure->keyids);
- seahorse_object_list_free (closure->keys);
+ g_list_free_full (closure->keys, g_object_unref);
g_free (closure);
}
@@ -216,7 +215,7 @@ seahorse_transfer_keys_async (SeahorsePlace *from,
g_task_set_task_data (task, closure, transfer_closure_free);
if (SEAHORSE_IS_GPGME_KEYRING (from)) {
- closure->keys = seahorse_object_list_copy (keys);
+ closure->keys = g_list_copy_deep (keys, (GCopyFunc) g_object_ref, NULL);
} else {
GPtrArray *keyids;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]