From: Yotam Nachum <me@yotam.net>
Date: Sat, 6 Nov 2021 12:33:07 +0000 (+0200)
Subject: gtkmodule: Improve error message for invalid signal element in ui-file
X-Git-Tag: 0.52.8~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60381dc9110e090765d3f2a5a6b5a738e2c47e1b;p=thirdparty%2Fvala.git

gtkmodule: Improve error message for invalid signal element in ui-file
---

diff --git a/codegen/valagtkmodule.vala b/codegen/valagtkmodule.vala
index 8b2e88da1..01e60535f 100644
--- a/codegen/valagtkmodule.vala
+++ b/codegen/valagtkmodule.vala
@@ -187,7 +187,13 @@ public class Vala.GtkModule : GSignalModule {
 
 				if (current_class != null) {
 					if (signal_name == null || handler_name == null) {
-						Report.error (node.source_reference, "Invalid signal in ui file `%s'", ui_file);
+						if (signal_name != null) {
+							Report.error (node.source_reference, "Invalid signal `%s' without handler in ui file `%s'", signal_name, ui_file);
+						} else if (handler_name != null) {
+							Report.error (node.source_reference, "Invalid signal without name in ui file `%s'", ui_file);
+						} else {
+							Report.error (node.source_reference, "Invalid signal without name and handler in ui file `%s'", ui_file);
+						}
 						current_token = reader.read_token (null, null);
 						continue;
 					}