gtk+-3.0: Fix ownership mismatch of ColorButton.rgba property-accessor

Regression of 9a5cc9e58e160d8bb5308fe5bfc8b433d8c269f5 in combination with
our gtk+-3.0 metadata:

    // Keep properties non-abstract as before
    *#interface.*#property abstract=false

Fixes https://gitlab.gnome.org/GNOME/vala/issues/844

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index f71dd9673b24506ea8bc58e1ee2f75f5e94d84bf..6d494b2cae778b3528c9babf40ebcd76f78e840b 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -2070,9 +2070,6 @@ namespace Gtk {
                [Version (deprecated = true, deprecated_since = "3.4", replacement = "rgba", since = "2.4")]
                public Gdk.Color color { owned get; set; }
                [NoAccessorMethod]
-               [Version (since = "3.0")]
-               public Gdk.RGBA rgba { owned get; set; }
-               [NoAccessorMethod]
                [Version (since = "3.20")]
                public bool show_editor { get; set; }
                [Version (since = "2.4")]
@@ -10387,7 +10384,8 @@ namespace Gtk {
                public bool get_use_alpha ();
                public abstract void set_rgba (Gdk.RGBA color);
                public void set_use_alpha (bool use_alpha);
-               public Gdk.RGBA rgba { get; set; }
+               [ConcreteAccessor]
+               public abstract Gdk.RGBA rgba { get; set; }
                public bool use_alpha { get; set; }
                public virtual signal void color_activated (Gdk.RGBA color);
        }

diff --git a/vapi/metadata/Gtk-3.0.metadata b/vapi/metadata/Gtk-3.0.metadata
index 9f478c88cfc3ea6d0cbe60a5e52b37650998fc57..22824256632de713941d8fa834b50ab6d1c22327 100644 (file)
--- a/vapi/metadata/Gtk-3.0.metadata
+++ b/vapi/metadata/Gtk-3.0.metadata
@@ -446,6 +446,10 @@ Widget
 // Keep properties non-abstract as before
 *#interface.*#property abstract=false
 
+// Property getter mismatch
+ColorChooser
+  .rgba#property abstract
+
 // Backwards compatibility
 AccelGroup
   .find type="Gtk.AccelKey*"