vapigen: do not remove all values from enums in custom.vala files

diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
index 48141b50c8a3a741b5782e821f5229a01f552a3d..a2590474a6876bcff78a4b0214c0cad7de1159e7 100644 (file)
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -61,7 +61,7 @@ namespace Gst {
        }
 
        public enum EventType {
-               SOME_RANDOM_VALUE_FOR_VAPIGEN;
+               __DUMMY__;
                [CCode (cname = "gst_event_type_get_flags")]
                public Gst.EventTypeFlags get_flags ();
                [CCode (cname = "gst_event_type_to_quark")]
@@ -71,7 +71,7 @@ namespace Gst {
        }
 
        public enum Format {
-               SOME_RANDOM_VALUE_FOR_VAPIGEN;
+               __DUMMY__;
                [CCode (cname = "gst_format_get_details")]
                public unowned FormatDefinition get_details ();
                [CCode (cname = "gst_format_to_quark")]
@@ -312,7 +312,7 @@ namespace Gst {
        }
 
        public enum MessageType {
-               SOME_RANDOM_VALUE_FOR_VAPIGEN;
+               __DUMMY__;
                public GLib.Quark to_quark ();
                public unowned string get_name ();
        }
@@ -357,13 +357,13 @@ namespace Gst {
        }
 
        public enum State {
-               SOME_RANDOM_VALUE_FOR_VAPIGEN;
+               __DUMMY__;
                [CCode (cname = "GST_STATE_GET_NEXT")]
                public State get_next (State pending);
        }
 
        public enum StateChange {
-               SOME_RANDOM_VALUE_FOR_VAPIGEN;
+               __DUMMY__;
                [CCode (cname = "GST_STATE_TRANSITION")]
                public static StateChange transition (State cur, State next);
                [CCode (cname = "GST_STATE_TRANSITION_CURRENT")]

diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index adcaeddf3eb1d2a538c744cc6d4cf4be7a96b40e..8751964dcec0604cd3de2f1666065fd32065e407 100644 (file)
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -981,7 +981,11 @@ public class Vala.GIdlParser : CodeVisitor {
                } else {
                        // ignore dummy enum values in -custom.vala files
                        // they exist for syntactical reasons
-                       en.remove_all_values ();
+                       var dummy = (EnumValue) en.scope.lookup ("__DUMMY__");
+                       if (dummy != null) {
+                               en.get_values ().remove (dummy);
+                               en.scope.remove ("__DUMMY__");
+                       }
                }
 
                en.has_type_id = (en_node.gtype_name != null && en_node.gtype_name != "");