gtk+-2.0, gtk+-3.0: Fix GtkActionEntry binding

Fixes bug 642427.

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 0f8ddad8a5a1f6d29296e0e4232f14df92e44bc3..74e586708139c0284a564805d3d9caf3a12dcb32 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -6245,7 +6245,7 @@ namespace Gtk {
                public weak string accelerator;
                public weak string tooltip;
                [CCode (type = "GCallback")]
-               public Gtk.ActionCallback callback;
+               public weak Gtk.ActionCallback callback;
        }
        [CCode (type_id = "GTK_TYPE_ALLOCATION", cheader_filename = "gtk/gtk.h")]
        public struct Allocation {

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index d2f723859b08ea9eb57014c0e722210d15a9bf36..fa1ffbdb90f3a35019d649abb45477a2a68d4d1b 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -6090,7 +6090,7 @@ namespace Gtk {
                public weak string accelerator;
                public weak string tooltip;
                [CCode (type = "GCallback")]
-               public Gtk.ActionCallback callback;
+               public weak Gtk.ActionCallback callback;
        }
        [CCode (type_id = "GTK_TYPE_ALLOCATION", cheader_filename = "gtk/gtk.h")]
        public struct Allocation {

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 6ecba2cafee48f52feec4fe2b7a7aa1c25caff39..fb3a650a40fc50b0f4ab6513604dc55602cf791d 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -26,7 +26,7 @@ gtk_action_new.tooltip nullable="1"
 gtk_action_new.stock_id nullable="1"
 GtkAction::activate has_emitter="1"
 GtkActionEntry is_value_type="1"
-GtkActionEntry.callback type_name="ActionCallback" ctype="GCallback"
+GtkActionEntry.callback type_name="ActionCallback" ctype="GCallback" value_owned="0"
 gtk_action_group_add_action_with_accel.accelerator nullable="1"
 gtk_action_group_add_actions.user_data hidden="0"
 gtk_action_group_add_actions_full.user_data hidden="0"

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 02724044a9534a13fc0219c1d34aae9c4d0e0243..23d00b4c57f41e5e90222b2c7be248f1a3012dc8 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -26,7 +26,7 @@ gtk_action_new.tooltip nullable="1"
 gtk_action_new.stock_id nullable="1"
 GtkAction::activate has_emitter="1"
 GtkActionEntry is_value_type="1"
-GtkActionEntry.callback type_name="ActionCallback" ctype="GCallback"
+GtkActionEntry.callback type_name="ActionCallback" ctype="GCallback" value_owned="0"
 gtk_action_group_add_action_with_accel.accelerator nullable="1"
 gtk_action_group_add_actions.user_data hidden="0"
 gtk_action_group_add_actions_full.user_data hidden="0"

diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index bc45b3eef3176e12a8174538efdda9fa4b3aa04f..1e016389bcf6de171cdeaa554fe671e63cfb99c9 100644 (file)
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -2517,6 +2517,12 @@ public class Vala.GIdlParser : CodeVisitor {
                                        if (eval (nv[1]) == "0") {
                                                type.value_owned = true;
                                        }
+                               } else if (nv[0] == "value_owned") {
+                                       if (eval (nv[1]) == "0") {
+                                               type.value_owned = false;
+                                       } else if (eval (nv[1]) == "1") {
+                                               type.value_owned = true;
+                                       }
                                } else if (nv[0] == "type_name") {
                                        type = parse_type_from_string (eval (nv[1]), true);
                                } else if (nv[0] == "type_arguments") {