=== modified file 'gobject/valaccodegenerator.vala' --- gobject/valaccodegenerator.vala 2008-05-26 05:00:43 +0000 +++ gobject/valaccodegenerator.vala 2008-05-26 07:19:59 +0000 @@ -1559,7 +1559,7 @@ var ccond = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new CCodeIdentifier ("inner_error"), new CCodeConstant ("NULL")); cfrag.append (new CCodeIfStatement (ccond, cerror_block)); - } else if (current_method != null && current_method.get_error_types ().size > 0) { + } else if (current_method != null && current_method.tree_can_fail) { // current method can fail, propagate error // TODO ensure one of the error domains matches @@ -3511,7 +3511,7 @@ } - if (m.get_error_types ().size > 0) { + if (m.tree_can_fail) { var cparam = new CCodeFormalParameter ("error", "GError**"); cparam_map.set (get_param_pos (-1), cparam); } @@ -3573,7 +3573,7 @@ i++; } - if (m.get_error_types ().size > 0) { + if (m.tree_can_fail) { carg_map.set (get_param_pos (-1), new CCodeIdentifier ("error")); } === modified file 'gobject/valaccodemethodbinding.vala' --- gobject/valaccodemethodbinding.vala 2008-05-26 05:00:43 +0000 +++ gobject/valaccodemethodbinding.vala 2008-05-26 07:19:13 +0000 @@ -452,7 +452,7 @@ } } - if (m.get_error_types ().size > 0) { + if (m.tree_can_fail) { var cparam = new CCodeFormalParameter ("error", "GError**"); cparam_map.set (codegen.get_param_pos (-1), cparam); carg_map.set (codegen.get_param_pos (-1), new CCodeIdentifier (cparam.name)); @@ -635,7 +635,7 @@ } } - if (m.get_error_types ().size > 0) { + if (m.tree_can_fail) { var cparam = new CCodeFormalParameter ("error", "GError**"); cparam_map.set (codegen.get_param_pos (-1), cparam); } === modified file 'gobject/valaccodeobjecttypesymbolbinding.vala' --- gobject/valaccodeobjecttypesymbolbinding.vala 2008-05-26 05:00:43 +0000 +++ gobject/valaccodeobjecttypesymbolbinding.vala 2008-05-26 07:15:58 +0000 @@ -238,7 +238,7 @@ ccall.add_argument (new CCodeIdentifier (param.name)); } - if (m.get_error_types ().size > 0) { + if (m.tree_can_fail) { ccall.add_argument (new CCodeIdentifier ("error")); }