vala r2202 - in trunk: . vapi vapi/packages/gtk+-2.0

[juergbi svn gnome org]

Author: juergbi
Date: Wed Dec 17 21:24:57 2008
New Revision: 2202
URL: http://svn.gnome.org/viewvc/vala?rev=2202&view=rev

Log:
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


Modified:
   trunk/ChangeLog
   trunk/vapi/gtk+-2.0.vapi
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata

Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi	(original)
+++ trunk/vapi/gtk+-2.0.vapi	Wed Dec 17 21:24:57 2008
@@ -4723,10 +4723,9 @@
 		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);

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala	Wed Dec 17 21:24:57 2008
@@ -41,6 +41,10 @@
 		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, ...);
 

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	Wed Dec 17 21:24:57 2008
@@ -498,6 +498,7 @@
 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"