[vala/staging] girparser: Apply GLib.Cancellable? default value in process_callable()

[Rico Tzschichholz <ricotz src gnome org>]

commit d05ddd3503c4e92455b7fb72a02e87ceff6ae74b
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Fri Apr 17 23:21:09 2020 +0200

    girparser: Apply GLib.Cancellable? default value in process_callable()

 vala/valagirparser.vala | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 4762dfb0b..481085f0a 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -3421,18 +3421,6 @@ public class Vala.GirParser : CodeVisitor {
                }
                current.parameters = parameters;
 
-               for (int param_n = parameters.size - 1 ; param_n >= 0 ; param_n--) {
-                       ParameterInfo pi = parameters[param_n];
-                       if (!pi.param.ellipsis && pi.param.initializer == null) {
-                               string type_string = pi.param.variable_type.to_string ();
-                               if (type_string == "Gio.Cancellable?") {
-                                       pi.param.initializer = new Vala.NullLiteral ();
-                               } else {
-                                       break;
-                               }
-                       }
-               }
-
                pop_node ();
                end_element (element_name);
        }
@@ -3943,6 +3931,18 @@ public class Vala.GirParser : CodeVisitor {
                        }
                }
 
+               for (int param_n = parameters.size - 1 ; param_n >= 0 ; param_n--) {
+                       ParameterInfo info = parameters[param_n];
+                       if (!info.param.ellipsis && info.param.initializer == null) {
+                               string type_string = info.param.variable_type.to_string ();
+                               if (type_string == "GLib.Cancellable?" || type_string == "Gio.Cancellable?") {
+                                       info.param.initializer = new Vala.NullLiteral ();
+                               } else {
+                                       break;
+                               }
+                       }
+               }
+
                if (parameters.size > 1) {
                        ParameterInfo last_param = parameters[parameters.size-1];
                        if (last_param.param.ellipsis) {