GError: Include error code in cname of error type

diff --git a/vala/valaerrorcode.vala b/vala/valaerrorcode.vala
index e46328f1642091ee3ed29f5f25d5b85b89a8c6f6..83ba9a6874da33b7e9bc8bc9a589dbf5cdaab4aa 100644 (file)
--- 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 8d19cb3c03468b199169eba84e23f8075eaed3ef..69c54b2e812b2ddb9e87f292679cc6b9af7748a7 100644 (file)
--- 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);
                }
        }