From fed12e98c93d01282cc80fc40682312819e02fac Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@t-online.de>
Date: Tue, 18 Feb 2014 16:16:05 +0100
Subject: [PATCH] gtk+-3.0: Update to 3.11.6

---
 vapi/gtk+-3.0.vapi                 | 15 ++------
 vapi/packages/gtk+-3.0/gtk+-3.0.gi | 59 +++++++++++-------------------
 2 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 675d433e7..2e24aa490 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -749,6 +749,7 @@ namespace Gtk {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Box (Gtk.Orientation orientation, int spacing);
 		public Gtk.BaselinePosition get_baseline_position ();
+		public unowned Gtk.Widget get_center_widget ();
 		public bool get_homogeneous ();
 		public int get_spacing ();
 		public void pack_end (Gtk.Widget child, bool expand = true, bool fill = true, uint padding = 0);
@@ -756,6 +757,7 @@ namespace Gtk {
 		public void query_child_packing (Gtk.Widget child, out bool expand, out bool fill, out uint padding, out Gtk.PackType pack_type);
 		public void reorder_child (Gtk.Widget child, int position);
 		public void set_baseline_position (Gtk.BaselinePosition position);
+		public void set_center_widget (Gtk.Widget widget);
 		public void set_child_packing (Gtk.Widget child, bool expand, bool fill, uint padding, Gtk.PackType pack_type);
 		public void set_homogeneous (bool homogeneous);
 		public void set_spacing (int spacing);
@@ -1345,18 +1347,6 @@ namespace Gtk {
 		public Gtk.TreeModel model { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CenterBox : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public CenterBox ();
-		public unowned Gtk.Widget get_center_widget ();
-		public void pack_end (Gtk.Widget child);
-		public void pack_start (Gtk.Widget child);
-		public void set_center_widget (Gtk.Widget center_widget);
-		public Gtk.Widget center_widget { get; set construct; }
-		[NoAccessorMethod]
-		public int spacing { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckButton ();
@@ -3594,6 +3584,7 @@ namespace Gtk {
 	public class Popover : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Popover (Gtk.Widget relative_to);
+		public void bind_model (GLib.MenuModel model, string action_namespace);
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Popover.from_model (Gtk.Widget relative_to, GLib.MenuModel model);
 		public bool get_modal ();
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
index 3cc65a7f4..b1a9b90dc 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
@@ -7420,6 +7420,12 @@
 					<parameter name="box" type="GtkBox*"/>
 				</parameters>
 			</method>
+			<method name="get_center_widget" symbol="gtk_box_get_center_widget">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="box" type="GtkBox*"/>
+				</parameters>
+			</method>
 			<method name="get_homogeneous" symbol="gtk_box_get_homogeneous">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -7485,6 +7491,13 @@
 					<parameter name="position" type="GtkBaselinePosition"/>
 				</parameters>
 			</method>
+			<method name="set_center_widget" symbol="gtk_box_set_center_widget">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkBox*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="set_child_packing" symbol="gtk_box_set_child_packing">
 				<return-type type="void"/>
 				<parameters>
@@ -9622,44 +9635,6 @@
 			<property name="fit-model" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
-		<object name="GtkCenterBox" parent="GtkContainer" type-name="GtkCenterBox" get-type="gtk_center_box_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_center_widget" symbol="gtk_center_box_get_center_widget">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="box" type="GtkCenterBox*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gtk_center_box_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="pack_end" symbol="gtk_center_box_pack_end">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkCenterBox*"/>
-					<parameter name="child" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<method name="pack_start" symbol="gtk_center_box_pack_start">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkCenterBox*"/>
-					<parameter name="child" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<method name="set_center_widget" symbol="gtk_center_box_set_center_widget">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkCenterBox*"/>
-					<parameter name="center_widget" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<property name="center-widget" type="GtkWidget*" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
 		<object name="GtkCheckButton" parent="GtkToggleButton" type-name="GtkCheckButton" get-type="gtk_check_button_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -18743,6 +18718,14 @@
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 			</implements>
+			<method name="bind_model" symbol="gtk_popover_bind_model">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="popover" type="GtkPopover*"/>
+					<parameter name="model" type="GMenuModel*"/>
+					<parameter name="action_namespace" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="get_modal" symbol="gtk_popover_get_modal">
 				<return-type type="gboolean"/>
 				<parameters>
-- 
2.47.2