From 9f823fc64972ec361f55fb5282fd30162fe3bc04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Mon, 30 Mar 2009 22:29:57 +0200 Subject: GError: Include error code in cname of error type --- vala/valaerrorcode.vala | 4 ++++ vala/valaerrortype.vala | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/vala/valaerrorcode.vala b/vala/valaerrorcode.vala index e46328f16..83ba9a687 100644 --- a/vala/valaerrorcode.vala +++ b/vala/valaerrorcode.vala @@ -73,6 +73,10 @@ public class Vala.ErrorCode : TypeSymbol { return cname; } + public override string? get_lower_case_cname (string? infix) { + return get_cname ().down (); + } + public override bool check (SemanticAnalyzer analyzer) { if (checked) { return !error; diff --git a/vala/valaerrortype.vala b/vala/valaerrortype.vala index 8d19cb3c0..69c54b2e8 100644 --- a/vala/valaerrortype.vala +++ b/vala/valaerrortype.vala @@ -101,8 +101,10 @@ public class Vala.ErrorType : ReferenceType { } else { return "g_%s_error".printf (infix); } - } else { + } else if (error_code == null) { return error_domain.get_lower_case_cname (infix); + } else { + return error_code.get_lower_case_cname (infix); } } -- cgit v1.2.1