codegen: Fix canonical string for quark of error domains

diff --git a/codegen/valaccode.vala b/codegen/valaccode.vala
index ac9b5ead653d14556dadc6b5f9b1b11c64c94d9e..170e55f8593b48f1797fb35abc75b5cf1a2dc506 100644 (file)
--- a/codegen/valaccode.vala
+++ b/codegen/valaccode.vala
@@ -126,7 +126,7 @@ namespace Vala {
        }
 
        public static string get_ccode_quark_name (ErrorDomain edomain) {
-               return get_ccode_lower_case_name (edomain) + "-quark";
+               return "%s-quark".printf (get_ccode_lower_case_name (edomain).replace ("_", "-"));
        }
 
        public static bool is_reference_counting (TypeSymbol sym) {

diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected
index 2b372d3ba5777df581c5415f4ceb7c85ca85724a..52be88f502c272db2435d16e42ba81489ef797ab 100644 (file)
--- a/tests/girwriter/GirTest-1.0.gir-expected
+++ b/tests/girwriter/GirTest-1.0.gir-expected
@@ -22,7 +22,7 @@
        <enumeration name="SkippedFlags" c:type="GirTestSkippedFlags" glib:type-name="GirTestSkippedFlags" glib:get-type="gir_test_skipped_flags_get_type" introspectable="0">
                <member name="value1" c:identifier="GIR_TEST_SKIPPED_FLAGS_VALUE1" value="0"/>
        </enumeration>
-       <enumeration name="ErrorTest" c:type="GirTestErrorTest" glib:error-domain="gir_test_error_test-quark">
+       <enumeration name="ErrorTest" c:type="GirTestErrorTest" glib:error-domain="gir-test-error-test-quark">
                <member name="failed" c:identifier="GIR_TEST_ERROR_TEST_FAILED" value="0"/>
                <member name="smelly" c:identifier="GIR_TEST_ERROR_TEST_SMELLY" value="1"/>
                <member name="fishy" c:identifier="GIR_TEST_ERROR_TEST_FISHY" value="23"/>