From 942085161eacdea86e4ebf2bb9e5b41e111ca164 Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Sun, 16 Mar 2008 21:58:47 +0000 Subject: [PATCH] support hidden="0" for parameters 2008-03-16 Juerg Billeter * vapigen/valagidlparser.vala: support hidden="0" for parameters * vapi/packages/gtk+-2.0/: fix gtk_action_group_add_actions bindings, fixes bug 522060 * vapi/gtk+-2.0.vapi: regenerated svn path=/trunk/; revision=1131 --- ChangeLog | 9 +++++++++ vapi/gtk+-2.0.vapi | 4 ++-- vapi/packages/gtk+-2.0/gtk+-2.0.metadata | 2 ++ vapigen/valagidlparser.vala | 5 ++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f67fa2..ca94972 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2008-03-16 Jürg Billeter + * vapigen/valagidlparser.vala: support hidden="0" for parameters + + * vapi/packages/gtk+-2.0/: fix gtk_action_group_add_actions + bindings, fixes bug 522060 + + * vapi/gtk+-2.0.vapi: regenerated + +2008-03-16 Jürg Billeter + * gobject/valaccodegenerator.vala, gobject/valaccodegeneratorsourcefile.vala: emit constants after function declarations as constants may depend on function diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 02b64ea..d5f828e 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -1820,8 +1820,8 @@ namespace Gtk { public class ActionGroup : GLib.Object, Gtk.Buildable { public void add_action (Gtk.Action action); public void add_action_with_accel (Gtk.Action action, string accelerator); - public void add_actions (Gtk.ActionEntry[] entries); - public void add_actions_full (Gtk.ActionEntry[] entries, GLib.DestroyNotify destroy); + public void add_actions (Gtk.ActionEntry[] entries, pointer user_data); + public void add_actions_full (Gtk.ActionEntry[] entries, pointer user_data, GLib.DestroyNotify destroy); public void add_radio_actions (Gtk.RadioActionEntry[] entries, int value, GLib.Callback on_change); public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, GLib.Callback on_change, GLib.DestroyNotify destroy); public void add_toggle_actions (Gtk.ToggleActionEntry[] entries); diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index ac272ea..bdad295 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -9,6 +9,8 @@ gtk_accelerator_parse.accelerator_key is_out="1" gtk_accelerator_parse.accelerator_mods is_out="1" GtkAction::activate has_emitter="1" GtkActionEntry is_value_type="1" +gtk_action_group_add_actions.user_data hidden="0" +gtk_action_group_add_actions_full.user_data hidden="0" GtkAdjustment::changed has_emitter="1" GtkAdjustment::value_changed has_emitter="1" GtkAllocation is_value_type="1" diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala index 1b9cae7..20e9505 100644 --- a/vapigen/valagidlparser.vala +++ b/vapigen/valagidlparser.vala @@ -1298,6 +1298,7 @@ public class Vala.GIdlParser : CodeVisitor { var p = new FormalParameter (param_name, param_type); bool hide_param = false; + bool show_param = false; bool set_array_length_pos = false; double array_length_pos = 0; var attributes = get_attributes ("%s.%s".printf (symbol, param_node.name)); @@ -1329,6 +1330,8 @@ public class Vala.GIdlParser : CodeVisitor { } else if (nv[0] == "hidden") { if (eval (nv[1]) == "1") { hide_param = true; + } else if (eval (nv[1]) == "0") { + show_param = true; } } else if (nv[0] == "array_length_pos") { set_array_length_pos = true; @@ -1351,7 +1354,7 @@ public class Vala.GIdlParser : CodeVisitor { hide_param = true; } - if (!hide_param) { + if (show_param || !hide_param) { m.add_parameter (p); if (set_array_length_pos) { p.carray_length_parameter_position = array_length_pos; -- 2.7.4