[vala/0.52] gtkmodule: Recurse inner classes of ObjectTypeSymbols

[Rico Tzschichholz <ricotz src gnome org>]

commit 5784fe7d3e77e11e497eb70171465233a17c8c3b
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Feb 9 00:05:24 2022 +0100

    gtkmodule: Recurse inner classes of ObjectTypeSymbols

 codegen/valagtkmodule.vala | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)
---
diff --git a/codegen/valagtkmodule.vala b/codegen/valagtkmodule.vala
index cf7d26b55..6f4641ddd 100644
--- a/codegen/valagtkmodule.vala
+++ b/codegen/valagtkmodule.vala
@@ -49,8 +49,19 @@ public class Vala.GtkModule : GSignalModule {
                recurse_type_id_to_vala_map (context.root);
        }
 
-       private void recurse_type_id_to_vala_map (Namespace ns) {
-               foreach (var cl in ns.get_classes()) {
+       private void recurse_type_id_to_vala_map (Symbol sym) {
+               unowned List<Class> classes;
+               if (sym is Namespace) {
+                       foreach (var inner in ((Namespace) sym).get_namespaces()) {
+                               recurse_type_id_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) {
                                var type_id = get_ccode_type_id (cl);
                                if (type_id == null)
@@ -64,9 +75,7 @@ public class Vala.GtkModule : GSignalModule {
                                }
                                type_id_to_vala_map.set (type_id, cl);
                        }
-               }
-               foreach (var inner in ns.get_namespaces()) {
-                       recurse_type_id_to_vala_map (inner);
+                       recurse_type_id_to_vala_map (cl);
                }
        }
 
@@ -79,14 +88,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);
                }
        }