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
|
From 19dddc4b8acaeefc505e1b45f53048901839aede Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 8 Apr 2023 13:06:50 +0200
Subject: [PATCH] client: Add missing type-arguments for interfaces to fix build with newer vala
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/geary/-/commit/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/client/accounts/accounts-editor-row.vala | 2 +-
src/client/accounts/accounts-editor-servers-pane.vala | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/client/accounts/accounts-editor-row.vala b/src/client/accounts/accounts-editor-row.vala
index 6e7ac2ab..70223d71 100644
--- a/src/client/accounts/accounts-editor-row.vala
+++ b/src/client/accounts/accounts-editor-row.vala
@@ -386,7 +386,7 @@ private abstract class Accounts.ServiceRow<PaneType,V> : AccountRow<PaneType,V>
/** Interface for rows that use a validator for editable values. */
-internal interface Accounts.ValidatingRow : EditorRow {
+internal interface Accounts.ValidatingRow<PaneType> : EditorRow<PaneType> {
/** The row's validator */
diff --git a/src/client/accounts/accounts-editor-servers-pane.vala b/src/client/accounts/accounts-editor-servers-pane.vala
index 8bd9bde1..982acd5c 100644
--- a/src/client/accounts/accounts-editor-servers-pane.vala
+++ b/src/client/accounts/accounts-editor-servers-pane.vala
@@ -694,7 +694,7 @@ private class Accounts.SaveSentRow :
private class Accounts.ServiceHostRow :
- ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow {
+ ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> {
public Components.Validator validator {
@@ -848,7 +848,7 @@ private class Accounts.ServiceSecurityRow :
private class Accounts.ServiceLoginRow :
- ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow {
+ ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> {
public Components.Validator validator {
@@ -972,7 +972,7 @@ private class Accounts.ServiceLoginRow :
private class Accounts.ServicePasswordRow :
- ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow {
+ ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> {
public Components.Validator validator {
--
2.41.0
|
