From e73cf2d921b4249d320d113dd0ffdb666caca853 Mon Sep 17 00:00:00 2001
From: Kolan Sh <backbone@backbone.ws>
Date: Wed, 29 Apr 2020 08:50:21 +0300
Subject: [PATCH] Small fixes (upgrade Vala)

---
 src/loader/PluginLoader.vala          | 2 +-
 test/plugins/typeA/typeA1/TypeA1.vala | 5 +++--
 test/plugins/typeA/typeA2/TypeA2.vala | 2 +-
 test/plugins/typeB/typeB1/TypeB1.vala | 2 +-
 test/plugins/typeB/typeB2/TypeB2.vala | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/loader/PluginLoader.vala b/src/loader/PluginLoader.vala
index 203ce6d..f75f8d9 100644
--- a/src/loader/PluginLoader.vala
+++ b/src/loader/PluginLoader.vala
@@ -34,7 +34,7 @@ namespace GObject {
 			 * Loads the module.
 			 */
 			public override bool load () {
-				module = GLib.Module.open (path, GLib.ModuleFlags.BIND_LAZY);
+				module = GLib.Module.open (path, GLib.ModuleFlags.LAZY);
 				if (null == module) {
 					stderr.printf("Cannot load module %s\n", path);
 					return false;
diff --git a/test/plugins/typeA/typeA1/TypeA1.vala b/test/plugins/typeA/typeA1/TypeA1.vala
index 45880d4..fbbe8e4 100644
--- a/test/plugins/typeA/typeA1/TypeA1.vala
+++ b/test/plugins/typeA/typeA1/TypeA1.vala
@@ -25,11 +25,12 @@ public class TypeA1 : PluginTypeA {
 	public override void method_a () {
 		stdout.puts ("TypeA1.method_a () called\n");
 		stdout.puts ("Call IHostLoaderTest.method_host () from TypeA1:\n  ");
-		(host as IHostLoaderTest).method_host ();
+		var test = host as IHostLoaderTest;
+		if (test != null) test.method_host ();
 	}
 }
 
 [ModuleInit]
-Type plugin_init (GLib.TypeModule type_module) {
+public Type plugin_init (GLib.TypeModule type_module) {
 	return typeof (TypeA1);
 }
diff --git a/test/plugins/typeA/typeA2/TypeA2.vala b/test/plugins/typeA/typeA2/TypeA2.vala
index 661305b..7503e3b 100644
--- a/test/plugins/typeA/typeA2/TypeA2.vala
+++ b/test/plugins/typeA/typeA2/TypeA2.vala
@@ -28,6 +28,6 @@ public class TypeA2 : PluginTypeA {
 }
 
 [ModuleInit]
-Type plugin_init (GLib.TypeModule type_module) {
+public Type plugin_init (GLib.TypeModule type_module) {
 	return typeof (TypeA2);
 }
diff --git a/test/plugins/typeB/typeB1/TypeB1.vala b/test/plugins/typeB/typeB1/TypeB1.vala
index 1c58be6..8da9a01 100644
--- a/test/plugins/typeB/typeB1/TypeB1.vala
+++ b/test/plugins/typeB/typeB1/TypeB1.vala
@@ -29,6 +29,6 @@ public class TypeB1 : PluginTypeB {
 }
 
 [ModuleInit]
-Type plugin_init (GLib.TypeModule type_module) {
+public Type plugin_init (GLib.TypeModule type_module) {
 	return typeof (TypeB1);
 }
diff --git a/test/plugins/typeB/typeB2/TypeB2.vala b/test/plugins/typeB/typeB2/TypeB2.vala
index 358f953..61e2294 100644
--- a/test/plugins/typeB/typeB2/TypeB2.vala
+++ b/test/plugins/typeB/typeB2/TypeB2.vala
@@ -29,6 +29,6 @@ public class TypeB2 : PluginTypeB {
 }
 
 [ModuleInit]
-Type plugin_init (GLib.TypeModule type_module) {
+public Type plugin_init (GLib.TypeModule type_module) {
 	return typeof (TypeB2);
 }