summarylogtreecommitdiffstats
path: root/0001-Fix-optional-types.patch
blob: 924ce261a04de43f4b88b03256212a15336f3cfc (plain)
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
From 064e97636588f2e0c81ea50d4fccdec039172c32 Mon Sep 17 00:00:00 2001
From: Corentin Girard <corentingirard.dev@gmail.com>
Date: Tue, 23 Nov 2021 00:17:46 +0100
Subject: [PATCH] Fix optional types

---
 protocol/protocol-icon.vala  | 2 +-
 src/unity-scope-channel.vala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/protocol/protocol-icon.vala b/protocol/protocol-icon.vala
index be13a5d..ff92eb2 100644
--- a/protocol/protocol-icon.vala
+++ b/protocol/protocol-icon.vala
@@ -185,7 +185,7 @@ public class AnnotatedIcon : Object, GLib.Icon
   }
 
   /* Added to GIcon interface in 2.37 */
-  private Variant serialize ()
+  private Variant? serialize ()
   {
     Variant? ret = null;
     return ret;
diff --git a/src/unity-scope-channel.vala b/src/unity-scope-channel.vala
index 2cb55f6..f959da8 100644
--- a/src/unity-scope-channel.vala
+++ b/src/unity-scope-channel.vala
@@ -312,7 +312,7 @@ internal class ScopeChannel : Object
           DBusSignalFlags.NONE, this.owner_changed);
     }
 
-    private void owner_changed (DBusConnection con, string sender_name,
+    private void owner_changed (DBusConnection con, string? sender_name,
                                 string obj_path, string ifc_name,
                                 string sig_name, Variant parameters)
     {
-- 
2.34.0