[vala] gtktemplate: Verbose error reporting when ui resource is not found
- From: Luca Bruno <lucabru src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] gtktemplate: Verbose error reporting when ui resource is not found
- Date: Tue, 4 Jun 2013 18:22:10 +0000 (UTC)
commit ec681332fb69ee51aaddd0bcf8443c2b69d60af2
Author: Luca Bruno <lucabru src gnome org>
Date: Tue Jun 4 20:20:28 2013 +0200
gtktemplate: Verbose error reporting when ui resource is not found
codegen/valagtkmodule.vala | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/codegen/valagtkmodule.vala b/codegen/valagtkmodule.vala
index 4ce8b62..e3e00cb 100644
--- a/codegen/valagtkmodule.vala
+++ b/codegen/valagtkmodule.vala
@@ -86,7 +86,7 @@ public class Vala.GtkModule : GSignalModule {
}
}
- private void process_current_ui_resource (string ui_resource, SourceReference source_reference) {
+ private void process_current_ui_resource (string ui_resource, CodeNode node) {
/* Scan a single gtkbuilder file for signal handlers in <object> elements,
and save an handler string -> Vala.Signal mapping for each of them */
ensure_cclass_to_vala_map();
@@ -96,7 +96,8 @@ public class Vala.GtkModule : GSignalModule {
current_child_to_class_map = null;
var ui_file = gresource_to_file_map.get (ui_resource);
if (ui_file == null || !FileUtils.test (ui_file, FileTest.EXISTS)) {
- Report.error (source_reference, "UI resource not found: `%s'".printf (ui_resource));
+ node.error = true;
+ Report.error (node.source_reference, "UI resource not found: `%s'. Please make sure
to specify the proper GResources xml files with --gresources.".printf (ui_resource));
return;
}
current_handler_to_signal_map = new HashMap<string, Signal>(str_hash, str_equal);
@@ -150,7 +151,7 @@ public class Vala.GtkModule : GSignalModule {
return;
}
- process_current_ui_resource (ui, cl.source_reference);
+ process_current_ui_resource (ui, cl);
var call = new CCodeFunctionCall (new CCodeIdentifier
("gtk_widget_class_set_template_from_resource"));
call.add_argument (new CCodeIdentifier ("GTK_WIDGET_CLASS (klass)"));
@@ -162,7 +163,7 @@ public class Vala.GtkModule : GSignalModule {
base.visit_field (f);
var cl = current_class;
- if (!is_gtk_template (cl)) {
+ if (!is_gtk_template (cl) || cl.error) {
return;
}
@@ -211,7 +212,7 @@ public class Vala.GtkModule : GSignalModule {
base.visit_method (m);
var cl = current_class;
- if (!is_gtk_template (cl)) {
+ if (!is_gtk_template (cl) || cl.error) {
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]