Fix gtk_ui_manager_new_merge_id binding, patch by Evan Nemerson, fixes bug

2008-12-17  Jürg Billeter  <j@bitron.ch>

	* vapi/packages/gtk+-2.0/:

	Fix gtk_ui_manager_new_merge_id binding, patch by Evan Nemerson,
	fixes bug 527381

	* vapi/gtk+-2.0.vapi: regenerated

svn path=/trunk/; revision=2202

diff --git a/ChangeLog b/ChangeLog
index e59ae385ac6f98e3e65adac845eae701a5a40679..e8fcc16678926683d36f7fdc18335406eebf176e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-17  Jürg Billeter  <j@bitron.ch>
+
+       * vapi/packages/gtk+-2.0/:
+
+       Fix gtk_ui_manager_new_merge_id binding, patch by Evan Nemerson,
+       fixes bug 527381
+
+       * vapi/gtk+-2.0.vapi: regenerated
+
 2008-12-17  Jürg Billeter  <j@bitron.ch>
 
        * vapi/packages/pango/:

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index c3ddb571310b7b5b4f49cda6bf397747c11ae73e..0d5e2d43a74c7a26ba6c4cfac262de37c58d2e1d 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -4723,10 +4723,9 @@ namespace Gtk {
                public weak string get_ui ();
                public virtual weak Gtk.Widget get_widget (string path);
                public void insert_action_group (Gtk.ActionGroup action_group, int pos);
-               [CCode (type = "guint", has_construct_function = false)]
-               public UIManager.merge_id (Gtk.UIManager self);
                [CCode (has_construct_function = false)]
                public UIManager ();
+               public uint new_merge_id ();
                public void remove_action_group (Gtk.ActionGroup action_group);
                public void remove_ui (uint merge_id);
                public void set_add_tearoffs (bool add_tearoffs);

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
index e8086449b86697fc0ca0e85686ce4500fd383225..99c08fafbd8db07ad31bb366761cba8dab446456 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
@@ -41,6 +41,10 @@ namespace Gtk {
                public void position_menu (Gtk.Menu menu, out int x, out int y, out bool push_in);
        }
 
+       public class UIManager {
+               public uint new_merge_id ();
+       }
+
        public class Widget {
                public extern Widget (GLib.Type type, ...);
 

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 92c2918494a7a3e98119cd9264aefcec696d8077..f079a41f39a50f696f046c48a36443549674d479 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -498,6 +498,7 @@ gtk_tree_view_column_set_attributes ellipsis="1"
 gtk_tree_view_column_set_model.model nullable="1"
 GtkTreeViewSearchEqualFunc hidden="1"
 gtk_true hidden="1"
+gtk_ui_manager_new_merge_id hidden="1"
 gtk_viewport_new.hadjustment nullable="1"
 gtk_viewport_new.vadjustment nullable="1"
 gtk_vscale_new.adjustment nullable="1"