girparser: Drop special handling of GLib.Data, GLib.PtrArray and GLib.String

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 8789b7116d68112ab5fd2fe4d7f32aacb928408e..fe4e7455c07c637c3c1922f83cda7234bfcac127 100644 (file)
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -2661,11 +2661,6 @@ public class Vala.GirParser : CodeVisitor {
 
                next ();
 
-               if (type_name == "GLib.PtrArray"
-                   && current_token == MarkupTokenType.START_ELEMENT) {
-                       type_name = "GLib.GenericArray";
-               }
-
                if (type_name == null) {
                        type_name = ctype;
                }
@@ -2776,14 +2771,10 @@ public class Vala.GirParser : CodeVisitor {
                                type_name = "intptr";
                        } else if (type_name == "GType") {
                                type_name = "GLib.Type";
-                       } else if (type_name == "GLib.String") {
-                               type_name = "GLib.StringBuilder";
                        } else if (type_name == "GObject.Class") {
                                type_name = "GLib.ObjectClass";
                        } else if (type_name == "gunichar") {
                                type_name = "unichar";
-                       } else if (type_name == "GLib.Data") {
-                               type_name = "GLib.Datalist";
                        } else if (type_name == "Atk.ImplementorIface") {
                                type_name = "Atk.Implementor";
                        } else {

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 89e6dd34eb3b4d669ee848c0b6de78593d59a023..f6bbdc8f082cecbd109f445058dfd91464096a5a 100644 (file)
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -5342,6 +5342,7 @@ namespace GLib {
        /* Keyed Data Lists */
 
        [CCode (cname = "GData*", has_type_id = false)]
+       [GIR (name = "Data")]
        public struct Datalist<G> {
                public Datalist ();
                public void clear ();