codegen: Use G_TYPE_FLAG_NONE when targetting glib >= 2.74

GNOME · Mar 21, 2023 · 9f5d3a7 · 9f5d3a7
1 parent 0b6996d
commit 9f5d3a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
@@ -32,6 +32,7 @@ void use_g_memdup2 () {
 }
 
 // glib 2.68 drop volatile
+// glib 2.74 G_TYPE_FLAG_NONE
 [SingleInstance]
 class FooVolatile : Object {
 }