[seahorse/gnome-3-30] Fix type-argument mismatches related to GLib.List
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/gnome-3-30] Fix type-argument mismatches related to GLib.List
- Date: Tue, 11 Dec 2018 21:18:51 +0000 (UTC)
commit 33440f7b73789c3df1e1cf8c09657f6f6d8ade6b
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Mon Nov 5 09:59:27 2018 +0100
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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]