1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
| | From 12178d7cc7fad52f61003b3221bd0a713ef80507 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 5 Nov 2018 09:59:27 +0100
Subject: [PATCH] Fix type-argument mismatches related to GLib.List
---
common/deleter.vala | 2 +-
common/exporter.vala | 2 +-
gkr/gkr-item.vala | 2 +-
gkr/gkr-keyring.vala | 2 +-
pkcs11/certificate-der-exporter.vala | 4 ++--
pkcs11/pkcs11-deleter.vala | 2 +-
pkcs11/pkcs11-token.vala | 4 ++--
ssh/deleter.vala | 2 +-
ssh/exporter.vala | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/common/deleter.vala b/common/deleter.vala
index 18dd0d4c..1c50cdaf 100644
--- a/common/deleter.vala
+++ b/common/deleter.vala
@@ -24,7 +24,7 @@ namespace Seahorse {
public abstract class Deleter : GLib.Object {
public abstract Gtk.Dialog create_confirm(Gtk.Window? parent);
- public abstract unowned GLib.List<weak GLib.Object> get_objects();
+ public abstract unowned GLib.List<GLib.Object> get_objects();
public abstract bool add_object (GLib.Object obj);
diff --git a/common/exporter.vala b/common/exporter.vala
index e686ff0d..edc4b4d3 100644
--- a/common/exporter.vala
+++ b/common/exporter.vala
@@ -35,7 +35,7 @@ public interface Exporter : GLib.Object {
public abstract Gtk.FileFilter file_filter { owned get; }
- public abstract unowned GLib.List<weak GLib.Object> get_objects();
+ public abstract unowned GLib.List<GLib.Object> get_objects();
public abstract bool add_object(GLib.Object obj);
diff --git a/gkr/gkr-item.vala b/gkr/gkr-item.vala
index ec45a5c7..bdcf14d1 100644
--- a/gkr/gkr-item.vala
+++ b/gkr/gkr-item.vala
@@ -513,7 +513,7 @@ class ItemDeleter : Deleter {
GLib.assert_not_reached();
}
- public override unowned GLib.List<weak GLib.Object> get_objects() {
+ public override unowned GLib.List<GLib.Object> get_objects() {
return this._items;
}
diff --git a/gkr/gkr-keyring.vala b/gkr/gkr-keyring.vala
index e6ecaf76..096bb0ae 100644
--- a/gkr/gkr-keyring.vala
+++ b/gkr/gkr-keyring.vala
@@ -248,7 +248,7 @@ class KeyringDeleter : Deleter {
GLib.assert_not_reached();
}
- public override unowned GLib.List<weak GLib.Object> get_objects() {
+ public override unowned GLib.List<GLib.Object> get_objects() {
return this._objects;
}
diff --git a/pkcs11/certificate-der-exporter.vala b/pkcs11/certificate-der-exporter.vala
index e8789f52..57e6ec25 100644
--- a/pkcs11/certificate-der-exporter.vala
+++ b/pkcs11/certificate-der-exporter.vala
@@ -23,7 +23,7 @@ namespace Seahorse {
public class CertificateDerExporter : GLib.Object, Exporter {
private Gcr.Certificate _certificate;
- private GLib.List<weak GLib.Object> _objects;
+ private GLib.List<GLib.Object> _objects;
public CertificateDerExporter(Gcr.Certificate certificate)
{
@@ -67,7 +67,7 @@ public class CertificateDerExporter : GLib.Object, Exporter {
}
}
- public unowned GLib.List<weak GLib.Object> get_objects() {
+ public unowned GLib.List<GLib.Object> get_objects() {
return this._objects;
}
diff --git a/pkcs11/pkcs11-deleter.vala b/pkcs11/pkcs11-deleter.vala
index 34efc0eb..475b30c4 100644
--- a/pkcs11/pkcs11-deleter.vala
+++ b/pkcs11/pkcs11-deleter.vala
@@ -44,7 +44,7 @@ public class Deleter : Seahorse.Deleter {
GLib.assert_not_reached();
}
- public override unowned GLib.List<weak GLib.Object> get_objects() {
+ public override unowned GLib.List<GLib.Object> get_objects() {
return this.objects;
}
diff --git a/pkcs11/pkcs11-token.vala b/pkcs11/pkcs11-token.vala
index 927118c2..c4a83c4e 100644
--- a/pkcs11/pkcs11-token.vala
+++ b/pkcs11/pkcs11-token.vala
@@ -208,7 +208,7 @@ public class Token : GLib.Object, Gcr.Collection, Place, Lockable {
public void remove_object(Gck.Object object) {
GLib.List<Gck.Object> objects = null;
objects.append(object);
- remove_objects(objects);
+ remove_objects(objects.copy());
}
public bool has_mechanism(ulong mechanism) {
@@ -387,7 +387,7 @@ public class Token : GLib.Object, Gcr.Collection, Place, Lockable {
update_visibility(show, true);
}
- private void remove_objects(GLib.List<GLib.Object> objects) {
+ private void remove_objects(GLib.List<weak GLib.Object> objects) {
var depaired = new GLib.List<GLib.Object>();
var hide = new GLib.List<GLib.Object>();
diff --git a/ssh/deleter.vala b/ssh/deleter.vala
index 10788c25..e2e1221b 100644
--- a/ssh/deleter.vala
+++ b/ssh/deleter.vala
@@ -64,7 +64,7 @@ public class Seahorse.Ssh.Deleter : Seahorse.Deleter {
return dialog;
}
- public override unowned List<weak GLib.Object> get_objects () {
+ public override unowned GLib.List<GLib.Object> get_objects () {
return this.keys;
}
diff --git a/ssh/exporter.vala b/ssh/exporter.vala
index f2d70b4f..e9499493 100644
--- a/ssh/exporter.vala
+++ b/ssh/exporter.vala
@@ -97,7 +97,7 @@ public class Seahorse.Ssh.Exporter : GLib.Object, Seahorse.Exporter {
}
}
- public unowned GLib.List<weak GLib.Object> get_objects() {
+ public unowned GLib.List<GLib.Object> get_objects() {
return this.objects;
}
--
2.22.0
|