GirWriter: do not generate <errordomain> elements

Invalid:
  <errordomain name="..." get-quark="..." codes="...">
  <enumeration ...>

Valid:
  <enumeration name="..." c:type=".." glib:error-domain="...">

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index c96c038a99fdeafba54b802160de33568f1b7ba8..f1b6f8224f881e9895376b5dc6f274a636fbc284 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -6072,6 +6072,10 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                return get_ccode_attribute(sym).ref_function;
        }
 
+       public static string get_quark_name (ErrorDomain edomain) {
+               return get_ccode_lower_case_name (edomain) + "-quark";
+       }
+
        public static bool is_reference_counting (TypeSymbol sym) {
                if (sym is Class) {
                        return get_ccode_ref_function (sym) != null;

diff --git a/codegen/valagdbusmodule.vala b/codegen/valagdbusmodule.vala
index de203e09a4149f83fd10803c1c557136f1a2624f..edfc82731ec5ff8fd9d56360cf6d861880c7eaeb 100644 (file)
--- a/codegen/valagdbusmodule.vala
+++ b/codegen/valagdbusmodule.vala
@@ -104,7 +104,7 @@ public class Vala.GDBusModule : GVariantModule {
                ccode.add_declaration ("gsize", new CCodeVariableDeclarator (quark_name, new CCodeConstant ("0")), CCodeModifiers.STATIC | CCodeModifiers.VOLATILE);
 
                var register_call = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_error_register_error_domain"));
-               register_call.add_argument (new CCodeConstant ("\"" + get_ccode_lower_case_name (edomain) + "-quark\""));
+               register_call.add_argument (new CCodeConstant ("\"" + CCodeBaseModule.get_quark_name (edomain) + "\""));
                register_call.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier (quark_name)));
                register_call.add_argument (new CCodeIdentifier (get_ccode_lower_case_name (edomain) + "_entries"));
                var nentries = new CCodeFunctionCall (new CCodeIdentifier ("G_N_ELEMENTS"));

diff --git a/codegen/valagerrormodule.vala b/codegen/valagerrormodule.vala
index 8b7ea1022b857f55ba4812f7986db8b0e180871e..041779bac24e7ddd704b72484723eeec41b0aa08 100644 (file)
--- a/codegen/valagerrormodule.vala
+++ b/codegen/valagerrormodule.vala
@@ -76,7 +76,7 @@ public class Vala.GErrorModule : CCodeDelegateModule {
                push_function (cquark_fun);
 
                var cquark_call = new CCodeFunctionCall (new CCodeIdentifier ("g_quark_from_static_string"));
-               cquark_call.add_argument (new CCodeConstant ("\"" + get_ccode_lower_case_name (edomain) + "-quark\""));
+               cquark_call.add_argument (new CCodeConstant ("\"" + CCodeBaseModule.get_quark_name (edomain) + "\""));
 
                ccode.add_return (cquark_call);
 

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index 9ef70a63b2bbe6f58240678e7ff4f3c954cabbbb..3aff8c632468ba179cf7386e2d1108da1b23bb02 100644 (file)
--- a/codegen/valagirwriter.vala
+++ b/codegen/valagirwriter.vala
@@ -694,20 +694,10 @@ public class Vala.GIRWriter : CodeVisitor {
                        return;
                }
 
-               write_indent ();
-               buffer.append_printf ("<errordomain name=\"%s\"", edomain.name);
-               buffer.append_printf (" get-quark=\"%squark\"", CCodeBaseModule.get_ccode_lower_case_prefix (edomain));
-               buffer.append_printf (" codes=\"%s\"", edomain.name);
-               write_symbol_attributes (edomain);
-               buffer.append_printf (">\n");
-
-               write_annotations (edomain);
-
-               buffer.append_printf ("</errordomain>\n");
-
                write_indent ();
                buffer.append_printf ("<enumeration name=\"%s\"", edomain.name);
                write_ctype_attributes (edomain);
+               buffer.append_printf (" glib:error-domain=\"%s\"", CCodeBaseModule.get_quark_name (edomain));
                buffer.append_printf (">\n");
                indent++;