codegen: Use G_TYPE_FLAG_NONE when targetting glib >= 2.74

diff --git a/codegen/valaclassregisterfunction.vala b/codegen/valaclassregisterfunction.vala
index 625ac12a5063b95f6b8e52604caaf8551af42a65..e1433d2ddfb4e96e47e2ec5aac2ec763a20fccdb 100644 (file)
--- a/codegen/valaclassregisterfunction.vala
+++ b/codegen/valaclassregisterfunction.vala
@@ -94,6 +94,8 @@ public class Vala.ClassRegisterFunction : TypeRegisterFunction {
                        return "G_TYPE_FLAG_ABSTRACT";
                } else if (CodeContext.get ().require_glib_version (2, 70) && class_reference.is_sealed) {
                        return "G_TYPE_FLAG_FINAL";
+               } else if (CodeContext.get ().require_glib_version (2, 74)) {
+                       return "G_TYPE_FLAG_NONE";
                } else {
                        return "0";
                }

diff --git a/codegen/valatyperegisterfunction.vala b/codegen/valatyperegisterfunction.vala
index 7502294cb2a5e5b1fbb2960f3b49ea0c24a129fa..c1cd2b615cd8c89c247681c34eb08a4afce65b03 100644 (file)
--- a/codegen/valatyperegisterfunction.vala
+++ b/codegen/valatyperegisterfunction.vala
@@ -448,7 +448,11 @@ public abstract class Vala.TypeRegisterFunction {
         * @return type flags
         */
        public virtual string get_type_flags () {
-               return "0";
+               if (CodeContext.get ().require_glib_version (2, 74)) {
+                       return "G_TYPE_FLAG_NONE";
+               } else {
+                       return "0";
+               }
        }
 
        /**

diff --git a/tests/glib/conditional-glib-api.vala b/tests/glib/conditional-glib-api.vala
index fc096ac92a338d471db54c5a320ae817bd39b117..3c63e506b4a4068e14d638afba02d46062aefbe6 100644 (file)
--- a/tests/glib/conditional-glib-api.vala
+++ b/tests/glib/conditional-glib-api.vala
@@ -32,6 +32,7 @@ void use_g_memdup2 () {
 }
 
 // glib 2.68 drop volatile
+// glib 2.74 G_TYPE_FLAG_NONE
 [SingleInstance]
 class FooVolatile : Object {
 }