From: Jürg Billeter <j@bitron.ch>
Date: Thu, 24 Mar 2011 07:38:18 +0000 (+0100)
Subject: gtk+-3.0: Update to 3.0.5
X-Git-Tag: 0.12.0~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9c512f1a984a012236ac0150e5f79997f61c75e;p=thirdparty%2Fvala.git

gtk+-3.0: Update to 3.0.5
---

diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index cdc713185..37fe483bf 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -17,9 +17,9 @@ namespace Gdk {
 		[CCode (cheader_filename = "gdk/gdk.h")]
 		public static int property_get (Gdk.Window requestor, uchar[] data, Gdk.Atom prop_type, int prop_format);
 		[CCode (cheader_filename = "gdk/gdk.h")]
-		public static void send_notify (Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
+		public static void send_notify (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 		[CCode (cheader_filename = "gdk/gdk.h")]
-		public static void send_notify_for_display (Gdk.Display display, Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
+		public static void send_notify_for_display (Gdk.Display display, Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class AppLaunchContext : GLib.AppLaunchContext {
@@ -114,7 +114,6 @@ namespace Gdk {
 	public class Display : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Display ();
-		public void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func);
 		public void beep ();
 		public void close ();
 		public bool device_is_grabbed (Gdk.Device device);
@@ -183,7 +182,6 @@ namespace Gdk {
 	public class Event {
 		public Gdk.EventAny any;
 		public Gdk.EventButton button;
-		public Gdk.EventClient client;
 		public Gdk.EventConfigure configure;
 		public Gdk.EventCrossing crossing;
 		public Gdk.EventDND dnd;
@@ -217,9 +215,6 @@ namespace Gdk {
 		public static unowned Gdk.Event peek ();
 		public void put ();
 		public static void request_motions (Gdk.EventMotion event);
-		public bool send_client_message (Gdk.NativeWindow winid);
-		public static bool send_client_message_for_display (Gdk.Display display, Gdk.Event event, Gdk.NativeWindow winid);
-		public void send_clientmessage_toall ();
 		public void set_device (Gdk.Device device);
 		public void set_screen (Gdk.Screen screen);
 		public void set_source_device (Gdk.Device device);
@@ -248,7 +243,6 @@ namespace Gdk {
 	public class Screen : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Screen ();
-		public void broadcast_client_message (Gdk.Event event);
 		public unowned Gdk.Window get_active_window ();
 		public static unowned Gdk.Screen get_default ();
 		public unowned Gdk.Display get_display ();
@@ -347,6 +341,7 @@ namespace Gdk {
 		public Gdk.EventMask get_device_events (Gdk.Device device);
 		public unowned Gdk.Window get_device_position (Gdk.Device device, int x, int y, Gdk.ModifierType mask);
 		public unowned Gdk.Display get_display ();
+		public Gdk.DragProtocol get_drag_protocol (out unowned Gdk.Window target);
 		public unowned Gdk.Window get_effective_parent ();
 		public unowned Gdk.Window get_effective_toplevel ();
 		public Gdk.EventMask get_events ();
@@ -498,15 +493,6 @@ namespace Gdk {
 		public double y_root;
 	}
 	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
-	public struct EventClient {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public Gdk.Atom message_type;
-		public ushort data_format;
-		public void* data;
-	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
 	public struct EventConfigure {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -603,7 +589,7 @@ namespace Gdk {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
-		public Gdk.NativeWindow owner;
+		public weak Gdk.Window owner;
 		public Gdk.OwnerChange reason;
 		public Gdk.Atom selection;
 		public uint32 time;
@@ -649,7 +635,7 @@ namespace Gdk {
 		public Gdk.Atom target;
 		public Gdk.Atom property;
 		public uint32 time;
-		public Gdk.NativeWindow requestor;
+		public weak Gdk.Window requestor;
 	}
 	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
 	public struct EventSetting {
@@ -694,10 +680,6 @@ namespace Gdk {
 		public int group;
 		public int level;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	[SimpleType]
-	public struct NativeWindow {
-	}
 	[CCode (type_id = "GDK_TYPE_POINT", cheader_filename = "gdk/gdk.h")]
 	public struct Point {
 		public int x;
@@ -880,10 +862,10 @@ namespace Gdk {
 	}
 	[CCode (cprefix = "GDK_DRAG_PROTO_", cheader_filename = "gdk/gdk.h")]
 	public enum DragProtocol {
+		NONE,
 		MOTIF,
 		XDND,
 		ROOTWIN,
-		NONE,
 		WIN32_DROPFILES,
 		OLE2,
 		LOCAL
@@ -1212,8 +1194,6 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const Gdk.Atom SELECTION_SECONDARY;
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void add_option_entries_libgtk_only (GLib.OptionGroup group);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void beep ();
@@ -1250,8 +1230,6 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_find_window_for_screen (Gdk.DragContext context, Gdk.Window drag_window, Gdk.Screen screen, int x_root, int y_root, out unowned Gdk.Window dest_window, Gdk.DragProtocol protocol);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static Gdk.NativeWindow drag_get_protocol_for_display (Gdk.Display display, Gdk.NativeWindow xid, Gdk.DragProtocol protocol);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static Gdk.Atom drag_get_selection (Gdk.DragContext context);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool drag_motion (Gdk.DragContext context, Gdk.Window dest_window, Gdk.DragProtocol protocol, int x_root, int y_root, Gdk.DragAction suggested_action, Gdk.DragAction possible_actions, uint32 time_);
@@ -1365,10 +1343,10 @@ namespace Gdk {
 	public static int selection_property_get (Gdk.Window requestor, uchar[] data, out Gdk.Atom prop_type, int prop_format);
 	[Deprecated (since = "vala-0.12", replacement = "Selection.send_notify")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void selection_send_notify (Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
+	public static void selection_send_notify (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 	[Deprecated (since = "vala-0.12", replacement = "Selection.send_notify_for_display")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void selection_send_notify_for_display (Gdk.Display display, Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
+	public static void selection_send_notify_for_display (Gdk.Display display, Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_double_click_time (uint msec);
 	[CCode (cheader_filename = "gdk/gdk.h")]
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index f93b16104..7c37e8fb3 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -508,9 +508,12 @@ namespace Gtk {
 		public AppChooserButton (string content_type);
 		public void append_custom_item (string name, string label, GLib.Icon icon);
 		public void append_separator ();
+		public unowned string get_heading ();
 		public bool get_show_dialog_item ();
 		public void set_active_custom_item (string name);
+		public void set_heading (string heading);
 		public void set_show_dialog_item (bool setting);
+		public string heading { get; set; }
 		public bool show_dialog_item { get; set construct; }
 		public virtual signal void custom_item_activated (string item_name);
 	}
@@ -520,9 +523,12 @@ namespace Gtk {
 		public AppChooserDialog (Gtk.Window parent, Gtk.DialogFlags flags, GLib.File file);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public AppChooserDialog.for_content_type (Gtk.Window parent, Gtk.DialogFlags flags, string content_type);
+		public unowned string get_heading ();
 		public unowned Gtk.Widget get_widget ();
+		public void set_heading (string heading);
 		[NoAccessorMethod]
 		public GLib.File gfile { owned get; construct; }
+		public string heading { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AppChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.AppChooser {
@@ -639,6 +645,7 @@ namespace Gtk {
 		public weak Gtk.BindingEntry set_next;
 		public weak Gtk.BindingSignal signals;
 		public static void add_signal (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers, string signal_name, uint n_args);
+		public static GLib.TokenType add_signal_from_string (Gtk.BindingSet binding_set, string signal_desc);
 		public static void add_signall (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers, string signal_name, GLib.SList<Gtk.BindingArg> binding_args);
 		public static void remove (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
 		public static void skip (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
@@ -654,7 +661,6 @@ namespace Gtk {
 		[CCode (has_construct_function = false)]
 		public BindingSet (string set_name);
 		public bool activate (uint keyval, Gdk.ModifierType modifiers, GLib.Object object);
-		public void add_path (Gtk.PathType path_type, string path_pattern, Gtk.PathPriorityType priority);
 		public static unowned Gtk.BindingSet by_class (void* object_class);
 		public static unowned Gtk.BindingSet find (string set_name);
 	}
@@ -858,7 +864,6 @@ namespace Gtk {
 		public virtual void get_preferred_width (Gtk.CellAreaContext context, Gtk.Widget widget, int minimum_width, int natural_width);
 		public virtual void get_preferred_width_for_height (Gtk.CellAreaContext context, Gtk.Widget widget, int height, int minimum_width, int natural_width);
 		public virtual Gtk.SizeRequestMode get_request_mode ();
-		public unowned string get_style_detail ();
 		public bool has_renderer (Gtk.CellRenderer renderer);
 		public void inner_cell_area (Gtk.Widget widget, Gdk.Rectangle cell_area, Gdk.Rectangle inner_area);
 		[CCode (cname = "gtk_cell_area_class_install_cell_property")]
@@ -874,7 +879,6 @@ namespace Gtk {
 		[NoWrapper]
 		public virtual void set_cell_property (Gtk.CellRenderer renderer, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
 		public void set_focus_cell (Gtk.CellRenderer renderer);
-		public void set_style_detail (string detail);
 		public void stop_editing (bool canceled);
 		public Gtk.CellEditable edit_widget { get; }
 		public Gtk.CellRenderer edited_cell { get; }
@@ -935,6 +939,7 @@ namespace Gtk {
 		public bool get_sensitive ();
 		[NoWrapper]
 		public abstract void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height);
+		public Gtk.StateFlags get_state (Gtk.Widget widget, Gtk.CellRendererState cell_state);
 		public bool get_visible ();
 		public bool is_activatable ();
 		public abstract void render (Cairo.Context cr, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
@@ -1511,7 +1516,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void remove (Gtk.Widget widget);
 		[HasEmitter]
-		public virtual signal void set_focus_child (Gtk.Widget? widget);
+		public virtual signal void set_focus_child (Gtk.Widget child);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CssProvider : GLib.Object, Gtk.StyleProvider {
@@ -1839,7 +1844,7 @@ namespace Gtk {
 		public FileChooserWidget (Gtk.FileChooserAction action);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileFilter : GLib.InitiallyUnowned {
+	public class FileFilter : GLib.InitiallyUnowned, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		public FileFilter ();
 		public void add_custom (Gtk.FileFilterFlags needed, owned Gtk.FileFilterFunc func);
@@ -1847,9 +1852,7 @@ namespace Gtk {
 		public void add_pattern (string pattern);
 		public void add_pixbuf_formats ();
 		public bool filter (Gtk.FileFilterInfo filter_info);
-		public unowned string get_name ();
 		public Gtk.FileFilterFlags get_needed ();
-		public void set_name (string name);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -2316,32 +2319,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string stock { owned get; set; }
 		public Gtk.ImageType storage_type { get; }
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageAnimationData {
-		public weak Gdk.PixbufAnimation anim;
-		public uint frame_timeout;
-		public weak Gdk.PixbufAnimationIter iter;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageGIconData {
-		public weak GLib.Icon icon;
-		public weak Gdk.Pixbuf pixbuf;
-		public uint theme_change_id;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageIconNameData {
-		public weak string icon_name;
-		public weak Gdk.Pixbuf pixbuf;
-		public uint theme_change_id;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageIconSetData {
-		public weak Gtk.IconSet icon_set;
+		[NoAccessorMethod]
+		public bool use_fallback { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
@@ -2365,16 +2344,6 @@ namespace Gtk {
 		public Gtk.Widget image { get; set; }
 		public bool use_stock { get; set construct; }
 	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImagePixbufData {
-		public weak Gdk.Pixbuf pixbuf;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageStockData {
-		public weak string stock_id;
-	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class InfoBar : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2569,7 +2538,7 @@ namespace Gtk {
 		public void reposition ();
 		public void set_accel_group (Gtk.AccelGroup accel_group);
 		public void set_accel_path (string accel_path);
-		public void set_active (uint index_);
+		public void set_active (uint index);
 		public void set_monitor (int monitor_num);
 		public void set_reserve_toggle_size (bool reserve_toggle_size);
 		public void set_screen (Gdk.Screen? screen);
@@ -2925,13 +2894,13 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Plug : Gtk.Window, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Plug (Gdk.NativeWindow socket_id);
-		public void @construct (Gdk.NativeWindow socket_id);
-		public void construct_for_display (Gdk.Display display, Gdk.NativeWindow socket_id);
+		public Plug (Gtk.Window socket_id);
+		public void @construct (Gtk.Window socket_id);
+		public void construct_for_display (Gdk.Display display, Gtk.Window socket_id);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Plug.for_display (Gdk.Display display, Gdk.NativeWindow socket_id);
+		public Plug.for_display (Gdk.Display display, Gtk.Window socket_id);
 		public bool get_embedded ();
-		public Gdk.NativeWindow get_id ();
+		public unowned Gtk.Window get_id ();
 		public unowned Gdk.Window get_socket_window ();
 		public bool embedded { get; }
 		public Gdk.Window socket_window { get; }
@@ -3213,6 +3182,7 @@ namespace Gtk {
 		public virtual void get_range_border (Gtk.Border border_);
 		public void get_range_rect (Gdk.Rectangle range_rect);
 		public bool get_restrict_to_fill_level ();
+		public int get_round_digits ();
 		public bool get_show_fill_level ();
 		public void get_slider_range (int slider_start, int slider_end);
 		public bool get_slider_size_fixed ();
@@ -3227,6 +3197,7 @@ namespace Gtk {
 		public void set_min_slider_size (int min_size);
 		public void set_range (double min, double max);
 		public void set_restrict_to_fill_level (bool restrict_to_fill_level);
+		public void set_round_digits (int round_digits);
 		public void set_show_fill_level (bool show_fill_level);
 		public void set_slider_size_fixed (bool size_fixed);
 		public void set_upper_stepper_sensitivity (Gtk.SensitivityType sensitivity);
@@ -3236,6 +3207,7 @@ namespace Gtk {
 		public bool inverted { get; set; }
 		public Gtk.SensitivityType lower_stepper_sensitivity { get; set; }
 		public bool restrict_to_fill_level { get; set; }
+		public int round_digits { get; set; }
 		public bool show_fill_level { get; set; }
 		public Gtk.SensitivityType upper_stepper_sensitivity { get; set; }
 		public virtual signal void adjust_bounds (double new_value);
@@ -3337,7 +3309,7 @@ namespace Gtk {
 		public RecentChooserWidget.for_manager (Gtk.RecentManager manager);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentFilter : GLib.InitiallyUnowned {
+	public class RecentFilter : GLib.InitiallyUnowned, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		public RecentFilter ();
 		public void add_age (int days);
@@ -3348,9 +3320,7 @@ namespace Gtk {
 		public void add_pattern (string pattern);
 		public void add_pixbuf_formats ();
 		public bool filter (Gtk.RecentFilterInfo filter_info);
-		public unowned string get_name ();
 		public Gtk.RecentFilterFlags get_needed ();
-		public void set_name (string name);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -3726,8 +3696,8 @@ namespace Gtk {
 	public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Socket ();
-		public void add_id (Gdk.NativeWindow window_id);
-		public Gdk.NativeWindow get_id ();
+		public void add_id (Gtk.Window window);
+		public unowned Gtk.Window get_id ();
 		public unowned Gdk.Window get_plug_window ();
 		public virtual signal void plug_added ();
 		public virtual signal bool plug_removed ();
@@ -4045,6 +4015,7 @@ namespace Gtk {
 		public bool get_active ();
 		public void set_active (bool is_active);
 		public bool active { get; set; }
+		public virtual signal void activate ();
 	}
 	[Compact]
 	[CCode (ref_function = "gtk_symbolic_color_ref", unref_function = "gtk_symbolic_color_unref", type_id = "GTK_TYPE_SYMBOLIC_COLOR", cheader_filename = "gtk/gtk.h")]
@@ -4121,8 +4092,6 @@ namespace Gtk {
 	[Compact]
 	[CCode (ref_function = "gtk_target_list_ref", unref_function = "gtk_target_list_unref", type_id = "GTK_TYPE_TARGET_LIST", cheader_filename = "gtk/gtk.h")]
 	public class TargetList {
-		public weak GLib.List<Gtk.TargetPair> list;
-		public uint ref_count;
 		[CCode (has_construct_function = false)]
 		public TargetList (Gtk.TargetEntry[] targets);
 		public void add (Gdk.Atom target, uint flags, uint info);
@@ -4134,13 +4103,6 @@ namespace Gtk {
 		public bool find (Gdk.Atom target, uint info);
 		public void remove (Gdk.Atom target);
 	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TargetPair {
-		public uint flags;
-		public uint info;
-		public Gdk.Atom target;
-	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -4273,7 +4235,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string text { owned get; set; }
 		[HasEmitter]
-		public virtual signal void apply_tag (Gtk.TextTag tag, Gtk.TextIter start_char, Gtk.TextIter end_char);
+		public virtual signal void apply_tag (Gtk.TextTag tag, Gtk.TextIter start, Gtk.TextIter end);
 		[HasEmitter]
 		public virtual signal void begin_user_action ();
 		public virtual signal void changed ();
@@ -4281,16 +4243,16 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void end_user_action ();
 		[HasEmitter]
-		public virtual signal void insert_child_anchor (Gtk.TextIter pos, Gtk.TextChildAnchor anchor);
+		public virtual signal void insert_child_anchor (Gtk.TextIter iter, Gtk.TextChildAnchor anchor);
 		[HasEmitter]
-		public virtual signal void insert_pixbuf (Gtk.TextIter pos, Gdk.Pixbuf pixbuf);
-		public virtual signal void insert_text (Gtk.TextIter pos, string text, int length);
+		public virtual signal void insert_pixbuf (Gtk.TextIter iter, Gdk.Pixbuf pixbuf);
+		public virtual signal void insert_text (Gtk.TextIter pos, string new_text, int new_text_length);
 		public virtual signal void mark_deleted (Gtk.TextMark mark);
 		public virtual signal void mark_set (Gtk.TextIter location, Gtk.TextMark mark);
 		public virtual signal void modified_changed ();
 		public virtual signal void paste_done (Gtk.Clipboard clipboard);
 		[HasEmitter]
-		public virtual signal void remove_tag (Gtk.TextTag tag, Gtk.TextIter start_char, Gtk.TextIter end_char);
+		public virtual signal void remove_tag (Gtk.TextTag tag, Gtk.TextIter start, Gtk.TextIter end);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TextChildAnchor : GLib.Object {
@@ -4472,6 +4434,7 @@ namespace Gtk {
 		public bool get_accepts_tab ();
 		public int get_border_window_size (Gtk.TextWindowType type);
 		public unowned Gtk.TextBuffer get_buffer ();
+		public void get_cursor_locations (Gtk.TextIter iter, Gdk.Rectangle strong, Gdk.Rectangle @weak);
 		public bool get_cursor_visible ();
 		public unowned Gtk.TextAttributes get_default_attributes ();
 		public bool get_editable ();
@@ -4758,10 +4721,17 @@ namespace Gtk {
 		public unowned Gtk.Widget get_drag_item (Gtk.SelectionData selection);
 		public static Gtk.TargetEntry get_drag_target_group ();
 		public static Gtk.TargetEntry get_drag_target_item ();
+		public unowned Gtk.ToolItemGroup get_drop_group (int x, int y);
 		public unowned Gtk.ToolItem get_drop_item (int x, int y);
+		public bool get_exclusive (Gtk.ToolItemGroup group);
+		public bool get_expand (Gtk.ToolItemGroup group);
+		public int get_group_position (Gtk.ToolItemGroup group);
 		public Gtk.IconSize get_icon_size ();
 		public Gtk.ToolbarStyle get_style ();
 		public void set_drag_source (Gtk.ToolPaletteDragTargets targets);
+		public void set_exclusive (Gtk.ToolItemGroup group, bool exclusive);
+		public void set_expand (Gtk.ToolItemGroup group, bool expand);
+		public void set_group_position (Gtk.ToolItemGroup group, int position);
 		public void set_icon_size (Gtk.IconSize icon_size);
 		public void set_style (Gtk.ToolbarStyle style);
 		public void unset_icon_size ();
@@ -5485,7 +5455,6 @@ namespace Gtk {
 		public virtual signal bool can_activate_accel (uint signal_id);
 		[HasEmitter]
 		public virtual signal void child_notify (GLib.ParamSpec pspec);
-		public virtual signal bool client_event (Gdk.EventClient event);
 		public virtual signal void composited_changed ();
 		public virtual signal bool configure_event (Gdk.EventConfigure event);
 		public virtual signal bool damage_event (Gdk.Event event);
@@ -5832,7 +5801,7 @@ namespace Gtk {
 		[NoWrapper]
 		public abstract void do_delete_text (int start_pos, int end_pos);
 		[NoWrapper]
-		public abstract void do_insert_text (string text, int length, int position);
+		public abstract void do_insert_text (string new_text, int new_text_length, int position);
 		public abstract unowned string get_chars (int start_pos, int end_pos);
 		public bool get_editable ();
 		public abstract int get_position ();
@@ -5846,7 +5815,7 @@ namespace Gtk {
 		[HasEmitter]
 		public signal void delete_text (int start_pos, int end_pos);
 		[HasEmitter]
-		public signal void insert_text (string text, int length, void* position);
+		public signal void insert_text (string new_text, int new_text_length, void* position);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface FileChooser : Gtk.Widget {
@@ -7653,6 +7622,8 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_INFO;
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_INLINE_TOOLBAR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_MARK;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_MENU;
@@ -7665,18 +7636,30 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_PANE_SEPARATOR;
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_PRIMARY_TOOLBAR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_PROGRESSBAR;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_QUESTION;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_RADIO;
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_RAISED;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_RUBBERBAND;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_SCALE;
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_SCALE_HAS_MARKS_ABOVE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_SCALE_HAS_MARKS_BELOW;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_SCROLLBAR;
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_SEPARATOR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_SIDEBAR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_SLIDER;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_SPINBUTTON;
diff --git a/vapi/packages/gdk-3.0/gdk-3.0-custom.vala b/vapi/packages/gdk-3.0/gdk-3.0-custom.vala
index d02ae1430..9a6fad208 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0-custom.vala
+++ b/vapi/packages/gdk-3.0/gdk-3.0-custom.vala
@@ -49,7 +49,7 @@ namespace Gdk {
 	[Deprecated (since = "vala-0.12", replacement = "Selection.property_get")]
 	public static int selection_property_get (Gdk.Window requestor, uchar[] data, out Gdk.Atom prop_type, int prop_format);
 	[Deprecated (since = "vala-0.12", replacement = "Selection.send_notify")]
-	public static void selection_send_notify (Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
+	public static void selection_send_notify (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 	[Deprecated (since = "vala-0.12", replacement = "Selection.send_notify_for_display")]
-	public static void selection_send_notify_for_display (Gdk.Display display, Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
+	public static void selection_send_notify_for_display (Gdk.Display display, Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 }
diff --git a/vapi/packages/gdk-3.0/gdk-3.0.files b/vapi/packages/gdk-3.0/gdk-3.0.files
index 6e8f5ca24..6c859f0f5 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0.files
+++ b/vapi/packages/gdk-3.0/gdk-3.0.files
@@ -1,3 +1,3 @@
 include/gtk-3.0/gdk/gdk.h
 include/gtk-3.0/gdk
-lib/libgdk-3.0.so
+lib/libgdk-3.so
diff --git a/vapi/packages/gdk-3.0/gdk-3.0.gi b/vapi/packages/gdk-3.0/gdk-3.0.gi
index 5cbd051f0..9dec64fd1 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0.gi
+++ b/vapi/packages/gdk-3.0/gdk-3.0.gi
@@ -1,14 +1,6 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="Gdk">
-		<function name="add_client_message_filter" symbol="gdk_add_client_message_filter">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="message_type" type="GdkAtom"/>
-				<parameter name="func" type="GdkFilterFunc"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</function>
 		<function name="add_option_entries_libgtk_only" symbol="gdk_add_option_entries_libgtk_only">
 			<return-type type="void"/>
 			<parameters>
@@ -63,8 +55,8 @@
 			<parameters>
 				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="pixbuf" type="GdkPixbuf*"/>
-				<parameter name="pixbuf_x" type="double"/>
-				<parameter name="pixbuf_y" type="double"/>
+				<parameter name="pixbuf_x" type="gdouble"/>
+				<parameter name="pixbuf_y" type="gdouble"/>
 			</parameters>
 		</function>
 		<function name="cairo_set_source_rgba" symbol="gdk_cairo_set_source_rgba">
@@ -79,8 +71,8 @@
 			<parameters>
 				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="window" type="GdkWindow*"/>
-				<parameter name="x" type="double"/>
-				<parameter name="y" type="double"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
 			</parameters>
 		</function>
 		<function name="disable_multidevice" symbol="gdk_disable_multidevice">
@@ -133,14 +125,6 @@
 				<parameter name="protocol" type="GdkDragProtocol*"/>
 			</parameters>
 		</function>
-		<function name="drag_get_protocol_for_display" symbol="gdk_drag_get_protocol_for_display">
-			<return-type type="GdkNativeWindow"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="xid" type="GdkNativeWindow"/>
-				<parameter name="protocol" type="GdkDragProtocol*"/>
-			</parameters>
-		</function>
 		<function name="drag_get_selection" symbol="gdk_drag_get_selection">
 			<return-type type="GdkAtom"/>
 			<parameters>
@@ -374,20 +358,20 @@
 			<return-type type="GdkPixbuf*"/>
 			<parameters>
 				<parameter name="surface" type="cairo_surface_t*"/>
-				<parameter name="src_x" type="int"/>
-				<parameter name="src_y" type="int"/>
-				<parameter name="width" type="int"/>
-				<parameter name="height" type="int"/>
+				<parameter name="src_x" type="gint"/>
+				<parameter name="src_y" type="gint"/>
+				<parameter name="width" type="gint"/>
+				<parameter name="height" type="gint"/>
 			</parameters>
 		</function>
 		<function name="pixbuf_get_from_window" symbol="gdk_pixbuf_get_from_window">
 			<return-type type="GdkPixbuf*"/>
 			<parameters>
 				<parameter name="window" type="GdkWindow*"/>
-				<parameter name="src_x" type="int"/>
-				<parameter name="src_y" type="int"/>
-				<parameter name="width" type="int"/>
-				<parameter name="height" type="int"/>
+				<parameter name="src_x" type="gint"/>
+				<parameter name="src_y" type="gint"/>
+				<parameter name="width" type="gint"/>
+				<parameter name="height" type="gint"/>
 			</parameters>
 		</function>
 		<function name="pre_parse_libgtk_only" symbol="gdk_pre_parse_libgtk_only">
@@ -494,7 +478,7 @@
 		<function name="selection_send_notify" symbol="gdk_selection_send_notify">
 			<return-type type="void"/>
 			<parameters>
-				<parameter name="requestor" type="GdkNativeWindow"/>
+				<parameter name="requestor" type="GdkWindow*"/>
 				<parameter name="selection" type="GdkAtom"/>
 				<parameter name="target" type="GdkAtom"/>
 				<parameter name="property" type="GdkAtom"/>
@@ -505,7 +489,7 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="requestor" type="GdkNativeWindow"/>
+				<parameter name="requestor" type="GdkWindow*"/>
 				<parameter name="selection" type="GdkAtom"/>
 				<parameter name="target" type="GdkAtom"/>
 				<parameter name="property" type="GdkAtom"/>
@@ -718,14 +702,6 @@
 			<field name="x_root" type="gdouble"/>
 			<field name="y_root" type="gdouble"/>
 		</struct>
-		<struct name="GdkEventClient">
-			<field name="type" type="GdkEventType"/>
-			<field name="window" type="GdkWindow*"/>
-			<field name="send_event" type="gint8"/>
-			<field name="message_type" type="GdkAtom"/>
-			<field name="data_format" type="gushort"/>
-			<field name="data" type="gpointer"/>
-		</struct>
 		<struct name="GdkEventConfigure">
 			<field name="type" type="GdkEventType"/>
 			<field name="window" type="GdkWindow*"/>
@@ -812,7 +788,7 @@
 			<field name="type" type="GdkEventType"/>
 			<field name="window" type="GdkWindow*"/>
 			<field name="send_event" type="gint8"/>
-			<field name="owner" type="GdkNativeWindow"/>
+			<field name="owner" type="GdkWindow*"/>
 			<field name="reason" type="GdkOwnerChange"/>
 			<field name="selection" type="GdkAtom"/>
 			<field name="time" type="guint32"/>
@@ -854,7 +830,7 @@
 			<field name="target" type="GdkAtom"/>
 			<field name="property" type="GdkAtom"/>
 			<field name="time" type="guint32"/>
-			<field name="requestor" type="GdkNativeWindow"/>
+			<field name="requestor" type="GdkWindow*"/>
 		</struct>
 		<struct name="GdkEventSetting">
 			<field name="type" type="GdkEventType"/>
@@ -894,8 +870,6 @@
 			<field name="group" type="gint"/>
 			<field name="level" type="gint"/>
 		</struct>
-		<struct name="GdkNativeWindow">
-		</struct>
 		<struct name="GdkPoint">
 			<field name="x" type="gint"/>
 			<field name="y" type="gint"/>
@@ -965,7 +939,7 @@
 			<method name="hash" symbol="gdk_color_hash">
 				<return-type type="guint"/>
 				<parameters>
-					<parameter name="colora" type="GdkColor*"/>
+					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</method>
 			<method name="parse" symbol="gdk_color_parse">
@@ -1086,27 +1060,6 @@
 					<parameter name="event" type="GdkEventMotion*"/>
 				</parameters>
 			</method>
-			<method name="send_client_message" symbol="gdk_event_send_client_message">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="event" type="GdkEvent*"/>
-					<parameter name="winid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
-			<method name="send_client_message_for_display" symbol="gdk_event_send_client_message_for_display">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="event" type="GdkEvent*"/>
-					<parameter name="winid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
-			<method name="send_clientmessage_toall" symbol="gdk_event_send_clientmessage_toall">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="event" type="GdkEvent*"/>
-				</parameters>
-			</method>
 			<method name="set_device" symbol="gdk_event_set_device">
 				<return-type type="void"/>
 				<parameters>
@@ -1143,7 +1096,6 @@
 			<field name="selection" type="GdkEventSelection"/>
 			<field name="owner_change" type="GdkEventOwnerChange"/>
 			<field name="proximity" type="GdkEventProximity"/>
-			<field name="client" type="GdkEventClient"/>
 			<field name="dnd" type="GdkEventDND"/>
 			<field name="window_state" type="GdkEventWindowState"/>
 			<field name="setting" type="GdkEventSetting"/>
@@ -1305,10 +1257,10 @@
 			<member name="GDK_DEVICE_TYPE_FLOATING" value="2"/>
 		</enum>
 		<enum name="GdkDragProtocol" type-name="GdkDragProtocol" get-type="gdk_drag_protocol_get_type">
-			<member name="GDK_DRAG_PROTO_MOTIF" value="0"/>
-			<member name="GDK_DRAG_PROTO_XDND" value="1"/>
-			<member name="GDK_DRAG_PROTO_ROOTWIN" value="2"/>
-			<member name="GDK_DRAG_PROTO_NONE" value="3"/>
+			<member name="GDK_DRAG_PROTO_NONE" value="0"/>
+			<member name="GDK_DRAG_PROTO_MOTIF" value="1"/>
+			<member name="GDK_DRAG_PROTO_XDND" value="2"/>
+			<member name="GDK_DRAG_PROTO_ROOTWIN" value="3"/>
 			<member name="GDK_DRAG_PROTO_WIN32_DROPFILES" value="4"/>
 			<member name="GDK_DRAG_PROTO_OLE2" value="5"/>
 			<member name="GDK_DRAG_PROTO_LOCAL" value="6"/>
@@ -1944,15 +1896,6 @@
 			</signal>
 		</object>
 		<object name="GdkDisplay" parent="GObject" type-name="GdkDisplay" get-type="gdk_display_get_type">
-			<method name="add_client_message_filter" symbol="gdk_display_add_client_message_filter">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="message_type" type="GdkAtom"/>
-					<parameter name="func" type="GdkFilterFunc"/>
-					<parameter name="data" type="gpointer"/>
-				</parameters>
-			</method>
 			<method name="beep" symbol="gdk_display_beep">
 				<return-type type="void"/>
 				<parameters>
@@ -2381,13 +2324,6 @@
 			</signal>
 		</object>
 		<object name="GdkScreen" parent="GObject" type-name="GdkScreen" get-type="gdk_screen_get_type">
-			<method name="broadcast_client_message" symbol="gdk_screen_broadcast_client_message">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-					<parameter name="event" type="GdkEvent*"/>
-				</parameters>
-			</method>
 			<method name="get_active_window" symbol="gdk_screen_get_active_window">
 				<return-type type="GdkWindow*"/>
 				<parameters>
@@ -2943,6 +2879,13 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_drag_protocol" symbol="gdk_window_get_drag_protocol">
+				<return-type type="GdkDragProtocol"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="target" type="GdkWindow**"/>
+				</parameters>
+			</method>
 			<method name="get_effective_parent" symbol="gdk_window_get_effective_parent">
 				<return-type type="GdkWindow*"/>
 				<parameters>
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files
index 8a07537af..7847ecd3d 100644
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files
@@ -1,3 +1,3 @@
 include/gtk-3.0/gdk/gdkx.h
 include/gtk-3.0/gdk/x11
-lib/libgdk-3.0.so
+lib/libgdk-3.so
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.files b/vapi/packages/gtk+-3.0/gtk+-3.0.files
index 9b819f7c0..e8216767b 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.files
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.files
@@ -1,2 +1,2 @@
 include/gtk-3.0/gtk
-lib/libgtk-3.0.so
+lib/libgtk-3.so
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
index 8d645fcb3..b1d77f528 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
@@ -1953,6 +1953,13 @@
 					<parameter name="n_args" type="guint"/>
 				</parameters>
 			</method>
+			<method name="add_signal_from_string" symbol="gtk_binding_entry_add_signal_from_string">
+				<return-type type="GTokenType"/>
+				<parameters>
+					<parameter name="binding_set" type="GtkBindingSet*"/>
+					<parameter name="signal_desc" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="add_signall" symbol="gtk_binding_entry_add_signall">
 				<return-type type="void"/>
 				<parameters>
@@ -1999,15 +2006,6 @@
 					<parameter name="object" type="GObject*"/>
 				</parameters>
 			</method>
-			<method name="add_path" symbol="gtk_binding_set_add_path">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="binding_set" type="GtkBindingSet*"/>
-					<parameter name="path_type" type="GtkPathType"/>
-					<parameter name="path_pattern" type="gchar*"/>
-					<parameter name="priority" type="GtkPathPriorityType"/>
-				</parameters>
-			</method>
 			<method name="by_class" symbol="gtk_binding_set_by_class">
 				<return-type type="GtkBindingSet*"/>
 				<parameters>
@@ -2060,30 +2058,6 @@
 			<field name="domain_dirname" type="gchar*"/>
 			<field name="default_locales" type="gchar*"/>
 		</struct>
-		<struct name="GtkImageAnimationData">
-			<field name="anim" type="GdkPixbufAnimation*"/>
-			<field name="iter" type="GdkPixbufAnimationIter*"/>
-			<field name="frame_timeout" type="guint"/>
-		</struct>
-		<struct name="GtkImageGIconData">
-			<field name="icon" type="GIcon*"/>
-			<field name="pixbuf" type="GdkPixbuf*"/>
-			<field name="theme_change_id" type="guint"/>
-		</struct>
-		<struct name="GtkImageIconNameData">
-			<field name="icon_name" type="gchar*"/>
-			<field name="pixbuf" type="GdkPixbuf*"/>
-			<field name="theme_change_id" type="guint"/>
-		</struct>
-		<struct name="GtkImageIconSetData">
-			<field name="icon_set" type="GtkIconSet*"/>
-		</struct>
-		<struct name="GtkImagePixbufData">
-			<field name="pixbuf" type="GdkPixbuf*"/>
-		</struct>
-		<struct name="GtkImageStockData">
-			<field name="stock_id" type="gchar*"/>
-		</struct>
 		<struct name="GtkLabelSelectionInfo">
 		</struct>
 		<struct name="GtkPageRange">
@@ -2217,11 +2191,6 @@
 			<field name="shrink" type="guint"/>
 			<field name="empty" type="guint"/>
 		</struct>
-		<struct name="GtkTargetPair">
-			<field name="target" type="GdkAtom"/>
-			<field name="flags" type="guint"/>
-			<field name="info" type="guint"/>
-		</struct>
 		<struct name="GtkTextAppearance">
 			<field name="bg_color" type="GdkColor"/>
 			<field name="fg_color" type="GdkColor"/>
@@ -3167,7 +3136,7 @@
 			<constructor name="new" symbol="gtk_target_entry_new">
 				<return-type type="GtkTargetEntry*"/>
 				<parameters>
-					<parameter name="target" type="char*"/>
+					<parameter name="target" type="gchar*"/>
 					<parameter name="flags" type="guint"/>
 					<parameter name="info" type="guint"/>
 				</parameters>
@@ -3259,8 +3228,6 @@
 					<parameter name="list" type="GtkTargetList*"/>
 				</parameters>
 			</method>
-			<field name="list" type="GList*"/>
-			<field name="ref_count" type="guint"/>
 		</boxed>
 		<boxed name="GtkTextAttributes" type-name="GtkTextAttributes" get-type="gtk_text_attributes_get_type">
 			<method name="copy" symbol="gtk_text_attributes_copy">
@@ -6285,6 +6252,12 @@
 					<parameter name="self" type="GtkAppChooserButton*"/>
 				</parameters>
 			</method>
+			<method name="get_heading" symbol="gtk_app_chooser_button_get_heading">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserButton*"/>
+				</parameters>
+			</method>
 			<method name="get_show_dialog_item" symbol="gtk_app_chooser_button_get_show_dialog_item">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -6304,6 +6277,13 @@
 					<parameter name="name" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="set_heading" symbol="gtk_app_chooser_button_set_heading">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserButton*"/>
+					<parameter name="heading" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="set_show_dialog_item" symbol="gtk_app_chooser_button_set_show_dialog_item">
 				<return-type type="void"/>
 				<parameters>
@@ -6311,6 +6291,7 @@
 					<parameter name="setting" type="gboolean"/>
 				</parameters>
 			</method>
+			<property name="heading" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="show-dialog-item" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<signal name="custom-item-activated" when="FIRST">
 				<return-type type="void"/>
@@ -6326,6 +6307,12 @@
 				<interface name="GtkBuildable"/>
 				<interface name="GtkAppChooser"/>
 			</implements>
+			<method name="get_heading" symbol="gtk_app_chooser_dialog_get_heading">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserDialog*"/>
+				</parameters>
+			</method>
 			<method name="get_widget" symbol="gtk_app_chooser_dialog_get_widget">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -6348,7 +6335,15 @@
 					<parameter name="content_type" type="gchar*"/>
 				</parameters>
 			</constructor>
+			<method name="set_heading" symbol="gtk_app_chooser_dialog_set_heading">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserDialog*"/>
+					<parameter name="heading" type="gchar*"/>
+				</parameters>
+			</method>
 			<property name="gfile" type="GFile*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="heading" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
 		<object name="GtkAppChooserWidget" parent="GtkBox" type-name="GtkAppChooserWidget" get-type="gtk_app_chooser_widget_get_type">
 			<implements>
@@ -7688,12 +7683,6 @@
 					<parameter name="area" type="GtkCellArea*"/>
 				</parameters>
 			</method>
-			<method name="get_style_detail" symbol="gtk_cell_area_get_style_detail">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="area" type="GtkCellArea*"/>
-				</parameters>
-			</method>
 			<method name="has_renderer" symbol="gtk_cell_area_has_renderer">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -7771,13 +7760,6 @@
 					<parameter name="renderer" type="GtkCellRenderer*"/>
 				</parameters>
 			</method>
-			<method name="set_style_detail" symbol="gtk_cell_area_set_style_detail">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="area" type="GtkCellArea*"/>
-					<parameter name="detail" type="gchar*"/>
-				</parameters>
-			</method>
 			<method name="stop_editing" symbol="gtk_cell_area_stop_editing">
 				<return-type type="void"/>
 				<parameters>
@@ -8255,6 +8237,14 @@
 					<parameter name="cell" type="GtkCellRenderer*"/>
 				</parameters>
 			</method>
+			<method name="get_state" symbol="gtk_cell_renderer_get_state">
+				<return-type type="GtkStateFlags"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cell_state" type="GtkCellRendererState"/>
+				</parameters>
+			</method>
 			<method name="get_visible" symbol="gtk_cell_renderer_get_visible">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -10062,7 +10052,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="container" type="GtkContainer*"/>
-					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="child" type="GtkWidget*"/>
 				</parameters>
 			</signal>
 			<vfunc name="child_type">
@@ -11478,6 +11468,9 @@
 			</constructor>
 		</object>
 		<object name="GtkFileFilter" parent="GInitiallyUnowned" type-name="GtkFileFilter" get-type="gtk_file_filter_get_type">
+			<implements>
+				<interface name="GtkBuildable"/>
+			</implements>
 			<method name="add_custom" symbol="gtk_file_filter_add_custom">
 				<return-type type="void"/>
 				<parameters>
@@ -13323,6 +13316,7 @@
 			<property name="pixel-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="stock" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="storage-type" type="GtkImageType" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="use-fallback" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
 		<object name="GtkImageMenuItem" parent="GtkMenuItem" type-name="GtkImageMenuItem" get-type="gtk_image_menu_item_get_type">
 			<implements>
@@ -14341,7 +14335,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="menu" type="GtkMenu*"/>
-					<parameter name="index_" type="guint"/>
+					<parameter name="index" type="guint"/>
 				</parameters>
 			</method>
 			<method name="set_monitor" symbol="gtk_menu_set_monitor">
@@ -15821,7 +15815,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="plug" type="GtkPlug*"/>
-					<parameter name="socket_id" type="GdkNativeWindow"/>
+					<parameter name="socket_id" type="Window"/>
 				</parameters>
 			</method>
 			<method name="construct_for_display" symbol="gtk_plug_construct_for_display">
@@ -15829,7 +15823,7 @@
 				<parameters>
 					<parameter name="plug" type="GtkPlug*"/>
 					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="socket_id" type="GdkNativeWindow"/>
+					<parameter name="socket_id" type="Window"/>
 				</parameters>
 			</method>
 			<method name="get_embedded" symbol="gtk_plug_get_embedded">
@@ -15839,7 +15833,7 @@
 				</parameters>
 			</method>
 			<method name="get_id" symbol="gtk_plug_get_id">
-				<return-type type="GdkNativeWindow"/>
+				<return-type type="Window"/>
 				<parameters>
 					<parameter name="plug" type="GtkPlug*"/>
 				</parameters>
@@ -15853,14 +15847,14 @@
 			<constructor name="new" symbol="gtk_plug_new">
 				<return-type type="GtkWidget*"/>
 				<parameters>
-					<parameter name="socket_id" type="GdkNativeWindow"/>
+					<parameter name="socket_id" type="Window"/>
 				</parameters>
 			</constructor>
 			<constructor name="new_for_display" symbol="gtk_plug_new_for_display">
 				<return-type type="GtkWidget*"/>
 				<parameters>
 					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="socket_id" type="GdkNativeWindow"/>
+					<parameter name="socket_id" type="Window"/>
 				</parameters>
 			</constructor>
 			<property name="embedded" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
@@ -17161,6 +17155,12 @@
 					<parameter name="range" type="GtkRange*"/>
 				</parameters>
 			</method>
+			<method name="get_round_digits" symbol="gtk_range_get_round_digits">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="range" type="GtkRange*"/>
+				</parameters>
+			</method>
 			<method name="get_show_fill_level" symbol="gtk_range_get_show_fill_level">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -17258,6 +17258,13 @@
 					<parameter name="restrict_to_fill_level" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="set_round_digits" symbol="gtk_range_set_round_digits">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="range" type="GtkRange*"/>
+					<parameter name="round_digits" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_show_fill_level" symbol="gtk_range_set_show_fill_level">
 				<return-type type="void"/>
 				<parameters>
@@ -17291,6 +17298,7 @@
 			<property name="inverted" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="lower-stepper-sensitivity" type="GtkSensitivityType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="restrict-to-fill-level" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="round-digits" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="show-fill-level" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="upper-stepper-sensitivity" type="GtkSensitivityType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<signal name="adjust-bounds" when="LAST">
@@ -17505,6 +17513,9 @@
 			</constructor>
 		</object>
 		<object name="GtkRecentFilter" parent="GInitiallyUnowned" type-name="GtkRecentFilter" get-type="gtk_recent_filter_get_type">
+			<implements>
+				<interface name="GtkBuildable"/>
+			</implements>
 			<method name="add_age" symbol="gtk_recent_filter_add_age">
 				<return-type type="void"/>
 				<parameters>
@@ -18288,11 +18299,11 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="socket_" type="GtkSocket*"/>
-					<parameter name="window_id" type="GdkNativeWindow"/>
+					<parameter name="window" type="Window"/>
 				</parameters>
 			</method>
 			<method name="get_id" symbol="gtk_socket_get_id">
-				<return-type type="GdkNativeWindow"/>
+				<return-type type="Window"/>
 				<parameters>
 					<parameter name="socket_" type="GtkSocket*"/>
 				</parameters>
@@ -19883,6 +19894,12 @@
 				</parameters>
 			</method>
 			<property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="activate" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="sw" type="GtkSwitch*"/>
+				</parameters>
+			</signal>
 		</object>
 		<object name="GtkTable" parent="GtkContainer" type-name="GtkTable" get-type="gtk_table_get_type">
 			<implements>
@@ -20612,8 +20629,8 @@
 				<parameters>
 					<parameter name="buffer" type="GtkTextBuffer*"/>
 					<parameter name="tag" type="GtkTextTag*"/>
-					<parameter name="start_char" type="GtkTextIter*"/>
-					<parameter name="end_char" type="GtkTextIter*"/>
+					<parameter name="start" type="GtkTextIter*"/>
+					<parameter name="end" type="GtkTextIter*"/>
 				</parameters>
 			</signal>
 			<signal name="begin-user-action" when="LAST">
@@ -20646,7 +20663,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="buffer" type="GtkTextBuffer*"/>
-					<parameter name="pos" type="GtkTextIter*"/>
+					<parameter name="iter" type="GtkTextIter*"/>
 					<parameter name="anchor" type="GtkTextChildAnchor*"/>
 				</parameters>
 			</signal>
@@ -20654,7 +20671,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="buffer" type="GtkTextBuffer*"/>
-					<parameter name="pos" type="GtkTextIter*"/>
+					<parameter name="iter" type="GtkTextIter*"/>
 					<parameter name="pixbuf" type="GdkPixbuf*"/>
 				</parameters>
 			</signal>
@@ -20663,8 +20680,8 @@
 				<parameters>
 					<parameter name="buffer" type="GtkTextBuffer*"/>
 					<parameter name="pos" type="GtkTextIter*"/>
-					<parameter name="text" type="char*"/>
-					<parameter name="length" type="gint"/>
+					<parameter name="new_text" type="char*"/>
+					<parameter name="new_text_length" type="gint"/>
 				</parameters>
 			</signal>
 			<signal name="mark-deleted" when="LAST">
@@ -20700,8 +20717,8 @@
 				<parameters>
 					<parameter name="buffer" type="GtkTextBuffer*"/>
 					<parameter name="tag" type="GtkTextTag*"/>
-					<parameter name="start_char" type="GtkTextIter*"/>
-					<parameter name="end_char" type="GtkTextIter*"/>
+					<parameter name="start" type="GtkTextIter*"/>
+					<parameter name="end" type="GtkTextIter*"/>
 				</parameters>
 			</signal>
 		</object>
@@ -21019,6 +21036,15 @@
 					<parameter name="text_view" type="GtkTextView*"/>
 				</parameters>
 			</method>
+			<method name="get_cursor_locations" symbol="gtk_text_view_get_cursor_locations">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="text_view" type="GtkTextView*"/>
+					<parameter name="iter" type="GtkTextIter*"/>
+					<parameter name="strong" type="GdkRectangle*"/>
+					<parameter name="weak" type="GdkRectangle*"/>
+				</parameters>
+			</method>
 			<method name="get_cursor_visible" symbol="gtk_text_view_get_cursor_visible">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -22454,6 +22480,14 @@
 			<method name="get_drag_target_item" symbol="gtk_tool_palette_get_drag_target_item">
 				<return-type type="GtkTargetEntry*"/>
 			</method>
+			<method name="get_drop_group" symbol="gtk_tool_palette_get_drop_group">
+				<return-type type="GtkToolItemGroup*"/>
+				<parameters>
+					<parameter name="palette" type="GtkToolPalette*"/>
+					<parameter name="x" type="gint"/>
+					<parameter name="y" type="gint"/>
+				</parameters>
+			</method>
 			<method name="get_drop_item" symbol="gtk_tool_palette_get_drop_item">
 				<return-type type="GtkToolItem*"/>
 				<parameters>
@@ -22462,6 +22496,27 @@
 					<parameter name="y" type="gint"/>
 				</parameters>
 			</method>
+			<method name="get_exclusive" symbol="gtk_tool_palette_get_exclusive">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="palette" type="GtkToolPalette*"/>
+					<parameter name="group" type="GtkToolItemGroup*"/>
+				</parameters>
+			</method>
+			<method name="get_expand" symbol="gtk_tool_palette_get_expand">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="palette" type="GtkToolPalette*"/>
+					<parameter name="group" type="GtkToolItemGroup*"/>
+				</parameters>
+			</method>
+			<method name="get_group_position" symbol="gtk_tool_palette_get_group_position">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="palette" type="GtkToolPalette*"/>
+					<parameter name="group" type="GtkToolItemGroup*"/>
+				</parameters>
+			</method>
 			<method name="get_icon_size" symbol="gtk_tool_palette_get_icon_size">
 				<return-type type="GtkIconSize"/>
 				<parameters>
@@ -22484,6 +22539,30 @@
 					<parameter name="targets" type="GtkToolPaletteDragTargets"/>
 				</parameters>
 			</method>
+			<method name="set_exclusive" symbol="gtk_tool_palette_set_exclusive">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="palette" type="GtkToolPalette*"/>
+					<parameter name="group" type="GtkToolItemGroup*"/>
+					<parameter name="exclusive" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_expand" symbol="gtk_tool_palette_set_expand">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="palette" type="GtkToolPalette*"/>
+					<parameter name="group" type="GtkToolItemGroup*"/>
+					<parameter name="expand" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_group_position" symbol="gtk_tool_palette_set_group_position">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="palette" type="GtkToolPalette*"/>
+					<parameter name="group" type="GtkToolItemGroup*"/>
+					<parameter name="position" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_icon_size" symbol="gtk_tool_palette_set_icon_size">
 				<return-type type="void"/>
 				<parameters>
@@ -26266,13 +26345,6 @@
 					<parameter name="pspec" type="GParamSpec*"/>
 				</parameters>
 			</signal>
-			<signal name="client-event" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="event" type="GdkEvent*"/>
-				</parameters>
-			</signal>
 			<signal name="composited-changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -28186,8 +28258,8 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="editable" type="GtkEditable*"/>
-					<parameter name="text" type="char*"/>
-					<parameter name="length" type="gint"/>
+					<parameter name="new_text" type="char*"/>
+					<parameter name="new_text_length" type="gint"/>
 					<parameter name="position" type="gpointer"/>
 				</parameters>
 			</signal>
@@ -28203,8 +28275,8 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="editable" type="GtkEditable*"/>
-					<parameter name="text" type="gchar*"/>
-					<parameter name="length" type="gint"/>
+					<parameter name="new_text" type="gchar*"/>
+					<parameter name="new_text_length" type="gint"/>
 					<parameter name="position" type="gint*"/>
 				</parameters>
 			</vfunc>
@@ -29831,13 +29903,13 @@
 				</parameters>
 			</vfunc>
 		</interface>
-		<constant name="GTK_BINARY_AGE" type="int" value="9902"/>
+		<constant name="GTK_BINARY_AGE" type="int" value="5"/>
 		<constant name="GTK_INPUT_ERROR" type="int" value="-1"/>
-		<constant name="GTK_INTERFACE_AGE" type="int" value="0"/>
-		<constant name="GTK_MAJOR_VERSION" type="int" value="2"/>
+		<constant name="GTK_INTERFACE_AGE" type="int" value="5"/>
+		<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="2"/>
-		<constant name="GTK_MINOR_VERSION" type="int" value="99"/>
+		<constant name="GTK_MICRO_VERSION" type="int" value="5"/>
+		<constant name="GTK_MINOR_VERSION" type="int" value="0"/>
 		<constant name="GTK_PAPER_NAME_A3" type="char*" value="iso_a3"/>
 		<constant name="GTK_PAPER_NAME_A4" type="char*" value="iso_a4"/>
 		<constant name="GTK_PAPER_NAME_A5" type="char*" value="iso_a5"/>
@@ -30000,18 +30072,25 @@
 		<constant name="GTK_STYLE_CLASS_HIGHLIGHT" type="char*" value="highlight"/>
 		<constant name="GTK_STYLE_CLASS_HORIZONTAL" type="char*" value="horizontal"/>
 		<constant name="GTK_STYLE_CLASS_INFO" type="char*" value="info"/>
+		<constant name="GTK_STYLE_CLASS_INLINE_TOOLBAR" type="char*" value="inline-toolbar"/>
 		<constant name="GTK_STYLE_CLASS_MARK" type="char*" value="mark"/>
 		<constant name="GTK_STYLE_CLASS_MENU" type="char*" value="menu"/>
 		<constant name="GTK_STYLE_CLASS_MENUBAR" type="char*" value="menubar"/>
 		<constant name="GTK_STYLE_CLASS_MENUITEM" type="char*" value="menuitem"/>
 		<constant name="GTK_STYLE_CLASS_NOTEBOOK" type="char*" value="notebook"/>
 		<constant name="GTK_STYLE_CLASS_PANE_SEPARATOR" type="char*" value="pane-separator"/>
+		<constant name="GTK_STYLE_CLASS_PRIMARY_TOOLBAR" type="char*" value="primary-toolbar"/>
 		<constant name="GTK_STYLE_CLASS_PROGRESSBAR" type="char*" value="progressbar"/>
 		<constant name="GTK_STYLE_CLASS_QUESTION" type="char*" value="question"/>
 		<constant name="GTK_STYLE_CLASS_RADIO" type="char*" value="radio"/>
+		<constant name="GTK_STYLE_CLASS_RAISED" type="char*" value="raised"/>
 		<constant name="GTK_STYLE_CLASS_RUBBERBAND" type="char*" value="rubberband"/>
 		<constant name="GTK_STYLE_CLASS_SCALE" type="char*" value="scale"/>
+		<constant name="GTK_STYLE_CLASS_SCALE_HAS_MARKS_ABOVE" type="char*" value="scale-has-marks-above"/>
+		<constant name="GTK_STYLE_CLASS_SCALE_HAS_MARKS_BELOW" type="char*" value="scale-has-marks-below"/>
 		<constant name="GTK_STYLE_CLASS_SCROLLBAR" type="char*" value="scrollbar"/>
+		<constant name="GTK_STYLE_CLASS_SEPARATOR" type="char*" value="separator"/>
+		<constant name="GTK_STYLE_CLASS_SIDEBAR" type="char*" value="sidebar"/>
 		<constant name="GTK_STYLE_CLASS_SLIDER" type="char*" value="slider"/>
 		<constant name="GTK_STYLE_CLASS_SPINBUTTON" type="char*" value="spinbutton"/>
 		<constant name="GTK_STYLE_CLASS_SPINNER" type="char*" value="spinner"/>