From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 28 Dec 2015 12:11:11 +0000 (+0100)
Subject: gdk-3.0, gtk+-3.0: Update to 3.19.5+8bfbb2c1
X-Git-Tag: 0.31.1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6182d2d54b1bf36e49831f61e178846fe2292c7d;p=thirdparty%2Fvala.git

gdk-3.0, gtk+-3.0: Update to 3.19.5+8bfbb2c1
---

diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index c0d218d05..9b1d85bbb 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -5221,7 +5221,7 @@ namespace Gdk {
 		public unowned Gdk.Device? get_keyboard ();
 		public unowned Gdk.Device? get_pointer ();
 		public GLib.List<weak Gdk.Seat> get_slaves (Gdk.SeatCapabilities capabilities);
-		public Gdk.GrabStatus grab (Gdk.Window window, Gdk.SeatCapabilities capabilities, bool owner_events, Gdk.Cursor? cursor, Gdk.Event? event);
+		public Gdk.GrabStatus grab (Gdk.Window window, Gdk.SeatCapabilities capabilities, bool owner_events, Gdk.Cursor? cursor, Gdk.Event? event, Gdk.SeatGrabPrepareFunc? prepare_func);
 		public void ungrab ();
 		public Gdk.Display display { get; construct; }
 		public signal void device_added (Gdk.Device device);
@@ -5441,10 +5441,10 @@ namespace Gdk {
 	}
 	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct Border {
-		public int16 left;
-		public int16 right;
-		public int16 top;
-		public int16 bottom;
+		public int left;
+		public int right;
+		public int top;
+		public int bottom;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h", type_id = "gdk_color_get_type ()")]
 	[Deprecated (since = "3.14")]
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 968fe392c..6d595c1a3 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -7610,7 +7610,11 @@ namespace Gtk {
 		public GLib.Type arg_type;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public struct Border : Gdk.Border {
+	public struct Border {
+		public int16 left;
+		public int16 right;
+		public int16 top;
+		public int16 bottom;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtkimmodule.h")]
 	public struct IMContextInfo {
@@ -7987,7 +7991,8 @@ namespace Gtk {
 		NO_PIXEL_CACHE,
 		INTERACTIVE,
 		TOUCHSCREEN,
-		ACTIONS
+		ACTIONS,
+		RESIZE
 	}
 	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DELETE_")]
 	public enum DeleteType {
@@ -8628,7 +8633,7 @@ namespace Gtk {
 		LINK,
 		VISITED,
 		CHECKED,
-		DND
+		DROP_ACTIVE
 	}
 	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_STATE_")]
 	public enum StateType {
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
index a27bd6300..10093b173 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
@@ -43,9 +43,6 @@ namespace Gtk {
 		public static unowned BindingSet @new (string name);
 	}
 
-	public struct Border : Gdk.Border {
-	}
-
 	[CCode (type_id = "gtk_container_get_type ()")]
 	public abstract class Container {
 		[CCode (vfunc_name = "forall")]
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
index b9edc3d11..eabebfc80 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
@@ -2201,23 +2201,6 @@
 			<field name="n_args" type="guint"/>
 			<field name="args" type="GtkBindingArg*"/>
 		</struct>
-		<struct name="GtkBorder">
-			<method name="copy" symbol="gtk_border_copy">
-				<return-type type="GtkBorder*"/>
-				<parameters>
-					<parameter name="border_" type="GtkBorder*"/>
-				</parameters>
-			</method>
-			<method name="free" symbol="gtk_border_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="border_" type="GtkBorder*"/>
-				</parameters>
-			</method>
-			<method name="new" symbol="gtk_border_new">
-				<return-type type="GtkBorder*"/>
-			</method>
-		</struct>
 		<struct name="GtkEventControllerClass">
 		</struct>
 		<struct name="GtkFileFilterInfo">
@@ -2467,6 +2450,25 @@
 		<struct name="GtkWindowGeometryInfo">
 		</struct>
 		<boxed name="GtkBorder" type-name="GtkBorder" get-type="gtk_border_get_type">
+			<method name="copy" symbol="gtk_border_copy">
+				<return-type type="GtkBorder*"/>
+				<parameters>
+					<parameter name="border_" type="GtkBorder*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="gtk_border_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="border_" type="GtkBorder*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_border_new">
+				<return-type type="GtkBorder*"/>
+			</constructor>
+			<field name="left" type="gint16"/>
+			<field name="right" type="gint16"/>
+			<field name="top" type="gint16"/>
+			<field name="bottom" type="gint16"/>
 		</boxed>
 		<boxed name="GtkCssSection" type-name="GtkCssSection" get-type="gtk_css_section_get_type">
 			<method name="get_end_line" symbol="gtk_css_section_get_end_line">
@@ -5384,6 +5386,7 @@
 			<member name="GTK_DEBUG_INTERACTIVE" value="131072"/>
 			<member name="GTK_DEBUG_TOUCHSCREEN" value="262144"/>
 			<member name="GTK_DEBUG_ACTIONS" value="524288"/>
+			<member name="GTK_DEBUG_RESIZE" value="1048576"/>
 		</flags>
 		<flags name="GtkDestDefaults" type-name="GtkDestDefaults" get-type="gtk_dest_defaults_get_type">
 			<member name="GTK_DEST_DEFAULT_MOTION" value="1"/>
@@ -5477,7 +5480,7 @@
 			<member name="GTK_STATE_FLAG_LINK" value="512"/>
 			<member name="GTK_STATE_FLAG_VISITED" value="1024"/>
 			<member name="GTK_STATE_FLAG_CHECKED" value="2048"/>
-			<member name="GTK_STATE_FLAG_DND" value="4096"/>
+			<member name="GTK_STATE_FLAG_DROP_ACTIVE" value="4096"/>
 		</flags>
 		<flags name="GtkTargetFlags" type-name="GtkTargetFlags" get-type="gtk_target_flags_get_type">
 			<member name="GTK_TARGET_SAME_APP" value="1"/>