From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 18 Nov 2018 17:50:29 +0000 (+0100)
Subject: codegen: Fix canonical string for quark of error domains
X-Git-Tag: 0.42.4~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f92ab64b705b7a10a2b3070cb78eda77ddcab394;p=thirdparty%2Fvala.git

codegen: Fix canonical string for quark of error domains
---

diff --git a/codegen/valaccode.vala b/codegen/valaccode.vala
index 1bb92171e..28f0c01a2 100644
--- 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 2b372d3ba..52be88f50 100644
--- 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"/>