vala: Report an error if gio-2.0 is missing for DBus support

diff --git a/vala/valaclass.vala b/vala/valaclass.vala
index 532acc19dad811ad3b3f8a6dd6c205e3a135fe63..83e8e8d8596f4ca2e676f65f738c88b79aa5032f 100644 (file)
--- a/vala/valaclass.vala
+++ b/vala/valaclass.vala
@@ -502,6 +502,10 @@ public class Vala.Class : ObjectTypeSymbol {
                        return !error;
                }
 
+               if (!base.check (context)) {
+                       return false;
+               }
+
                checked = true;
 
                var old_source_file = context.analyzer.current_source_file;

diff --git a/vala/valainterface.vala b/vala/valainterface.vala
index 5ee9951355e6c158086b88f3d6444983a8b09720..cdce3ca3803aa623366f590e6a9e4d9ef1748c95 100644 (file)
--- a/vala/valainterface.vala
+++ b/vala/valainterface.vala
@@ -202,6 +202,10 @@ public class Vala.Interface : ObjectTypeSymbol {
                        return !error;
                }
 
+               if (!base.check (context)) {
+                       return false;
+               }
+
                checked = true;
 
                var old_source_file = context.analyzer.current_source_file;

diff --git a/vala/valaobjecttypesymbol.vala b/vala/valaobjecttypesymbol.vala
index f91c6ba5d8c2a55ade05091ab3369078cfb6532c..c355a447465ca1a653542f2eaa0f482671b23dc4 100644 (file)
--- a/vala/valaobjecttypesymbol.vala
+++ b/vala/valaobjecttypesymbol.vala
@@ -304,4 +304,17 @@ public abstract class Vala.ObjectTypeSymbol : TypeSymbol {
 
                scope.add (null, m);
        }
+
+       public override bool check (CodeContext context) {
+               if (checked) {
+                       return !error;
+               }
+
+               if (!external_package && get_attribute ("DBus") != null && !context.has_package ("gio-2.0")) {
+                       error = true;
+                       Report.error (source_reference, "gio-2.0 package required for DBus support");
+               }
+
+               return !error;
+       }
 }