Use G_TYPE_ERROR instead of G_TYPE_POINTER for GLib >= 2.26

Fixes bug 616588.

diff --git a/vala/valaerrortype.vala b/vala/valaerrortype.vala
index a21a323a3fa06ab34f30ecbb60f9967f3a999cfe..f0e9ab219e6e45b5d2ab321fa3d2a99cab93d61d 100644 (file)
--- a/vala/valaerrortype.vala
+++ b/vala/valaerrortype.vala
@@ -136,7 +136,11 @@ public class Vala.ErrorType : ReferenceType {
        }
 
        public override string? get_type_id () {
-               return "G_TYPE_POINTER";
+               if (source_reference != null && source_reference.file.context.require_glib_version (2, 26)) {
+                       return "G_TYPE_ERROR";
+               } else {
+                       return "G_TYPE_POINTER";
+               }
        }
 
        public override bool is_reference_type_or_type_parameter () {