]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
gtkmodule: Recurse inner classes of ObjectTypeSymbols
authorRico Tzschichholz <ricotz@ubuntu.com>
Tue, 8 Feb 2022 23:05:24 +0000 (00:05 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Wed, 9 Feb 2022 07:19:19 +0000 (08:19 +0100)
codegen/valagtkmodule.vala

index cf7d26b55cf1f09c9f4e6dd4de53b0ed8091a1f9..c0d98631cdd7b61019f4155c19e91069a303cf44 100644 (file)
@@ -79,14 +79,23 @@ public class Vala.GtkModule : GSignalModule {
                recurse_cclass_to_vala_map (context.root);
        }
 
-       private void recurse_cclass_to_vala_map (Namespace ns) {
-               foreach (var cl in ns.get_classes()) {
+       private void recurse_cclass_to_vala_map (Symbol sym) {
+               unowned List<Class> classes;
+               if (sym is Namespace) {
+                       foreach (var inner in ((Namespace) sym).get_namespaces()) {
+                               recurse_cclass_to_vala_map (inner);
+                       }
+                       classes = ((Namespace) sym).get_classes ();
+               } else if (sym is ObjectTypeSymbol) {
+                       classes = ((ObjectTypeSymbol) sym).get_classes ();
+               } else {
+                       return;
+               }
+               foreach (var cl in classes) {
                        if (!cl.is_compact) {
                                cclass_to_vala_map.set (get_ccode_name (cl), cl);
                        }
-               }
-               foreach (var inner in ns.get_namespaces()) {
-                       recurse_cclass_to_vala_map (inner);
+                       recurse_cclass_to_vala_map (cl);
                }
        }