From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 8 Aug 2013 06:47:02 +0000 (+0200)
Subject: gdk-3.0, gtk+-3.0: Update to 3.9.11+
X-Git-Tag: 0.21.2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ea5c260ef93c1d89acdebb75d6813dce0ccb1b3;p=thirdparty%2Fvala.git

gdk-3.0, gtk+-3.0: Update to 3.9.11+
---

diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index 63fffdc13..2584bc8d7 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -4587,9 +4587,12 @@ namespace Gdk {
 		public Cursor.from_name (Gdk.Display display, string name);
 		[CCode (has_construct_function = false)]
 		public Cursor.from_pixbuf (Gdk.Display display, Gdk.Pixbuf pixbuf, int x, int y);
+		[CCode (has_construct_function = false)]
+		public Cursor.from_surface (Gdk.Display display, Cairo.Surface surface, double x, double y);
 		public Gdk.CursorType get_cursor_type ();
 		public unowned Gdk.Display get_display ();
 		public Gdk.Pixbuf? get_image ();
+		public Cairo.Surface? get_surface (double x_hot, double y_hot);
 		[Deprecated (since = "3.0")]
 		public Gdk.Cursor @ref ();
 		[Deprecated (since = "3.0")]
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index d31536493..ecdb2ef6c 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -2282,16 +2282,19 @@ namespace Gtk {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HeaderBar ();
 		public unowned Gtk.Widget get_custom_title ();
+		public bool get_show_close_button ();
 		public unowned string get_subtitle ();
 		public unowned string get_title ();
 		public void pack_end (Gtk.Widget child);
 		public void pack_start (Gtk.Widget child);
 		public void set_custom_title (Gtk.Widget title_widget);
+		public void set_show_close_button (bool setting);
 		public void set_subtitle (string? subtitle);
 		public void set_title (string title);
 		public Gtk.Widget custom_title { get; set construct; }
 		[NoAccessorMethod]
 		public int hpadding { get; set; }
+		public bool show_close_button { get; set; }
 		[NoAccessorMethod]
 		public int spacing { get; set; }
 		public string subtitle { get; set; }
diff --git a/vapi/metadata/Gdk-3.0.metadata b/vapi/metadata/Gdk-3.0.metadata
index 058f2efda..4a55c74d4 100644
--- a/vapi/metadata/Gdk-3.0.metadata
+++ b/vapi/metadata/Gdk-3.0.metadata
@@ -40,6 +40,8 @@ Window.get_frame_extents skip
 
 // Should send upstream
 add_option_entries_libgtk_only skip=false
+Cursor
+        .get_surface nullable
 Device
         .free_history.events array array_length_idx=1
         .get_axis_value.value out
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
index b30e36923..991b9bd65 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
@@ -13228,6 +13228,12 @@
 					<parameter name="bar" type="GtkHeaderBar*"/>
 				</parameters>
 			</method>
+			<method name="get_show_close_button" symbol="gtk_header_bar_get_show_close_button">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="bar" type="GtkHeaderBar*"/>
+				</parameters>
+			</method>
 			<method name="get_subtitle" symbol="gtk_header_bar_get_subtitle">
 				<return-type type="gchar*"/>
 				<parameters>
@@ -13264,6 +13270,13 @@
 					<parameter name="title_widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="set_show_close_button" symbol="gtk_header_bar_set_show_close_button">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="bar" type="GtkHeaderBar*"/>
+					<parameter name="setting" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_subtitle" symbol="gtk_header_bar_set_subtitle">
 				<return-type type="void"/>
 				<parameters>
@@ -13280,6 +13293,7 @@
 			</method>
 			<property name="custom-title" type="GtkWidget*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="hpadding" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="show-close-button" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="subtitle" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -33394,14 +33408,14 @@
 				</parameters>
 			</vfunc>
 		</interface>
-		<constant name="GTK_BINARY_AGE" type="int" value="910"/>
+		<constant name="GTK_BINARY_AGE" type="int" value="911"/>
 		<constant name="GTK_INPUT_ERROR" type="int" value="-1"/>
 		<constant name="GTK_INTERFACE_AGE" type="int" value="0"/>
 		<constant name="GTK_LEVEL_BAR_OFFSET_HIGH" type="char*" value="high"/>
 		<constant name="GTK_LEVEL_BAR_OFFSET_LOW" type="char*" value="low"/>
 		<constant name="GTK_MAJOR_VERSION" type="int" value="3"/>
 		<constant name="GTK_MAX_COMPOSE_LEN" type="int" value="7"/>
-		<constant name="GTK_MICRO_VERSION" type="int" value="10"/>
+		<constant name="GTK_MICRO_VERSION" type="int" value="11"/>
 		<constant name="GTK_MINOR_VERSION" type="int" value="9"/>
 		<constant name="GTK_PAPER_NAME_A3" type="char*" value="iso_a3"/>
 		<constant name="GTK_PAPER_NAME_A4" type="char*" value="iso_a4"/>