girparser: Do not reorder the cancellable parameter in async methods

The feature was incomplete and flawed.

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 15817538a62840d7c89c866d73ea0c9c92a9b747..c2ef7ef5f93f1423c61d1f9f84e123def728ca69 100644 (file)
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -3213,26 +3213,6 @@ public class Vala.GirParser : CodeVisitor {
 
                Method method = m;
 
-               // put cancellable as last parameter
-               Parameter cancellable = null;
-               bool is_cancellable_last = false;
-               double cancellable_pos = 1;
-               foreach (var param in method.get_parameters ()) {
-                       if (param.name == "cancellable" && param.variable_type.to_qualified_string () == "GLib.Cancellable?" && param.direction == ParameterDirection.IN) {
-                               cancellable = param;
-                               cancellable.initializer = new NullLiteral (param.source_reference);
-                               break;
-                       }
-                       cancellable_pos++;
-               }
-               if (cancellable != null) {
-                       if (method.get_parameters().get (method.get_parameters().size - 1) == cancellable) {
-                               is_cancellable_last = true;
-                       }
-                       method.get_parameters().remove (cancellable);
-                       method.scope.remove (cancellable.name);
-               }
-
                if (finish_method_node != null && finish_method_node.symbol is Method) {
                        finish_method_node.process (this);
                        var finish_method = (Method) finish_method_node.symbol;
@@ -3282,15 +3262,6 @@ public class Vala.GirParser : CodeVisitor {
                                finish_method_node.merged = true;
                        }
                }
-
-               if (cancellable != null) {
-                       method.add_parameter (cancellable);
-                       if (!is_cancellable_last) {
-                               cancellable.set_attribute_double ("CCode", "pos", cancellable_pos);
-                       } else {
-                               // avoid useless bloat in the vapi
-                       }
-               }
        }
 
        /* Hash and equal functions */