[vala/0.40] gtk+-3.0: Fix ownership mismatch of ColorButton.rgba property-accessor



commit 5e33d2ecf1982163de55ee41854dbe5c234f3753
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Sep 15 08:41:03 2019 +0200

    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

 vapi/gtk+-3.0.vapi             | 6 ++----
 vapi/metadata/Gtk-3.0.metadata | 4 ++++
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 6ae9cdbae..fe51476fe 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -2068,9 +2068,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")]
@@ -10391,7 +10388,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 9f547bb6b..348ba5668 100644
--- a/vapi/metadata/Gtk-3.0.metadata
+++ b/vapi/metadata/Gtk-3.0.metadata
@@ -444,6 +444,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*"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]