atspi-2: Drop superfluous Atspi-2.0-custom.vala

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 0f707e195512780c80ac3e70a5d22a8c9fa7a354..6c48201b29d9e2ae491c0c3c4a70eea68042342e 100644 (file)
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -404,7 +404,7 @@ atk:
        $(GENVAPI) --library $(srcdir)/atk --metadatadir $(METADATADIR) $(METADATADIR)/Atk-1.0-custom.vala $(GIRDIR)/Atk-1.0.gir
 
 atspi-2:
-       $(GENVAPI) --library $(srcdir)/atspi-2 --metadatadir $(METADATADIR) $(METADATADIR)/Atspi-2.0-custom.vala $(GIRDIR)/Atspi-2.0.gir
+       $(GENVAPI) --library $(srcdir)/atspi-2 --metadatadir $(METADATADIR) $(GIRDIR)/Atspi-2.0.gir
 
 clutter-1.0:
        $(GENVAPI) --library $(srcdir)/clutter-1.0 --metadatadir $(METADATADIR) $(METADATADIR)/Clutter-1.0-custom.vala --pkg atk --pkg cairo --pkg pango --pkg cogl-1.0 --pkg cogl-pango-1.0 --pkg json-glib-1.0 $(GIRDIR)/Clutter-1.0.gir

diff --git a/vapi/atspi-2.vapi b/vapi/atspi-2.vapi
index de90fe857f36feaf5c748c72694ea4acaa60f840..cc981fd680daa10fe952e3204965bc1fdc0503d5 100644 (file)
--- a/vapi/atspi-2.vapi
+++ b/vapi/atspi-2.vapi
@@ -434,7 +434,6 @@ namespace Atspi {
        [CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_CACHE_", type_id = "atspi_cache_get_type ()")]
        [Flags]
        public enum Cache {
-               INTERFACES,
                NONE,
                PARENT,
                CHILDREN,
@@ -442,6 +441,7 @@ namespace Atspi {
                DESCRIPTION,
                STATES,
                ROLE,
+               INTERFACES,
                ATTRIBUTES,
                ALL,
                DEFAULT,

diff --git a/vapi/metadata/Atspi-2.0-custom.vala b/vapi/metadata/Atspi-2.0-custom.vala
deleted file mode 100644 (file)
index d8e9e12..0000000
--- a/vapi/metadata/Atspi-2.0-custom.vala
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Atspi {
-       [CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_CACHE_", type_id = "atspi_cache_get_type ()")]
-       [Flags]
-       public enum Cache {
-               INTERFACES
-       }
-}

diff --git a/vapi/metadata/Atspi-2.0.metadata b/vapi/metadata/Atspi-2.0.metadata
index cea54c7ebdf038a35d44aed4bab6254cbfd21d59..eec213c7acb1b82dd56fd98edb37d4571939515b 100644 (file)
--- a/vapi/metadata/Atspi-2.0.metadata
+++ b/vapi/metadata/Atspi-2.0.metadata
@@ -1,5 +1,4 @@
 Application.bus skip
-Cache.interfaces skip
 KeystrokeListener skip
 
 DeviceEvent struct