[vala] gtk+-2.0: Update to GTK+ 2.18

[Jürg Billeter <juergbi src gnome org>]

commit f43e1ee354a3d57977a80c635f775ead66f5b4e5
Author: Matias De la Puente <mfpuente ar gmail com>
Date:   Tue Oct 27 18:08:11 2009 +0100

    gtk+-2.0: Update to GTK+ 2.18
    
    Fixes bug 599607.

 vapi/gtk+-2.0.vapi                       |  174 ++++++--
 vapi/packages/gtk+-2.0/gtk+-2.0.gi       |  710 ++++++++++++++++++++++++++++--
 vapi/packages/gtk+-2.0/gtk+-2.0.metadata |    6 +
 3 files changed, 803 insertions(+), 87 deletions(-)
---
diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index d1f4e91..508e588 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -449,7 +449,7 @@ namespace Gtk {
 		public string translation_domain { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Button : Gtk.Bin, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class Button : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		public uint activate_timeout;
 		public uint button_down;
 		public uint constructed;
@@ -583,10 +583,18 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public abstract class CellRenderer : Gtk.Object {
 		public virtual bool activate (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
+		public void get_alignment (float xalign, float yalign);
 		public void get_fixed_size (int width, int height);
+		public void get_padding (int xpad, int ypad);
+		public bool get_sensitive ();
 		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 bool get_visible ();
 		public abstract void render (Gdk.Window window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
+		public void set_alignment (float xalign, float yalign);
 		public void set_fixed_size (int width, int height);
+		public void set_padding (int xpad, int ypad);
+		public void set_sensitive (bool sensitive);
+		public void set_visible (bool visible);
 		public virtual unowned Gtk.CellEditable start_editing (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
 		public void stop_editing (bool canceled);
 		[NoAccessorMethod]
@@ -605,9 +613,7 @@ namespace Gtk {
 		public bool is_expander { get; set; }
 		[NoAccessorMethod]
 		public Gtk.CellRendererMode mode { get; set; }
-		[NoAccessorMethod]
 		public bool sensitive { get; set; }
-		[NoAccessorMethod]
 		public bool visible { get; set; }
 		[NoAccessorMethod]
 		public int width { get; set; }
@@ -809,11 +815,12 @@ namespace Gtk {
 	public class CellRendererToggle : Gtk.CellRenderer {
 		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
 		public CellRendererToggle ();
+		public bool get_activatable ();
 		public bool get_active ();
 		public bool get_radio ();
+		public void set_activatable (bool setting);
 		public void set_active (bool setting);
 		public void set_radio (bool radio);
-		[NoAccessorMethod]
 		public bool activatable { get; set; }
 		public bool active { get; set; }
 		[NoAccessorMethod]
@@ -827,7 +834,6 @@ namespace Gtk {
 	public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CellView ();
-		public unowned GLib.List get_cell_renderers ();
 		public unowned Gtk.TreePath get_displayed_row ();
 		public unowned Gtk.TreeModel get_model ();
 		public bool get_size_of_row (Gtk.TreePath path, out Gtk.Requisition requisition);
@@ -849,7 +855,7 @@ namespace Gtk {
 		public Gtk.TreeModel model { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CheckButton : Gtk.ToggleButton, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CheckButton ();
 		[NoWrapper]
@@ -860,7 +866,7 @@ namespace Gtk {
 		public CheckButton.with_mnemonic (string label);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CheckMenuItem : Gtk.MenuItem, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		public uint always_show_toggle;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CheckMenuItem ();
@@ -915,7 +921,7 @@ namespace Gtk {
 		public virtual signal void owner_change (Gdk.Event p0);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ColorButton : Gtk.Button, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorButton ();
 		public uint16 get_alpha ();
@@ -1185,7 +1191,6 @@ namespace Gtk {
 		public uint in_drag;
 		public uint is_cell_renderer;
 		public uint mouse_cursor_obscured;
-		public uint16 n_bytes;
 		public uint need_im_reset;
 		public weak Gtk.Widget popup_menu;
 		public uint16 preedit_cursor;
@@ -1196,12 +1201,14 @@ namespace Gtk {
 		public uint select_words;
 		public weak Gdk.Window text_area;
 		public uint16 text_max_length;
-		public uint16 text_size;
 		public uint visible;
+		public uint16 x_n_bytes;
+		public uint16 x_text_size;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Entry ();
 		public bool get_activates_default ();
 		public float get_alignment ();
+		public unowned Gtk.EntryBuffer get_buffer ();
 		public unowned Gtk.EntryCompletion get_completion ();
 		public int get_current_icon_drag_source ();
 		public unowned Gtk.Adjustment get_cursor_hadjustment ();
@@ -1234,6 +1241,7 @@ namespace Gtk {
 		public void progress_pulse ();
 		public void set_activates_default (bool setting);
 		public void set_alignment (float xalign);
+		public void set_buffer (Gtk.EntryBuffer buffer);
 		public void set_completion (Gtk.EntryCompletion completion);
 		public void set_cursor_hadjustment (Gtk.Adjustment adjustment);
 		public void set_has_frame (bool setting);
@@ -1257,7 +1265,10 @@ namespace Gtk {
 		public void set_width_chars (int n_chars);
 		public int text_index_to_layout_index (int text_index);
 		public void unset_invisible_char ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Entry.with_buffer (Gtk.EntryBuffer buffer);
 		public bool activates_default { get; set; }
+		public Gtk.EntryBuffer buffer { get; set construct; }
 		[NoAccessorMethod]
 		public bool caps_lock_warning { get; set; }
 		[NoAccessorMethod]
@@ -1339,6 +1350,26 @@ namespace Gtk {
 		public virtual signal void toggle_overwrite ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class EntryBuffer : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public EntryBuffer (string[] initial_chars);
+		public virtual uint delete_text (uint position, int n_chars);
+		public void emit_deleted_text (uint position, uint n_chars);
+		public void emit_inserted_text (uint position, string[] chars);
+		public size_t get_bytes ();
+		public virtual uint get_length ();
+		public int get_max_length ();
+		public virtual unowned string get_text ();
+		public virtual uint insert_text (uint position, string[] chars);
+		public void set_max_length (int max_length);
+		public void set_text (string[] chars);
+		public uint length { get; }
+		public int max_length { get; set; }
+		public string text { get; set; }
+		public virtual signal void deleted_text (uint position, uint n_chars);
+		public virtual signal void inserted_text (uint position, string chars, uint n_chars);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class EntryCompletion : GLib.Object, Gtk.Buildable, Gtk.CellLayout {
 		[CCode (has_construct_function = false)]
 		public EntryCompletion ();
@@ -1484,7 +1515,7 @@ namespace Gtk {
 		public int y;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FontButton : Gtk.Button, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FontButton ();
 		public unowned string get_font_name ();
@@ -1834,6 +1865,7 @@ namespace Gtk {
 		public bool get_dest_item_at_pos (int drag_x, int drag_y, out unowned Gtk.TreePath path, Gtk.IconViewDropPosition pos);
 		public void get_drag_dest_item (out unowned Gtk.TreePath path, Gtk.IconViewDropPosition pos);
 		public bool get_item_at_pos (int x, int y, out unowned Gtk.TreePath path, out unowned Gtk.CellRenderer cell);
+		public int get_item_padding ();
 		public int get_item_width ();
 		public int get_margin ();
 		public int get_markup_column ();
@@ -1858,6 +1890,7 @@ namespace Gtk {
 		public void set_columns (int columns);
 		public void set_cursor (Gtk.TreePath path, Gtk.CellRenderer? cell, bool start_editing);
 		public void set_drag_dest_item (Gtk.TreePath path, Gtk.IconViewDropPosition pos);
+		public void set_item_padding (int item_padding);
 		public void set_item_width (int item_width);
 		public void set_margin (int margin);
 		public void set_markup_column (int column);
@@ -1879,6 +1912,7 @@ namespace Gtk {
 		public IconView.with_model (Gtk.TreeModel model);
 		public int column_spacing { get; set; }
 		public int columns { get; set; }
+		public int item_padding { get; set; }
 		public int item_width { get; set; }
 		public int margin { get; set; }
 		public int markup_column { get; set; }
@@ -2002,7 +2036,7 @@ namespace Gtk {
 		public weak Gdk.Image image;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageMenuItem : Gtk.MenuItem, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ImageMenuItem ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2039,6 +2073,26 @@ namespace Gtk {
 		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)]
+		public InfoBar ();
+		public void add_action_widget (Gtk.Widget child, int response_id);
+		public unowned Gtk.Widget add_button (string button_text, int response_id);
+		public void add_buttons (...);
+		public unowned Gtk.Widget get_action_area ();
+		public unowned Gtk.Widget get_content_area ();
+		public Gtk.MessageType get_message_type ();
+		public void set_default_response (int response_id);
+		public void set_message_type (Gtk.MessageType message_type);
+		public void set_response_sensitive (int response_id, bool setting);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public InfoBar.with_buttons (...);
+		public Gtk.MessageType message_type { get; set construct; }
+		public virtual signal void close ();
+		[HasEmitter]
+		public virtual signal void response (int response_id);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class InputDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		[CCode (array_length = false)]
 		public weak Gtk.Widget[] axis_items;
@@ -2086,10 +2140,12 @@ namespace Gtk {
 		public weak Gtk.Window mnemonic_window;
 		public uint pattern_set;
 		public weak Gtk.LabelSelectionInfo select_info;
+		public uint track_links;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Label (string? str);
 		public double get_angle ();
 		public unowned Pango.AttrList get_attributes ();
+		public unowned string get_current_uri ();
 		public Pango.EllipsizeMode get_ellipsize ();
 		public Gtk.Justification get_justify ();
 		public unowned string get_label ();
@@ -2104,6 +2160,7 @@ namespace Gtk {
 		public bool get_selection_bounds (int start, int end);
 		public bool get_single_line_mode ();
 		public unowned string get_text ();
+		public bool get_track_visited_links ();
 		public bool get_use_markup ();
 		public bool get_use_underline ();
 		public int get_width_chars ();
@@ -2124,6 +2181,7 @@ namespace Gtk {
 		public void set_single_line_mode (bool single_line_mode);
 		public void set_text (string str);
 		public void set_text_with_mnemonic (string str);
+		public void set_track_visited_links (bool track_links);
 		public void set_use_markup (bool setting);
 		public void set_use_underline (bool setting);
 		public void set_width_chars (int n_chars);
@@ -2144,6 +2202,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public int selection_bound { get; }
 		public bool single_line_mode { get; set; }
+		public bool track_visited_links { get; set; }
 		public bool use_markup { get; set; }
 		public bool use_underline { get; set; }
 		public int width_chars { get; set; }
@@ -2151,6 +2210,8 @@ namespace Gtk {
 		public bool wrap { get; set; }
 		[NoAccessorMethod]
 		public Pango.WrapMode wrap_mode { get; set; }
+		public virtual signal void activate_current_link ();
+		public virtual signal bool activate_link (string uri);
 		public virtual signal void copy_clipboard ();
 		public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool extend_selection);
 		public virtual signal void populate_popup (Gtk.Menu menu);
@@ -2187,7 +2248,7 @@ namespace Gtk {
 		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class LinkButton : Gtk.Button, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public LinkButton (string uri);
 		public unowned string get_uri ();
@@ -2280,6 +2341,7 @@ namespace Gtk {
 		public unowned Gtk.Widget get_attach_widget ();
 		public static unowned GLib.List get_for_attach_widget (Gtk.Widget widget);
 		public int get_monitor ();
+		public bool get_reserve_toggle_size ();
 		public bool get_tearoff_state ();
 		public unowned string get_title ();
 		public void popdown ();
@@ -2290,6 +2352,7 @@ namespace Gtk {
 		public void set_accel_path (string accel_path);
 		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);
 		public void set_tearoff_state (bool torn_off);
 		public void set_title (string title);
@@ -2299,6 +2362,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public Gtk.Widget attach_widget { owned get; set; }
 		public int monitor { get; set; }
+		public bool reserve_toggle_size { get; set; }
 		public bool tearoff_state { get; set; }
 		[NoAccessorMethod]
 		public string tearoff_title { owned get; set; }
@@ -2316,7 +2380,7 @@ namespace Gtk {
 		public Gtk.PackDirection pack_direction { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MenuItem : Gtk.Item, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class MenuItem : Gtk.Item, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		public uint16 accelerator_width;
 		public weak Gdk.Window event_window;
 		public uint from_menubar;
@@ -2392,7 +2456,7 @@ namespace Gtk {
 		public virtual signal void selection_done ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MenuToolButton : Gtk.ToolButton, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public MenuToolButton (Gtk.Widget icon_widget, string label);
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -2715,10 +2779,14 @@ namespace Gtk {
 		public void cancel ();
 		public void draw_page_finish ();
 		public unowned Gtk.PageSetup get_default_page_setup ();
+		public bool get_embed_page_setup ();
 		public void get_error () throws GLib.Error;
+		public bool get_has_selection ();
+		public int get_n_pages_to_print ();
 		public unowned Gtk.PrintSettings get_print_settings ();
 		public Gtk.PrintStatus get_status ();
 		public unowned string get_status_string ();
+		public bool get_support_selection ();
 		public bool is_finished ();
 		public Gtk.PrintOperationResult run (Gtk.PrintOperationAction action, Gtk.Window parent) throws GLib.Error;
 		public void set_allow_async (bool allow_async);
@@ -2726,11 +2794,14 @@ namespace Gtk {
 		public void set_custom_tab_label (string label);
 		public void set_default_page_setup (Gtk.PageSetup default_page_setup);
 		public void set_defer_drawing ();
+		public void set_embed_page_setup (bool embed);
 		public void set_export_filename (string filename);
+		public void set_has_selection (bool has_selection);
 		public void set_job_name (string job_name);
 		public void set_n_pages (int n_pages);
 		public void set_print_settings (Gtk.PrintSettings print_settings);
 		public void set_show_progress (bool show_progress);
+		public void set_support_selection (bool support_selection);
 		public void set_track_print_status (bool track_status);
 		public void set_unit (Gtk.Unit unit);
 		public void set_use_full_page (bool full_page);
@@ -2741,17 +2812,21 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string custom_tab_label { owned get; set; }
 		public Gtk.PageSetup default_page_setup { get; set; }
+		public bool embed_page_setup { get; set; }
 		[NoAccessorMethod]
 		public string export_filename { owned get; set; }
+		public bool has_selection { get; set; }
 		[NoAccessorMethod]
 		public string job_name { owned get; set; }
 		[NoAccessorMethod]
 		public int n_pages { get; set; }
+		public int n_pages_to_print { get; }
 		public Gtk.PrintSettings print_settings { get; set; }
 		[NoAccessorMethod]
 		public bool show_progress { get; set; }
 		public Gtk.PrintStatus status { get; }
 		public string status_string { get; }
+		public bool support_selection { get; set; }
 		[NoAccessorMethod]
 		public bool track_print_status { get; set; }
 		[NoAccessorMethod]
@@ -2768,6 +2843,7 @@ namespace Gtk {
 		public virtual signal bool preview (Gtk.PrintOperationPreview preview, Gtk.PrintContext context, Gtk.Window parent);
 		public virtual signal void request_page_setup (Gtk.PrintContext context, int page_nr, Gtk.PageSetup setup);
 		public virtual signal void status_changed ();
+		public virtual signal void update_custom_widget (Gtk.Widget widget, Gtk.PageSetup setup, Gtk.PrintSettings settings);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class PrintSettings : GLib.Object {
@@ -2901,7 +2977,7 @@ namespace Gtk {
 		public virtual signal void changed (Gtk.RadioAction current);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RadioButton : Gtk.CheckButton, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioButton (GLib.SList? group);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2920,7 +2996,7 @@ namespace Gtk {
 		public virtual signal void group_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RadioMenuItem : Gtk.CheckMenuItem, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioMenuItem (GLib.SList group);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2939,7 +3015,7 @@ namespace Gtk {
 		public virtual signal void group_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RadioToolButton : Gtk.ToggleToolButton, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public RadioToolButton (GLib.SList group);
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -2977,6 +3053,7 @@ namespace Gtk {
 		public uint update_timeout_id;
 		public unowned Gtk.Adjustment get_adjustment ();
 		public double get_fill_level ();
+		public bool get_flippable ();
 		public bool get_inverted ();
 		public Gtk.SensitivityType get_lower_stepper_sensitivity ();
 		[NoWrapper]
@@ -2988,6 +3065,7 @@ namespace Gtk {
 		public double get_value ();
 		public void set_adjustment (Gtk.Adjustment adjustment);
 		public void set_fill_level (double fill_level);
+		public void set_flippable (bool flippable);
 		public void set_increments (double step, double page);
 		public void set_inverted (bool setting);
 		public void set_lower_stepper_sensitivity (Gtk.SensitivityType sensitivity);
@@ -3087,7 +3165,7 @@ namespace Gtk {
 		public RecentChooserDialog.for_manager (string title, Gtk.Window parent, Gtk.RecentManager manager, ...);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentChooserMenu : Gtk.Menu, Gtk.Activatable, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser {
+	public class RecentChooserMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.RecentChooser {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RecentChooserMenu ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -3238,7 +3316,7 @@ namespace Gtk {
 		public virtual signal string format_value (double value);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ScaleButton : Gtk.Button, Gtk.Activatable, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
+	public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.Activatable {
 		public weak Gtk.Widget minus_button;
 		public weak Gtk.Widget plus_button;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -3339,12 +3417,12 @@ namespace Gtk {
 	public class Separator : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SeparatorMenuItem : Gtk.MenuItem, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class SeparatorMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public SeparatorMenuItem ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SeparatorToolItem : Gtk.ToolItem, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class SeparatorToolItem : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public SeparatorToolItem ();
 		public bool get_draw ();
@@ -3597,6 +3675,7 @@ namespace Gtk {
 		public int get_size ();
 		public unowned string get_stock ();
 		public Gtk.ImageType get_storage_type ();
+		public unowned string get_title ();
 		public unowned string get_tooltip_markup ();
 		public unowned string get_tooltip_text ();
 		public bool get_visible ();
@@ -3612,6 +3691,7 @@ namespace Gtk {
 		public void set_from_stock (string stock_id);
 		public void set_has_tooltip (bool has_tooltip);
 		public void set_screen (Gdk.Screen screen);
+		public void set_title (string title);
 		public void set_tooltip_markup (string markup);
 		public void set_tooltip_text (string text);
 		public void set_visible (bool visible);
@@ -3634,6 +3714,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string stock { owned get; set; }
 		public Gtk.ImageType storage_type { get; }
+		public string title { get; set; }
 		public string tooltip_markup { get; set; }
 		public string tooltip_text { get; set; }
 		public bool visible { get; set; }
@@ -3863,7 +3944,7 @@ namespace Gtk {
 		public Gdk.Atom target;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TearoffMenuItem : Gtk.MenuItem, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		public uint torn_off;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TearoffMenuItem ();
@@ -4374,7 +4455,7 @@ namespace Gtk {
 		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToggleButton : Gtk.Button, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ToggleButton ();
 		public bool get_active ();
@@ -4395,7 +4476,7 @@ namespace Gtk {
 		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToggleToolButton : Gtk.ToolButton, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public ToggleToolButton ();
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -4406,7 +4487,7 @@ namespace Gtk {
 		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToolButton : Gtk.ToolItem, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public ToolButton (Gtk.Widget icon_widget, string label);
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -4432,7 +4513,7 @@ namespace Gtk {
 		public virtual signal void clicked ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToolItem : Gtk.Bin, Gtk.Activatable, Atk.Implementor, Gtk.Buildable {
+	public class ToolItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (has_construct_function = false)]
 		public ToolItem ();
 		public bool get_expand ();
@@ -4832,7 +4913,6 @@ namespace Gtk {
 		public uint show_sort_indicator;
 		public uint sort_clicked_signal;
 		public uint sort_column_changed_signal;
-		public int sort_column_id;
 		public weak Gtk.Widget tree_view;
 		public uint use_resized_width;
 		public weak Gdk.Window window;
@@ -4845,7 +4925,6 @@ namespace Gtk {
 		public void cell_set_cell_data (Gtk.TreeModel tree_model, Gtk.TreeIter iter, bool is_expander, bool is_expanded);
 		public void focus_cell (Gtk.CellRenderer cell);
 		public float get_alignment ();
-		public unowned GLib.List get_cell_renderers ();
 		public bool get_clickable ();
 		public bool get_expand ();
 		public int get_fixed_width ();
@@ -4892,6 +4971,7 @@ namespace Gtk {
 		public bool reorderable { get; set; }
 		public bool resizable { get; set; }
 		public Gtk.TreeViewColumnSizing sizing { get; set; }
+		public int sort_column_id { get; set; }
 		public bool sort_indicator { get; set; }
 		public Gtk.SortType sort_order { get; set; }
 		public int spacing { get; set; }
@@ -4986,7 +5066,7 @@ namespace Gtk {
 		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VolumeButton : Gtk.ScaleButton, Gtk.Activatable, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
+	public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VolumeButton ();
 	}
@@ -5015,7 +5095,11 @@ namespace Gtk {
 		public class unowned GLib.ParamSpec find_style_property (string property_name);
 		public void freeze_child_notify ();
 		public virtual unowned Atk.Object get_accessible ();
+		public void get_allocation (Gtk.Allocation allocation);
 		public unowned Gtk.Widget get_ancestor (GLib.Type widget_type);
+		public bool get_app_paintable ();
+		public bool get_can_default ();
+		public bool get_can_focus ();
 		public void get_child_requisition (out Gtk.Requisition requisition);
 		public bool get_child_visible ();
 		public unowned Gtk.Clipboard get_clipboard (Gdk.Atom selection);
@@ -5027,27 +5111,33 @@ namespace Gtk {
 		public static unowned Gdk.Visual get_default_visual ();
 		public Gtk.TextDirection get_direction ();
 		public unowned Gdk.Display get_display ();
+		public bool get_double_buffered ();
 		public int get_events ();
 		public Gdk.ExtensionMode get_extension_events ();
 		[CCode (cname = "GTK_WIDGET_FLAGS")]
 		public Gtk.WidgetFlags get_flags ();
 		public bool get_has_tooltip ();
+		public bool get_has_window ();
 		public unowned Gtk.RcStyle get_modifier_style ();
 		public bool get_no_show_all ();
 		public unowned Pango.Context get_pango_context ();
 		public unowned Gtk.Widget get_parent ();
 		public unowned Gdk.Window get_parent_window ();
 		public void get_pointer (out int x, out int y);
+		public bool get_receives_default ();
 		public unowned Gdk.Window get_root_window ();
 		public unowned Gdk.Screen get_screen ();
+		public bool get_sensitive ();
 		public unowned Gtk.Settings get_settings ();
 		public void get_size_request (out int width, out int height);
 		public unowned Gdk.Pixmap get_snapshot (Gdk.Rectangle clip_rect);
+		public Gtk.StateType get_state ();
 		public unowned Gtk.Style get_style ();
 		public unowned string get_tooltip_markup ();
 		public unowned string get_tooltip_text ();
 		public unowned Gtk.Window get_tooltip_window ();
 		public unowned Gtk.Widget get_toplevel ();
+		public bool get_visible ();
 		public unowned Gdk.Visual get_visual ();
 		public unowned Gdk.Window get_window ();
 		public void grab_default ();
@@ -5078,6 +5168,7 @@ namespace Gtk {
 		public bool is_rc_style ();
 		[CCode (cname = "GTK_WIDGET_REALIZED")]
 		public bool is_realized ();
+		public bool is_sensitive ();
 		[CCode (cname = "GTK_WIDGET_TOPLEVEL")]
 		public bool is_toplevel ();
 		public unowned GLib.List list_accel_closures ();
@@ -5109,7 +5200,10 @@ namespace Gtk {
 		public void reset_shapes ();
 		public int send_expose (Gdk.Event event);
 		public void set_accel_path (string accel_path, Gtk.AccelGroup accel_group);
+		public void set_allocation (Gtk.Allocation allocation);
 		public void set_app_paintable (bool app_paintable);
+		public void set_can_default (bool can_default);
+		public void set_can_focus (bool can_focus);
 		public void set_child_visible (bool is_visible);
 		public void set_colormap (Gdk.Colormap colormap);
 		public void set_composite_name (string name);
@@ -5122,9 +5216,11 @@ namespace Gtk {
 		[CCode (cname = "GTK_WIDGET_SET_FLAGS")]
 		public void set_flags (Gtk.WidgetFlags flags);
 		public void set_has_tooltip (bool has_tooltip);
+		public void set_has_window (bool has_window);
 		public void set_no_show_all (bool no_show_all);
 		public void set_parent (Gtk.Widget parent);
 		public void set_parent_window (Gdk.Window parent_window);
+		public void set_receives_default (bool receives_default);
 		public void set_redraw_on_allocate (bool redraw_on_allocate);
 		public bool set_scroll_adjustments (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
 		public void set_sensitive (bool sensitive);
@@ -5134,6 +5230,8 @@ namespace Gtk {
 		public void set_tooltip_markup (string markup);
 		public void set_tooltip_text (string text);
 		public void set_tooltip_window (Gtk.Window custom_window);
+		public void set_visible (bool visible);
+		public void set_window (Gdk.Window window);
 		public void shape_combine_mask (Gdk.Bitmap? shape_mask, int offset_x, int offset_y);
 		public virtual void show_all ();
 		public void show_now ();
@@ -5146,14 +5244,12 @@ namespace Gtk {
 		public void unparent ();
 		[CCode (cname = "GTK_WIDGET_UNSET_FLAGS")]
 		public void unset_flags (Gtk.WidgetFlags flags);
-		[NoAccessorMethod]
 		public bool app_paintable { get; set; }
-		[NoAccessorMethod]
 		public bool can_default { get; set; }
-		[NoAccessorMethod]
 		public bool can_focus { get; set; }
 		[NoAccessorMethod]
 		public bool composite_child { get; }
+		public bool double_buffered { get; set; }
 		public Gdk.EventMask events { get; set; }
 		public Gdk.ExtensionMode extension_events { get; set; }
 		[NoAccessorMethod]
@@ -5168,14 +5264,11 @@ namespace Gtk {
 		public string name { get; set; }
 		public bool no_show_all { get; set; }
 		public Gtk.Container parent { get; set; }
-		[NoAccessorMethod]
 		public bool receives_default { get; set; }
-		[NoAccessorMethod]
 		public bool sensitive { get; set; }
 		public Gtk.Style style { get; set; }
 		public string tooltip_markup { get; set; }
 		public string tooltip_text { get; set; }
-		[NoAccessorMethod]
 		public bool visible { get; set; }
 		[NoAccessorMethod]
 		public int width_request { get; set; }
@@ -5537,6 +5630,7 @@ namespace Gtk {
 		public bool add_shortcut_folder_uri (string uri) throws GLib.Error;
 		public static GLib.Quark error_quark ();
 		public Gtk.FileChooserAction get_action ();
+		public bool get_create_folders ();
 		public string get_current_folder ();
 		public unowned GLib.File get_current_folder_file ();
 		public string get_current_folder_uri ();
@@ -5569,6 +5663,7 @@ namespace Gtk {
 		public bool select_filename (string filename);
 		public bool select_uri (string uri);
 		public void set_action (Gtk.FileChooserAction action);
+		public void set_create_folders (bool create_folders);
 		public bool set_current_folder (string filename);
 		public bool set_current_folder_file (GLib.File file) throws GLib.Error;
 		public bool set_current_folder_uri (string uri);
@@ -5590,6 +5685,7 @@ namespace Gtk {
 		public void unselect_filename (string filename);
 		public void unselect_uri (string uri);
 		public Gtk.FileChooserAction action { get; set; }
+		public bool create_folders { get; set; }
 		public bool do_overwrite_confirmation { get; set; }
 		public Gtk.Widget extra_widget { get; set; }
 		public string file_system_backend { construct; }
@@ -6435,7 +6531,8 @@ namespace Gtk {
 	public enum PrintPages {
 		ALL,
 		CURRENT,
-		RANGES
+		RANGES,
+		SELECTION
 	}
 	[CCode (cprefix = "GTK_PRINT_QUALITY_", cheader_filename = "gtk/gtk.h")]
 	public enum PrintQuality {
@@ -6885,6 +6982,7 @@ namespace Gtk {
 		MISSING_PROPERTY_VALUE,
 		INVALID_VALUE,
 		VERSION_MISMATCH,
+		DUPLICATE_ID,
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void AboutDialogActivateLinkFunc (Gtk.AboutDialog about, string link_);
@@ -7647,8 +7745,6 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void test_slider_set_perc (Gtk.Widget widget, double percentage);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static bool test_spin_button_click (Gtk.SpinButton spinner, uint button, bool upwards);
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static unowned string test_text_get (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void test_text_set (Gtk.Widget widget, string str);
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.gi b/vapi/packages/gtk+-2.0/gtk+-2.0.gi
index 253f241..3a5bb10 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.gi
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.gi
@@ -1292,14 +1292,6 @@
 				<parameter name="percentage" type="double"/>
 			</parameters>
 		</function>
-		<function name="test_spin_button_click" symbol="gtk_test_spin_button_click">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="spinner" type="GtkSpinButton*"/>
-				<parameter name="button" type="guint"/>
-				<parameter name="upwards" type="gboolean"/>
-			</parameters>
-		</function>
 		<function name="test_text_get" symbol="gtk_test_text_get">
 			<return-type type="gchar*"/>
 			<parameters>
@@ -3977,6 +3969,7 @@
 			<member name="GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE" value="5"/>
 			<member name="GTK_BUILDER_ERROR_INVALID_VALUE" value="6"/>
 			<member name="GTK_BUILDER_ERROR_VERSION_MISMATCH" value="7"/>
+			<member name="GTK_BUILDER_ERROR_DUPLICATE_ID" value="8"/>
 		</enum>
 		<enum name="GtkButtonBoxStyle" type-name="GtkButtonBoxStyle" get-type="gtk_button_box_style_get_type">
 			<member name="GTK_BUTTONBOX_DEFAULT_STYLE" value="0"/>
@@ -4285,6 +4278,7 @@
 			<member name="GTK_PRINT_PAGES_ALL" value="0"/>
 			<member name="GTK_PRINT_PAGES_CURRENT" value="1"/>
 			<member name="GTK_PRINT_PAGES_RANGES" value="2"/>
+			<member name="GTK_PRINT_PAGES_SELECTION" value="3"/>
 		</enum>
 		<enum name="GtkPrintQuality" type-name="GtkPrintQuality" get-type="gtk_print_quality_get_type">
 			<member name="GTK_PRINT_QUALITY_LOW" value="0"/>
@@ -6451,9 +6445,9 @@
 		</object>
 		<object name="GtkButton" parent="GtkBin" type-name="GtkButton" get-type="gtk_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="clicked" symbol="gtk_button_clicked">
 				<return-type type="void"/>
@@ -6896,6 +6890,14 @@
 					<parameter name="flags" type="GtkCellRendererState"/>
 				</parameters>
 			</method>
+			<method name="get_alignment" symbol="gtk_cell_renderer_get_alignment">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="xalign" type="gfloat*"/>
+					<parameter name="yalign" type="gfloat*"/>
+				</parameters>
+			</method>
 			<method name="get_fixed_size" symbol="gtk_cell_renderer_get_fixed_size">
 				<return-type type="void"/>
 				<parameters>
@@ -6904,6 +6906,20 @@
 					<parameter name="height" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="get_padding" symbol="gtk_cell_renderer_get_padding">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="xpad" type="gint*"/>
+					<parameter name="ypad" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_sensitive" symbol="gtk_cell_renderer_get_sensitive">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
 			<method name="get_size" symbol="gtk_cell_renderer_get_size">
 				<return-type type="void"/>
 				<parameters>
@@ -6916,6 +6932,12 @@
 					<parameter name="height" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="get_visible" symbol="gtk_cell_renderer_get_visible">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
 			<method name="render" symbol="gtk_cell_renderer_render">
 				<return-type type="void"/>
 				<parameters>
@@ -6928,6 +6950,14 @@
 					<parameter name="flags" type="GtkCellRendererState"/>
 				</parameters>
 			</method>
+			<method name="set_alignment" symbol="gtk_cell_renderer_set_alignment">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="xalign" type="gfloat"/>
+					<parameter name="yalign" type="gfloat"/>
+				</parameters>
+			</method>
 			<method name="set_fixed_size" symbol="gtk_cell_renderer_set_fixed_size">
 				<return-type type="void"/>
 				<parameters>
@@ -6936,6 +6966,28 @@
 					<parameter name="height" type="gint"/>
 				</parameters>
 			</method>
+			<method name="set_padding" symbol="gtk_cell_renderer_set_padding">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="xpad" type="gint"/>
+					<parameter name="ypad" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_sensitive" symbol="gtk_cell_renderer_set_sensitive">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="sensitive" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_visible" symbol="gtk_cell_renderer_set_visible">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="visible" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="start_editing" symbol="gtk_cell_renderer_start_editing">
 				<return-type type="GtkCellEditable*"/>
 				<parameters>
@@ -7219,6 +7271,12 @@
 			<field name="calc_fixed_height" type="guint"/>
 		</object>
 		<object name="GtkCellRendererToggle" parent="GtkCellRenderer" type-name="GtkCellRendererToggle" get-type="gtk_cell_renderer_toggle_get_type">
+			<method name="get_activatable" symbol="gtk_cell_renderer_toggle_get_activatable">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="toggle" type="GtkCellRendererToggle*"/>
+				</parameters>
+			</method>
 			<method name="get_active" symbol="gtk_cell_renderer_toggle_get_active">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -7234,6 +7292,13 @@
 			<constructor name="new" symbol="gtk_cell_renderer_toggle_new">
 				<return-type type="GtkCellRenderer*"/>
 			</constructor>
+			<method name="set_activatable" symbol="gtk_cell_renderer_toggle_set_activatable">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="toggle" type="GtkCellRendererToggle*"/>
+					<parameter name="setting" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_active" symbol="gtk_cell_renderer_toggle_set_active">
 				<return-type type="void"/>
 				<parameters>
@@ -7270,12 +7335,6 @@
 				<interface name="GtkBuildable"/>
 				<interface name="GtkCellLayout"/>
 			</implements>
-			<method name="get_cell_renderers" symbol="gtk_cell_view_get_cell_renderers">
-				<return-type type="GList*"/>
-				<parameters>
-					<parameter name="cell_view" type="GtkCellView*"/>
-				</parameters>
-			</method>
 			<method name="get_displayed_row" symbol="gtk_cell_view_get_displayed_row">
 				<return-type type="GtkTreePath*"/>
 				<parameters>
@@ -7345,9 +7404,9 @@
 		</object>
 		<object name="GtkCheckButton" parent="GtkToggleButton" type-name="GtkCheckButton" get-type="gtk_check_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_check_button_new">
 				<return-type type="GtkWidget*"/>
@@ -7374,9 +7433,9 @@
 		</object>
 		<object name="GtkCheckMenuItem" parent="GtkMenuItem" type-name="GtkCheckMenuItem" get-type="gtk_check_menu_item_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_active" symbol="gtk_check_menu_item_get_active">
 				<return-type type="gboolean"/>
@@ -7676,9 +7735,9 @@
 		</object>
 		<object name="GtkColorButton" parent="GtkButton" type-name="GtkColorButton" get-type="gtk_color_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_alpha" symbol="gtk_color_button_get_alpha">
 				<return-type type="guint16"/>
@@ -8764,6 +8823,12 @@
 					<parameter name="entry" type="GtkEntry*"/>
 				</parameters>
 			</method>
+			<method name="get_buffer" symbol="gtk_entry_get_buffer">
+				<return-type type="GtkEntryBuffer*"/>
+				<parameters>
+					<parameter name="entry" type="GtkEntry*"/>
+				</parameters>
+			</method>
 			<method name="get_completion" symbol="gtk_entry_get_completion">
 				<return-type type="GtkEntryCompletion*"/>
 				<parameters>
@@ -8943,6 +9008,12 @@
 			<constructor name="new" symbol="gtk_entry_new">
 				<return-type type="GtkWidget*"/>
 			</constructor>
+			<constructor name="new_with_buffer" symbol="gtk_entry_new_with_buffer">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+				</parameters>
+			</constructor>
 			<method name="progress_pulse" symbol="gtk_entry_progress_pulse">
 				<return-type type="void"/>
 				<parameters>
@@ -8963,6 +9034,13 @@
 					<parameter name="xalign" type="gfloat"/>
 				</parameters>
 			</method>
+			<method name="set_buffer" symbol="gtk_entry_set_buffer">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="entry" type="GtkEntry*"/>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+				</parameters>
+			</method>
 			<method name="set_completion" symbol="gtk_entry_set_completion">
 				<return-type type="void"/>
 				<parameters>
@@ -9134,6 +9212,7 @@
 				</parameters>
 			</method>
 			<property name="activates-default" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="buffer" type="GtkEntryBuffer*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="caps-lock-warning" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="cursor-position" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="editable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -9298,8 +9377,8 @@
 			<field name="scroll_offset" type="gint"/>
 			<field name="ascent" type="gint"/>
 			<field name="descent" type="gint"/>
-			<field name="text_size" type="guint16"/>
-			<field name="n_bytes" type="guint16"/>
+			<field name="x_text_size" type="guint16"/>
+			<field name="x_n_bytes" type="guint16"/>
 			<field name="preedit_length" type="guint16"/>
 			<field name="preedit_cursor" type="guint16"/>
 			<field name="dnd_position" type="gint"/>
@@ -9308,6 +9387,138 @@
 			<field name="invisible_char" type="gunichar"/>
 			<field name="width_chars" type="gint"/>
 		</object>
+		<object name="GtkEntryBuffer" parent="GObject" type-name="GtkEntryBuffer" get-type="gtk_entry_buffer_get_type">
+			<method name="delete_text" symbol="gtk_entry_buffer_delete_text">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+					<parameter name="position" type="guint"/>
+					<parameter name="n_chars" type="gint"/>
+				</parameters>
+			</method>
+			<method name="emit_deleted_text" symbol="gtk_entry_buffer_emit_deleted_text">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+					<parameter name="position" type="guint"/>
+					<parameter name="n_chars" type="guint"/>
+				</parameters>
+			</method>
+			<method name="emit_inserted_text" symbol="gtk_entry_buffer_emit_inserted_text">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+					<parameter name="position" type="guint"/>
+					<parameter name="chars" type="gchar*"/>
+					<parameter name="n_chars" type="guint"/>
+				</parameters>
+			</method>
+			<method name="get_bytes" symbol="gtk_entry_buffer_get_bytes">
+				<return-type type="gsize"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+				</parameters>
+			</method>
+			<method name="get_length" symbol="gtk_entry_buffer_get_length">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+				</parameters>
+			</method>
+			<method name="get_max_length" symbol="gtk_entry_buffer_get_max_length">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+				</parameters>
+			</method>
+			<method name="get_text" symbol="gtk_entry_buffer_get_text">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+				</parameters>
+			</method>
+			<method name="insert_text" symbol="gtk_entry_buffer_insert_text">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+					<parameter name="position" type="guint"/>
+					<parameter name="chars" type="gchar*"/>
+					<parameter name="n_chars" type="gint"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_entry_buffer_new">
+				<return-type type="GtkEntryBuffer*"/>
+				<parameters>
+					<parameter name="initial_chars" type="gchar*"/>
+					<parameter name="n_initial_chars" type="gint"/>
+				</parameters>
+			</constructor>
+			<method name="set_max_length" symbol="gtk_entry_buffer_set_max_length">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+					<parameter name="max_length" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_text" symbol="gtk_entry_buffer_set_text">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+					<parameter name="chars" type="gchar*"/>
+					<parameter name="n_chars" type="gint"/>
+				</parameters>
+			</method>
+			<property name="length" type="guint" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="max-length" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="deleted-text" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+					<parameter name="position" type="guint"/>
+					<parameter name="n_chars" type="guint"/>
+				</parameters>
+			</signal>
+			<signal name="inserted-text" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+					<parameter name="position" type="guint"/>
+					<parameter name="chars" type="char*"/>
+					<parameter name="n_chars" type="guint"/>
+				</parameters>
+			</signal>
+			<vfunc name="delete_text">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+					<parameter name="position" type="guint"/>
+					<parameter name="n_chars" type="guint"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_length">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_text">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+					<parameter name="n_bytes" type="gsize*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="insert_text">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="buffer" type="GtkEntryBuffer*"/>
+					<parameter name="position" type="guint"/>
+					<parameter name="chars" type="gchar*"/>
+					<parameter name="n_chars" type="guint"/>
+				</parameters>
+			</vfunc>
+		</object>
 		<object name="GtkEntryCompletion" parent="GObject" type-name="GtkEntryCompletion" get-type="gtk_entry_completion_get_type">
 			<implements>
 				<interface name="GtkBuildable"/>
@@ -9865,9 +10076,9 @@
 		</object>
 		<object name="GtkFontButton" parent="GtkButton" type-name="GtkFontButton" get-type="gtk_font_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_font_name" symbol="gtk_font_button_get_font_name">
 				<return-type type="gchar*"/>
@@ -11000,6 +11211,12 @@
 					<parameter name="cell" type="GtkCellRenderer**"/>
 				</parameters>
 			</method>
+			<method name="get_item_padding" symbol="gtk_icon_view_get_item_padding">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="icon_view" type="GtkIconView*"/>
+				</parameters>
+			</method>
 			<method name="get_item_width" symbol="gtk_icon_view_get_item_width">
 				<return-type type="gint"/>
 				<parameters>
@@ -11191,6 +11408,13 @@
 					<parameter name="pos" type="GtkIconViewDropPosition"/>
 				</parameters>
 			</method>
+			<method name="set_item_padding" symbol="gtk_icon_view_set_item_padding">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="icon_view" type="GtkIconView*"/>
+					<parameter name="item_padding" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_item_width" symbol="gtk_icon_view_set_item_width">
 				<return-type type="void"/>
 				<parameters>
@@ -11319,6 +11543,7 @@
 			</method>
 			<property name="column-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="columns" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="item-padding" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="item-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="margin" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="markup-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -11633,9 +11858,9 @@
 		</object>
 		<object name="GtkImageMenuItem" parent="GtkMenuItem" type-name="GtkImageMenuItem" get-type="gtk_image_menu_item_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_always_show_image" symbol="gtk_image_menu_item_get_always_show_image">
 				<return-type type="gboolean"/>
@@ -11711,6 +11936,106 @@
 			<property name="use-stock" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<field name="image" type="GtkWidget*"/>
 		</object>
+		<object name="GtkInfoBar" parent="GtkHBox" type-name="GtkInfoBar" get-type="gtk_info_bar_get_type">
+			<implements>
+				<interface name="AtkImplementor"/>
+				<interface name="GtkBuildable"/>
+				<interface name="GtkOrientable"/>
+			</implements>
+			<method name="add_action_widget" symbol="gtk_info_bar_add_action_widget">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+					<parameter name="child" type="GtkWidget*"/>
+					<parameter name="response_id" type="gint"/>
+				</parameters>
+			</method>
+			<method name="add_button" symbol="gtk_info_bar_add_button">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+					<parameter name="button_text" type="gchar*"/>
+					<parameter name="response_id" type="gint"/>
+				</parameters>
+			</method>
+			<method name="add_buttons" symbol="gtk_info_bar_add_buttons">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+					<parameter name="first_button_text" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="get_action_area" symbol="gtk_info_bar_get_action_area">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+				</parameters>
+			</method>
+			<method name="get_content_area" symbol="gtk_info_bar_get_content_area">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+				</parameters>
+			</method>
+			<method name="get_message_type" symbol="gtk_info_bar_get_message_type">
+				<return-type type="GtkMessageType"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_info_bar_new">
+				<return-type type="GtkWidget*"/>
+			</constructor>
+			<constructor name="new_with_buttons" symbol="gtk_info_bar_new_with_buttons">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="first_button_text" type="gchar*"/>
+				</parameters>
+			</constructor>
+			<method name="response" symbol="gtk_info_bar_response">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+					<parameter name="response_id" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_default_response" symbol="gtk_info_bar_set_default_response">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+					<parameter name="response_id" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_message_type" symbol="gtk_info_bar_set_message_type">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+					<parameter name="message_type" type="GtkMessageType"/>
+				</parameters>
+			</method>
+			<method name="set_response_sensitive" symbol="gtk_info_bar_set_response_sensitive">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+					<parameter name="response_id" type="gint"/>
+					<parameter name="setting" type="gboolean"/>
+				</parameters>
+			</method>
+			<property name="message-type" type="GtkMessageType" readable="1" writable="1" construct="1" construct-only="0"/>
+			<signal name="close" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+				</parameters>
+			</signal>
+			<signal name="response" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="info_bar" type="GtkInfoBar*"/>
+					<parameter name="response_id" type="gint"/>
+				</parameters>
+			</signal>
+		</object>
 		<object name="GtkInputDialog" parent="GtkDialog" type-name="GtkInputDialog" get-type="gtk_input_dialog_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -11833,6 +12158,12 @@
 					<parameter name="label" type="GtkLabel*"/>
 				</parameters>
 			</method>
+			<method name="get_current_uri" symbol="gtk_label_get_current_uri">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="label" type="GtkLabel*"/>
+				</parameters>
+			</method>
 			<method name="get_ellipsize" symbol="gtk_label_get_ellipsize">
 				<return-type type="PangoEllipsizeMode"/>
 				<parameters>
@@ -11921,6 +12252,12 @@
 					<parameter name="label" type="GtkLabel*"/>
 				</parameters>
 			</method>
+			<method name="get_track_visited_links" symbol="gtk_label_get_track_visited_links">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="label" type="GtkLabel*"/>
+				</parameters>
+			</method>
 			<method name="get_use_markup" symbol="gtk_label_get_use_markup">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -12071,6 +12408,13 @@
 					<parameter name="str" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="set_track_visited_links" symbol="gtk_label_set_track_visited_links">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="label" type="GtkLabel*"/>
+					<parameter name="track_links" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_use_markup" symbol="gtk_label_set_use_markup">
 				<return-type type="void"/>
 				<parameters>
@@ -12105,11 +12449,25 @@
 			<property name="selectable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="selection-bound" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="single-line-mode" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="track-visited-links" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="use-markup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="use-underline" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="width-chars" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="wrap" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="wrap-mode" type="PangoWrapMode" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="activate-current-link" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="GtkLabel*"/>
+				</parameters>
+			</signal>
+			<signal name="activate-link" when="LAST">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="label" type="GtkLabel*"/>
+					<parameter name="uri" type="char*"/>
+				</parameters>
+			</signal>
 			<signal name="copy-clipboard" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -12143,6 +12501,7 @@
 			<field name="in_click" type="guint"/>
 			<field name="wrap_mode" type="guint"/>
 			<field name="pattern_set" type="guint"/>
+			<field name="track_links" type="guint"/>
 			<field name="mnemonic_keyval" type="guint"/>
 			<field name="text" type="gchar*"/>
 			<field name="attrs" type="PangoAttrList*"/>
@@ -12255,9 +12614,9 @@
 		</object>
 		<object name="GtkLinkButton" parent="GtkButton" type-name="GtkLinkButton" get-type="gtk_link_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_uri" symbol="gtk_link_button_get_uri">
 				<return-type type="gchar*"/>
@@ -12559,6 +12918,12 @@
 					<parameter name="menu" type="GtkMenu*"/>
 				</parameters>
 			</method>
+			<method name="get_reserve_toggle_size" symbol="gtk_menu_get_reserve_toggle_size">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="menu" type="GtkMenu*"/>
+				</parameters>
+			</method>
 			<method name="get_tearoff_state" symbol="gtk_menu_get_tearoff_state">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -12634,6 +12999,13 @@
 					<parameter name="monitor_num" type="gint"/>
 				</parameters>
 			</method>
+			<method name="set_reserve_toggle_size" symbol="gtk_menu_set_reserve_toggle_size">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="menu" type="GtkMenu*"/>
+					<parameter name="reserve_toggle_size" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_screen" symbol="gtk_menu_set_screen">
 				<return-type type="void"/>
 				<parameters>
@@ -12660,6 +13032,7 @@
 			<property name="active" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="attach-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="monitor" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="reserve-toggle-size" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="tearoff-state" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="tearoff-title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<signal name="move-scroll" when="LAST">
@@ -12737,9 +13110,9 @@
 		</object>
 		<object name="GtkMenuItem" parent="GtkItem" type-name="GtkMenuItem" get-type="gtk_menu_item_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="activate" symbol="gtk_menu_item_activate">
 				<return-type type="void"/>
@@ -13072,9 +13445,9 @@
 		</object>
 		<object name="GtkMenuToolButton" parent="GtkToolButton" type-name="GtkMenuToolButton" get-type="gtk_menu_tool_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_menu" symbol="gtk_menu_tool_button_get_menu">
 				<return-type type="GtkWidget*"/>
@@ -14210,6 +14583,12 @@
 					<parameter name="op" type="GtkPrintOperation*"/>
 				</parameters>
 			</method>
+			<method name="get_embed_page_setup" symbol="gtk_print_operation_get_embed_page_setup">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="op" type="GtkPrintOperation*"/>
+				</parameters>
+			</method>
 			<method name="get_error" symbol="gtk_print_operation_get_error">
 				<return-type type="void"/>
 				<parameters>
@@ -14217,6 +14596,18 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="get_has_selection" symbol="gtk_print_operation_get_has_selection">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="op" type="GtkPrintOperation*"/>
+				</parameters>
+			</method>
+			<method name="get_n_pages_to_print" symbol="gtk_print_operation_get_n_pages_to_print">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="op" type="GtkPrintOperation*"/>
+				</parameters>
+			</method>
 			<method name="get_print_settings" symbol="gtk_print_operation_get_print_settings">
 				<return-type type="GtkPrintSettings*"/>
 				<parameters>
@@ -14235,6 +14626,12 @@
 					<parameter name="op" type="GtkPrintOperation*"/>
 				</parameters>
 			</method>
+			<method name="get_support_selection" symbol="gtk_print_operation_get_support_selection">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="op" type="GtkPrintOperation*"/>
+				</parameters>
+			</method>
 			<method name="is_finished" symbol="gtk_print_operation_is_finished">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -14287,6 +14684,13 @@
 					<parameter name="op" type="GtkPrintOperation*"/>
 				</parameters>
 			</method>
+			<method name="set_embed_page_setup" symbol="gtk_print_operation_set_embed_page_setup">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="op" type="GtkPrintOperation*"/>
+					<parameter name="embed" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_export_filename" symbol="gtk_print_operation_set_export_filename">
 				<return-type type="void"/>
 				<parameters>
@@ -14294,6 +14698,13 @@
 					<parameter name="filename" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="set_has_selection" symbol="gtk_print_operation_set_has_selection">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="op" type="GtkPrintOperation*"/>
+					<parameter name="has_selection" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_job_name" symbol="gtk_print_operation_set_job_name">
 				<return-type type="void"/>
 				<parameters>
@@ -14322,6 +14733,13 @@
 					<parameter name="show_progress" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="set_support_selection" symbol="gtk_print_operation_set_support_selection">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="op" type="GtkPrintOperation*"/>
+					<parameter name="support_selection" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_track_print_status" symbol="gtk_print_operation_set_track_print_status">
 				<return-type type="void"/>
 				<parameters>
@@ -14347,13 +14765,17 @@
 			<property name="current-page" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="custom-tab-label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="default-page-setup" type="GtkPageSetup*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="embed-page-setup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="export-filename" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="has-selection" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="job-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="n-pages" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="n-pages-to-print" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="print-settings" type="GtkPrintSettings*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="show-progress" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="status" type="GtkPrintStatus" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="status-string" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="support-selection" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="track-print-status" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="unit" type="GtkUnit" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="use-full-page" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -14430,6 +14852,15 @@
 					<parameter name="operation" type="GtkPrintOperation*"/>
 				</parameters>
 			</signal>
+			<signal name="update-custom-widget" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="operation" type="GtkPrintOperation*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="setup" type="GtkPageSetup*"/>
+					<parameter name="settings" type="GtkPrintSettings*"/>
+				</parameters>
+			</signal>
 		</object>
 		<object name="GtkPrintSettings" parent="GObject" type-name="GtkPrintSettings" get-type="gtk_print_settings_get_type">
 			<method name="copy" symbol="gtk_print_settings_copy">
@@ -15097,9 +15528,9 @@
 		</object>
 		<object name="GtkRadioButton" parent="GtkCheckButton" type-name="GtkRadioButton" get-type="gtk_radio_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_group" symbol="gtk_radio_button_get_group">
 				<return-type type="GSList*"/>
@@ -15165,9 +15596,9 @@
 		</object>
 		<object name="GtkRadioMenuItem" parent="GtkCheckMenuItem" type-name="GtkRadioMenuItem" get-type="gtk_radio_menu_item_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_group" symbol="gtk_radio_menu_item_get_group">
 				<return-type type="GSList*"/>
@@ -15233,9 +15664,9 @@
 		</object>
 		<object name="GtkRadioToolButton" parent="GtkToggleToolButton" type-name="GtkRadioToolButton" get-type="gtk_radio_tool_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_group" symbol="gtk_radio_tool_button_get_group">
 				<return-type type="GSList*"/>
@@ -15296,6 +15727,12 @@
 					<parameter name="range" type="GtkRange*"/>
 				</parameters>
 			</method>
+			<method name="get_flippable" symbol="gtk_range_get_flippable">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="range" type="GtkRange*"/>
+				</parameters>
+			</method>
 			<method name="get_inverted" symbol="gtk_range_get_inverted">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -15352,6 +15789,13 @@
 					<parameter name="fill_level" type="gdouble"/>
 				</parameters>
 			</method>
+			<method name="set_flippable" symbol="gtk_range_set_flippable">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="range" type="GtkRange*"/>
+					<parameter name="flippable" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_increments" symbol="gtk_range_set_increments">
 				<return-type type="void"/>
 				<parameters>
@@ -15602,9 +16046,9 @@
 		</object>
 		<object name="GtkRecentChooserMenu" parent="GtkMenu" type-name="GtkRecentChooserMenu" get-type="gtk_recent_chooser_menu_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 				<interface name="GtkRecentChooser"/>
 			</implements>
 			<method name="get_show_numbers" symbol="gtk_recent_chooser_menu_get_show_numbers">
@@ -16018,10 +16462,10 @@
 		</object>
 		<object name="GtkScaleButton" parent="GtkButton" type-name="GtkScaleButton" get-type="gtk_scale_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkOrientable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_adjustment" symbol="gtk_scale_button_get_adjustment">
 				<return-type type="GtkAdjustment*"/>
@@ -16263,9 +16707,9 @@
 		</object>
 		<object name="GtkSeparatorMenuItem" parent="GtkMenuItem" type-name="GtkSeparatorMenuItem" get-type="gtk_separator_menu_item_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_separator_menu_item_new">
 				<return-type type="GtkWidget*"/>
@@ -16273,9 +16717,9 @@
 		</object>
 		<object name="GtkSeparatorToolItem" parent="GtkToolItem" type-name="GtkSeparatorToolItem" get-type="gtk_separator_tool_item_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_draw" symbol="gtk_separator_tool_item_get_draw">
 				<return-type type="gboolean"/>
@@ -16825,6 +17269,12 @@
 					<parameter name="status_icon" type="GtkStatusIcon*"/>
 				</parameters>
 			</method>
+			<method name="get_title" symbol="gtk_status_icon_get_title">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="status_icon" type="GtkStatusIcon*"/>
+				</parameters>
+			</method>
 			<method name="get_tooltip_markup" symbol="gtk_status_icon_get_tooltip_markup">
 				<return-type type="gchar*"/>
 				<parameters>
@@ -16954,6 +17404,13 @@
 					<parameter name="screen" type="GdkScreen*"/>
 				</parameters>
 			</method>
+			<method name="set_title" symbol="gtk_status_icon_set_title">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="status_icon" type="GtkStatusIcon*"/>
+					<parameter name="title" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="set_tooltip_markup" symbol="gtk_status_icon_set_tooltip_markup">
 				<return-type type="void"/>
 				<parameters>
@@ -16987,6 +17444,7 @@
 			<property name="size" type="gint" readable="1" writable="0" 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="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="tooltip-markup" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="tooltip-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="visible" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -17771,9 +18229,9 @@
 		</object>
 		<object name="GtkTearoffMenuItem" parent="GtkMenuItem" type-name="GtkTearoffMenuItem" get-type="gtk_tearoff_menu_item_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_tearoff_menu_item_new">
 				<return-type type="GtkWidget*"/>
@@ -19381,9 +19839,9 @@
 		</object>
 		<object name="GtkToggleButton" parent="GtkButton" type-name="GtkToggleButton" get-type="gtk_toggle_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_active" symbol="gtk_toggle_button_get_active">
 				<return-type type="gboolean"/>
@@ -19460,9 +19918,9 @@
 		</object>
 		<object name="GtkToggleToolButton" parent="GtkToolButton" type-name="GtkToggleToolButton" get-type="gtk_toggle_tool_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_active" symbol="gtk_toggle_tool_button_get_active">
 				<return-type type="gboolean"/>
@@ -19496,9 +19954,9 @@
 		</object>
 		<object name="GtkToolButton" parent="GtkToolItem" type-name="GtkToolButton" get-type="gtk_tool_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_icon_name" symbol="gtk_tool_button_get_icon_name">
 				<return-type type="gchar*"/>
@@ -19606,9 +20064,9 @@
 		</object>
 		<object name="GtkToolItem" parent="GtkBin" type-name="GtkToolItem" get-type="gtk_tool_item_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_expand" symbol="gtk_tool_item_get_expand">
 				<return-type type="gboolean"/>
@@ -21479,12 +21937,6 @@
 					<parameter name="tree_column" type="GtkTreeViewColumn*"/>
 				</parameters>
 			</method>
-			<method name="get_cell_renderers" symbol="gtk_tree_view_column_get_cell_renderers">
-				<return-type type="GList*"/>
-				<parameters>
-					<parameter name="tree_column" type="GtkTreeViewColumn*"/>
-				</parameters>
-			</method>
 			<method name="get_clickable" symbol="gtk_tree_view_column_get_clickable">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -21757,6 +22209,7 @@
 			<property name="reorderable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="resizable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="sizing" type="GtkTreeViewColumnSizing" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="sort-column-id" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="sort-indicator" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="sort-order" type="GtkSortType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -22146,10 +22599,10 @@
 		</object>
 		<object name="GtkVolumeButton" parent="GtkScaleButton" type-name="GtkVolumeButton" get-type="gtk_volume_button_get_type">
 			<implements>
-				<interface name="GtkActivatable"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkOrientable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_volume_button_new">
 				<return-type type="GtkWidget*"/>
@@ -22307,6 +22760,13 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_allocation" symbol="gtk_widget_get_allocation">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="allocation" type="GtkAllocation*"/>
+				</parameters>
+			</method>
 			<method name="get_ancestor" symbol="gtk_widget_get_ancestor">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -22314,6 +22774,24 @@
 					<parameter name="widget_type" type="GType"/>
 				</parameters>
 			</method>
+			<method name="get_app_paintable" symbol="gtk_widget_get_app_paintable">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_can_default" symbol="gtk_widget_get_can_default">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_can_focus" symbol="gtk_widget_get_can_focus">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_child_requisition" symbol="gtk_widget_get_child_requisition">
 				<return-type type="void"/>
 				<parameters>
@@ -22370,6 +22848,12 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_double_buffered" symbol="gtk_widget_get_double_buffered">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_events" symbol="gtk_widget_get_events">
 				<return-type type="gint"/>
 				<parameters>
@@ -22388,6 +22872,12 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_has_window" symbol="gtk_widget_get_has_window">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_modifier_style" symbol="gtk_widget_get_modifier_style">
 				<return-type type="GtkRcStyle*"/>
 				<parameters>
@@ -22432,6 +22922,12 @@
 					<parameter name="y" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="get_receives_default" symbol="gtk_widget_get_receives_default">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_root_window" symbol="gtk_widget_get_root_window">
 				<return-type type="GdkWindow*"/>
 				<parameters>
@@ -22444,6 +22940,12 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_sensitive" symbol="gtk_widget_get_sensitive">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_settings" symbol="gtk_widget_get_settings">
 				<return-type type="GtkSettings*"/>
 				<parameters>
@@ -22465,6 +22967,12 @@
 					<parameter name="clip_rect" type="GdkRectangle*"/>
 				</parameters>
 			</method>
+			<method name="get_state" symbol="gtk_widget_get_state">
+				<return-type type="GtkStateType"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_style" symbol="gtk_widget_get_style">
 				<return-type type="GtkStyle*"/>
 				<parameters>
@@ -22495,6 +23003,12 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_visible" symbol="gtk_widget_get_visible">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_visual" symbol="gtk_widget_get_visual">
 				<return-type type="GdkVisual*"/>
 				<parameters>
@@ -22519,6 +23033,24 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="has_default" symbol="gtk_widget_has_default">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="has_focus" symbol="gtk_widget_has_focus">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="has_grab" symbol="gtk_widget_has_grab">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="has_screen" symbol="gtk_widget_has_screen">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -22573,12 +23105,30 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="is_drawable" symbol="gtk_widget_is_drawable">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="is_focus" symbol="gtk_widget_is_focus">
 				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="is_sensitive" symbol="gtk_widget_is_sensitive">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="is_toplevel" symbol="gtk_widget_is_toplevel">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="keynav_failed" symbol="gtk_widget_keynav_failed">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -22796,6 +23346,13 @@
 					<parameter name="accel_group" type="GtkAccelGroup*"/>
 				</parameters>
 			</method>
+			<method name="set_allocation" symbol="gtk_widget_set_allocation">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="allocation" type="GtkAllocation*"/>
+				</parameters>
+			</method>
 			<method name="set_app_paintable" symbol="gtk_widget_set_app_paintable">
 				<return-type type="void"/>
 				<parameters>
@@ -22803,6 +23360,20 @@
 					<parameter name="app_paintable" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="set_can_default" symbol="gtk_widget_set_can_default">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="can_default" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_can_focus" symbol="gtk_widget_set_can_focus">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="can_focus" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_child_visible" symbol="gtk_widget_set_child_visible">
 				<return-type type="void"/>
 				<parameters>
@@ -22871,6 +23442,13 @@
 					<parameter name="has_tooltip" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="set_has_window" symbol="gtk_widget_set_has_window">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="has_window" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_name" symbol="gtk_widget_set_name">
 				<return-type type="void"/>
 				<parameters>
@@ -22899,6 +23477,13 @@
 					<parameter name="parent_window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="set_receives_default" symbol="gtk_widget_set_receives_default">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="receives_default" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_redraw_on_allocate" symbol="gtk_widget_set_redraw_on_allocate">
 				<return-type type="void"/>
 				<parameters>
@@ -22964,6 +23549,20 @@
 					<parameter name="custom_window" type="GtkWindow*"/>
 				</parameters>
 			</method>
+			<method name="set_visible" symbol="gtk_widget_set_visible">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="visible" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_window" symbol="gtk_widget_set_window">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="shape_combine_mask" symbol="gtk_widget_shape_combine_mask">
 				<return-type type="void"/>
 				<parameters>
@@ -23073,6 +23672,7 @@
 			<property name="can-default" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="can-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="composite-child" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="double-buffered" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="events" type="GdkEventMask" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="extension-events" type="GdkExtensionMode" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="has-default" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -25035,6 +25635,12 @@
 					<parameter name="chooser" type="GtkFileChooser*"/>
 				</parameters>
 			</method>
+			<method name="get_create_folders" symbol="gtk_file_chooser_get_create_folders">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="chooser" type="GtkFileChooser*"/>
+				</parameters>
+			</method>
 			<method name="get_current_folder" symbol="gtk_file_chooser_get_current_folder">
 				<return-type type="gchar*"/>
 				<parameters>
@@ -25237,6 +25843,13 @@
 					<parameter name="action" type="GtkFileChooserAction"/>
 				</parameters>
 			</method>
+			<method name="set_create_folders" symbol="gtk_file_chooser_set_create_folders">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="chooser" type="GtkFileChooser*"/>
+					<parameter name="create_folders" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_current_folder" symbol="gtk_file_chooser_set_current_folder">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -25379,6 +25992,7 @@
 				</parameters>
 			</method>
 			<property name="action" type="GtkFileChooserAction" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="create-folders" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="do-overwrite-confirmation" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="extra-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="file-system-backend" type="char*" readable="0" writable="1" construct="0" construct-only="1"/>
@@ -26395,14 +27009,14 @@
 			</vfunc>
 		</interface>
 		<constant name="GTK_ARG_READWRITE" type="int" value="0"/>
-		<constant name="GTK_BINARY_AGE" type="int" value="1600"/>
+		<constant name="GTK_BINARY_AGE" type="int" value="1803"/>
 		<constant name="GTK_BUTTONBOX_DEFAULT" type="int" value="-1"/>
 		<constant name="GTK_INPUT_ERROR" type="int" value="-1"/>
-		<constant name="GTK_INTERFACE_AGE" type="int" value="0"/>
+		<constant name="GTK_INTERFACE_AGE" type="int" value="3"/>
 		<constant name="GTK_MAJOR_VERSION" type="int" value="2"/>
 		<constant name="GTK_MAX_COMPOSE_LEN" type="int" value="7"/>
-		<constant name="GTK_MICRO_VERSION" type="int" value="0"/>
-		<constant name="GTK_MINOR_VERSION" type="int" value="16"/>
+		<constant name="GTK_MICRO_VERSION" type="int" value="3"/>
+		<constant name="GTK_MINOR_VERSION" type="int" value="18"/>
 		<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"/>
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index d7600c4..8d38f57 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -150,6 +150,7 @@ gtk_frame_new.label nullable="1"
 GtkHandleBox.child_detached hidden="1"
 GtkHandleBox::child_detached hidden="1"
 gtk_hscale_new.adjustment nullable="1"
+GtkInfoBar::response has_emitter="1"
 gtk_get_current_event transfer_ownership="1"
 gtk_get_option_group transfer_ownership="1"
 gtk_icon_info_copy transfer_ownership="1"
@@ -688,6 +689,11 @@ GtkWidget::no_expose_event.event namespace_name="Gdk" type_name="EventNoExpose"
 GtkWidget::focus_in_event.event namespace_name="Gdk" type_name="EventFocus"
 GtkWidget::focus_out_event.event namespace_name="Gdk" type_name="EventFocus"
 GtkWidget::hierarchy_changed.previous_toplevel nullable="1"
+GtkWidget::has_default has_emitter="1"
+GtkWidget::has_focus has_emitter="1"
+GtkWidget::has_grab has_emitter="1"
+GtkWidget::is_drawable has_emitter="1"
+GtkWidget::is_toplevel has_emitter="1"
 GtkWidget::motion_notify_event.event namespace_name="Gdk" type_name="EventMotion"
 GtkWidget::focus_out_event.event namespace_name="Gdk" type_name="EventFocus"
 GtkWidget::parent_set.previous_parent nullable="1"