gtk+-2.0: Fix GtkScale::format-value binding

Fixes bug 599727.

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 3a2e46f946fbafbfa7ec30ddf5e48a3059037a78..d1f4e91e6d1b2e1af8d39ac2f9940bc1e1cfeb44 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -3235,7 +3235,7 @@ namespace Gtk {
                public int digits { get; set; }
                public bool draw_value { get; set; }
                public Gtk.PositionType value_pos { get; set; }
-               public virtual signal unowned string format_value (double value);
+               public virtual signal string format_value (double value);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ScaleButton : Gtk.Button, Gtk.Activatable, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index e08f58040a8499411a44db9d4ab353d01bf8575e..d7600c49cbcea90135726c138a17ff72bcf0c8cb 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -358,6 +358,7 @@ gtk_rc_style_copy transfer_ownership="1"
 gtk_scale_button_new.icons is_array="1" no_array_length="1"
 gtk_scale_button_set_icons.icons is_array="1" no_array_length="1"
 gtk_scale_draw_value hidden="1"
+GtkScale::format_value transfer_ownership="1"
 gtk_scrolled_window_new.hadjustment nullable="1"
 gtk_scrolled_window_new.vadjustment nullable="1"
 gtk_selection_add_targets.targets is_array="1"

diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index 193824436f49282ad79842e86761b6f0d932ff68..e2303bcb597ca7bafff11bdb104a3b2318f4d155 100644 (file)
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -2050,6 +2050,10 @@ public class Vala.GIdlParser : CodeVisitor {
                                        if (eval (nv[1]) == "1") {
                                                return null;
                                        }
+                               } else if (nv[0] == "transfer_ownership") {
+                                       if (eval (nv[1]) == "1") {
+                                               sig.return_type.value_owned = true;
+                                       }
                                }
                        }
                }