gtk+-3.0: Update to 2.99.2

diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index f18a3f8708707896e4b0c8682498188c97081e08..58749777a285fa0d982ccec36cbc3fd0e7977bbf 100644 (file)
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -24,20 +24,20 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class AppLaunchContext : GLib.AppLaunchContext {
                [CCode (has_construct_function = false)]
-               public AppLaunchContext ();
+               protected AppLaunchContext ();
                public void set_desktop (int desktop);
-               public void set_display (Gdk.Display display);
                public void set_icon (GLib.Icon icon);
                public void set_icon_name (string icon_name);
                public void set_screen (Gdk.Screen screen);
                public void set_timestamp (uint32 timestamp);
+               [NoAccessorMethod]
+               public Gdk.Display display { owned get; construct; }
        }
        [CCode (ref_function = "g_object_ref", unref_function = "g_object_unref", cheader_filename = "gdk/gdk.h")]
        public class Bitmap {
        }
-       [Compact]
-       [CCode (ref_function = "gdk_cursor_ref", unref_function = "gdk_cursor_unref", type_id = "GDK_TYPE_CURSOR", cheader_filename = "gdk/gdk.h")]
-       public class Cursor {
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public class Cursor : GLib.Object {
                [CCode (has_construct_function = false)]
                public Cursor (Gdk.CursorType cursor_type);
                [CCode (has_construct_function = false)]
@@ -49,6 +49,8 @@ namespace Gdk {
                public Gdk.CursorType get_cursor_type ();
                public unowned Gdk.Display get_display ();
                public unowned Gdk.Pixbuf get_image ();
+               public Gdk.CursorType cursor_type { get; construct; }
+               public Gdk.Display display { get; construct; }
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Device : GLib.Object {
@@ -65,18 +67,22 @@ namespace Gdk {
                public bool get_history (Gdk.Window window, uint32 start, uint32 stop, Gdk.TimeCoord[] events);
                public bool get_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
                public Gdk.InputMode get_mode ();
-               public uint get_n_axes ();
+               public int get_n_axes ();
+               public int get_n_keys ();
                public unowned string get_name ();
+               public void get_position (out unowned Gdk.Screen screen, int x, int y);
                public Gdk.InputSource get_source ();
                public void get_state (Gdk.Window window, double axes, Gdk.ModifierType mask);
+               public unowned Gdk.Window get_window_at_position (int win_x, int win_y);
                public Gdk.GrabStatus grab (Gdk.Window window, Gdk.GrabOwnership grab_ownership, bool owner_events, Gdk.EventMask event_mask, Gdk.Cursor cursor, uint32 time_);
                public static bool grab_info_libgtk_only (Gdk.Display display, Gdk.Device device, out unowned Gdk.Window grab_window, bool owner_events);
                public unowned GLib.List list_axes ();
+               public unowned GLib.List list_slave_devices ();
                public void set_axis_use (uint index_, Gdk.AxisUse use);
                public void set_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
                public bool set_mode (Gdk.InputMode mode);
-               public void set_source (Gdk.InputSource source);
                public void ungrab (uint32 time_);
+               public void warp (Gdk.Screen screen, int x, int y);
                public Gdk.Device associated_device { get; }
                [NoAccessorMethod]
                public Gdk.DeviceManager device_manager { owned get; construct; }
@@ -90,18 +96,19 @@ namespace Gdk {
                public string name { get; construct; }
                [NoAccessorMethod]
                public Gdk.DeviceType type { get; construct; }
+               public virtual signal void changed ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class DeviceManager : GLib.Object {
                [CCode (has_construct_function = false)]
                protected DeviceManager ();
-               public virtual unowned Gdk.Device get_client_pointer ();
+               public unowned Gdk.Device get_client_pointer ();
                public unowned Gdk.Display get_display ();
-               public virtual unowned GLib.List list_devices (Gdk.DeviceType type);
+               public unowned GLib.List list_devices (Gdk.DeviceType type);
                public Gdk.Display display { get; construct; }
-               public virtual signal void device_added (Gdk.Device device);
-               public virtual signal void device_changed (Gdk.Device device);
-               public virtual signal void device_removed (Gdk.Device device);
+               public virtual signal void device_added (Gdk.Device p0);
+               public virtual signal void device_changed (Gdk.Device p0);
+               public virtual signal void device_removed (Gdk.Device p0);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Display : GLib.Object {
@@ -112,35 +119,27 @@ namespace Gdk {
                public void close ();
                public bool device_is_grabbed (Gdk.Device device);
                public void flush ();
+               public unowned Gdk.AppLaunchContext get_app_launch_context ();
                public static unowned Gdk.Display get_default ();
                public uint get_default_cursor_size ();
                public unowned Gdk.Window get_default_group ();
-               public virtual unowned Gdk.Screen get_default_screen ();
+               public unowned Gdk.Screen get_default_screen ();
                public unowned Gdk.DeviceManager get_device_manager ();
-               public void get_device_state (Gdk.Device device, out unowned Gdk.Screen screen, int x, int y, Gdk.ModifierType mask);
-               [NoWrapper]
-               public virtual unowned string get_display_name ();
                public Gdk.Event get_event ();
                public void get_maximal_cursor_size (out uint width, out uint height);
-               public virtual int get_n_screens ();
+               public int get_n_screens ();
                public unowned string get_name ();
-               public void get_pointer (out unowned Gdk.Screen screen, out int x, out int y, out Gdk.ModifierType mask);
-               public virtual unowned Gdk.Screen get_screen (int screen_num);
-               public unowned Gdk.Window get_window_at_device_position (Gdk.Device device, int win_x, int win_y);
-               public unowned Gdk.Window get_window_at_pointer (int win_x, int win_y);
+               public unowned Gdk.Screen get_screen (int screen_num);
+               public bool has_pending ();
                public bool is_closed ();
-               public void keyboard_ungrab (uint32 time_);
+               public void notify_startup_complete (string startup_id);
                public static unowned Gdk.Display open (string display_name);
                public static unowned Gdk.Display open_default_libgtk_only ();
                public Gdk.Event peek_event ();
-               public bool pointer_is_grabbed ();
-               public void pointer_ungrab (uint32 time_);
                public void put_event (Gdk.Event event);
                public bool request_selection_notification (Gdk.Atom selection);
-               public unowned Gdk.DisplayDeviceHooks set_device_hooks (Gdk.DisplayDeviceHooks new_hooks);
                public void set_double_click_distance (uint distance);
                public void set_double_click_time (uint msec);
-               public unowned Gdk.DisplayPointerHooks set_pointer_hooks (Gdk.DisplayPointerHooks new_hooks);
                public void store_clipboard (Gdk.Window clipboard_window, uint32 time_, Gdk.Atom[] targets);
                public bool supports_clipboard_persistence ();
                public bool supports_composite ();
@@ -150,18 +149,9 @@ namespace Gdk {
                public bool supports_selection_notification ();
                public bool supports_shapes ();
                public void sync ();
-               public void warp_device (Gdk.Device device, Gdk.Screen screen, int x, int y);
-               public void warp_pointer (Gdk.Screen screen, int x, int y);
-               public virtual signal void closed (bool is_error);
+               public virtual signal void closed (bool p0);
                public virtual signal void opened ();
        }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class DisplayDeviceHooks {
-               public weak GLib.Callback get_device_state;
-               public weak GLib.Callback window_at_device_position;
-               public weak GLib.Callback window_get_device_position;
-       }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class DisplayManager : GLib.Object {
                [CCode (has_construct_function = false)]
@@ -169,42 +159,25 @@ namespace Gdk {
                public static unowned Gdk.DisplayManager @get ();
                public unowned Gdk.Display get_default_display ();
                public GLib.SList<weak Gdk.Display> list_displays ();
+               public unowned Gdk.Display open_display (string name);
                public void set_default_display (Gdk.Display display);
                public Gdk.Display default_display { get; set; }
-               public virtual signal void display_opened (Gdk.Display display);
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class DisplayPointerHooks {
-               public weak GLib.Callback get_pointer;
-               public weak GLib.Callback window_at_pointer;
-               public weak GLib.Callback window_get_pointer;
+               public virtual signal void display_opened (Gdk.Display p0);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class DragContext : GLib.Object {
                [CCode (has_construct_function = false)]
-               public DragContext ();
+               protected DragContext ();
                public Gdk.DragAction get_actions ();
+               public unowned Gdk.Window get_dest_window ();
                public unowned Gdk.Device get_device ();
+               public Gdk.DragProtocol get_protocol ();
                public Gdk.DragAction get_selected_action ();
                public unowned Gdk.Window get_source_window ();
                public Gdk.DragAction get_suggested_action ();
                public unowned GLib.List list_targets ();
                public void set_device (Gdk.Device device);
        }
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class Drawable : GLib.Object {
-               [CCode (has_construct_function = false)]
-               protected Drawable ();
-               [NoWrapper]
-               public virtual unowned Cairo.Surface create_cairo_surface (int width, int height);
-               public virtual unowned Cairo.Region get_clip_region ();
-               public virtual unowned Cairo.Region get_visible_region ();
-               [NoWrapper]
-               public virtual unowned Cairo.Surface ref_cairo_surface ();
-               [NoWrapper]
-               public virtual void set_cairo_clip (Cairo.Context cr);
-       }
        [Compact]
        [CCode (copy_function = "gdk_event_copy", type_id = "GDK_TYPE_EVENT", cheader_filename = "gdk/gdk.h")]
        public class Event {
@@ -219,7 +192,6 @@ namespace Gdk {
                public Gdk.EventGrabBroken grab_broken;
                public Gdk.EventKey key;
                public Gdk.EventMotion motion;
-               public Gdk.EventNoExpose no_expose;
                public Gdk.EventOwnerChange owner_change;
                public Gdk.EventProperty property;
                public Gdk.EventProximity proximity;
@@ -238,6 +210,7 @@ namespace Gdk {
                public unowned Gdk.Device get_device ();
                public bool get_root_coords (out double x_root, out double y_root);
                public unowned Gdk.Screen get_screen ();
+               public unowned Gdk.Device get_source_device ();
                public bool get_state (out Gdk.ModifierType state);
                public uint32 get_time ();
                public static void handler_set (owned Gdk.EventFunc func);
@@ -249,15 +222,7 @@ namespace Gdk {
                public void send_clientmessage_toall ();
                public void set_device (Gdk.Device device);
                public void set_screen (Gdk.Screen screen);
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class KeyboardGrabInfo {
-               public weak Gdk.Window native_window;
-               public bool owner_events;
-               public ulong serial;
-               public uint32 time;
-               public weak Gdk.Window window;
+               public void set_source_device (Gdk.Device device);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Keymap : GLib.Object {
@@ -279,36 +244,6 @@ namespace Gdk {
                public virtual signal void keys_changed ();
                public virtual signal void state_changed ();
        }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class MultipleClickInfo {
-               [CCode (array_length = false)]
-               public weak uint32[] button_click_time;
-               [CCode (array_length = false)]
-               public weak int[] button_number;
-               [CCode (array_length = false)]
-               public weak Gdk.Window[] button_window;
-               [CCode (array_length = false)]
-               public weak int[] button_x;
-               [CCode (array_length = false)]
-               public weak int[] button_y;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class PointerHooks {
-               public weak GLib.Callback get_pointer;
-               public weak GLib.Callback window_at_pointer;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class PointerWindowInfo {
-               public uint32 button;
-               public uint32 state;
-               public weak Gdk.Window toplevel_under_pointer;
-               public double toplevel_x;
-               public double toplevel_y;
-               public weak Gdk.Window window_under_pointer;
-       }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Screen : GLib.Object {
                [CCode (has_construct_function = false)]
@@ -375,7 +310,7 @@ namespace Gdk {
                public Gdk.VisualType get_visual_type ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public class Window : Gdk.Drawable {
+       public class Window : GLib.Object {
                [CCode (has_construct_function = false)]
                public Window (Gdk.Window? parent, Gdk.WindowAttr attributes, int attributes_mask);
                public void add_filter (Gdk.FilterFunc function);
@@ -397,8 +332,6 @@ namespace Gdk {
                public bool ensure_native ();
                public void flush ();
                public void focus (uint32 timestamp);
-               public static unowned Gdk.Window foreign_new (Gdk.NativeWindow anid);
-               public static unowned Gdk.Window foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
                public void freeze_toplevel_updates_libgtk_only ();
                public void freeze_updates ();
                public void fullscreen ();
@@ -406,6 +339,7 @@ namespace Gdk {
                public bool get_accept_focus ();
                public unowned Cairo.Pattern get_background_pattern ();
                public GLib.List<weak Gdk.Window> get_children ();
+               public unowned Cairo.Region get_clip_region ();
                public bool get_composited ();
                public unowned Gdk.Cursor? get_cursor ();
                public bool get_decorations (out Gdk.WMDecoration decorations);
@@ -418,7 +352,7 @@ namespace Gdk {
                public Gdk.EventMask get_events ();
                public bool get_focus_on_map ();
                public void get_frame_extents (out Gdk.Rectangle rect);
-               public void get_geometry (out int x, out int y, out int width, out int height, out int depth);
+               public void get_geometry (out int x, out int y, out int width, out int height);
                public unowned Gdk.Window get_group ();
                public int get_height ();
                public bool get_modal_hint ();
@@ -429,12 +363,14 @@ namespace Gdk {
                public void get_root_coords (int x, int y, int root_x, int root_y);
                public void get_root_origin (out int x, out int y);
                public unowned Gdk.Screen get_screen ();
+               public Gdk.EventMask get_source_events (Gdk.InputSource source);
                public Gdk.WindowState get_state ();
                public bool get_support_multidevice ();
                public unowned Gdk.Window get_toplevel ();
                public Gdk.WindowTypeHint get_type_hint ();
                public unowned Cairo.Region get_update_area ();
                public void get_user_data (void* data);
+               public unowned Cairo.Region get_visible_region ();
                public unowned Gdk.Visual get_visual ();
                public int get_width ();
                public Gdk.WindowType get_window_type ();
@@ -450,8 +386,6 @@ namespace Gdk {
                public bool is_shaped ();
                public bool is_viewable ();
                public bool is_visible ();
-               public static unowned Gdk.Window lookup (Gdk.NativeWindow anid);
-               public static unowned Gdk.Window lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
                public void lower ();
                public void maximize ();
                public void merge_child_input_shapes ();
@@ -496,6 +430,7 @@ namespace Gdk {
                public void set_role (string role);
                public void set_skip_pager_hint (bool skips_pager);
                public void set_skip_taskbar_hint (bool skips_taskbar);
+               public void set_source_events (Gdk.InputSource source, Gdk.EventMask event_mask);
                public void set_startup_id (string startup_id);
                public bool set_static_gravities (bool use_static);
                public void set_support_multidevice (bool support_multidevice);
@@ -515,10 +450,10 @@ namespace Gdk {
                public void unstick ();
                public void withdraw ();
                public Gdk.Cursor cursor { get; set; }
-               public virtual signal Cairo.Surface create_surface (int p0, int p1);
-               public virtual signal void from_embedder (double p0, double p1, void* p2, void* p3);
-               public virtual signal unowned Gdk.Window pick_embedded_child (double p0, double p1);
-               public virtual signal void to_embedder (double p0, double p1, void* p2, void* p3);
+               public virtual signal Cairo.Surface create_surface (int width, int height);
+               public virtual signal void from_embedder (double embedder_x, double embedder_y, void* offscreen_x, void* offscreen_y);
+               public virtual signal unowned Gdk.Window pick_embedded_child (double x, double y);
+               public virtual signal void to_embedder (double offscreen_x, double offscreen_y, void* embedder_x, void* embedder_y);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        [SimpleType]
@@ -540,17 +475,6 @@ namespace Gdk {
                public static bool parse (string spec, out Gdk.Color color);
                public string to_string ();
        }
-       [CCode (type_id = "GDK_TYPE_DEVICE_AXIS", cheader_filename = "gdk/gdk.h")]
-       public struct DeviceAxis {
-               public Gdk.AxisUse use;
-               public double min;
-               public double max;
-       }
-       [CCode (type_id = "GDK_TYPE_DEVICE_KEY", cheader_filename = "gdk/gdk.h")]
-       public struct DeviceKey {
-               public uint keyval;
-               public Gdk.ModifierType modifiers;
-       }
        [CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
        public struct EventAny {
                public Gdk.EventType type;
@@ -675,12 +599,6 @@ namespace Gdk {
                public double y_root;
        }
        [CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
-       public struct EventNoExpose {
-               public Gdk.EventType type;
-               public weak Gdk.Window window;
-               public char send_event;
-       }
-       [CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
        public struct EventOwnerChange {
                public Gdk.EventType type;
                public weak Gdk.Window window;
@@ -795,7 +713,7 @@ namespace Gdk {
                public static bool equal (void* p1, void* p2);
                public void free ();
                public static uint hash (void* p);
-               public static bool parse (string spec, Gdk.RGBA rgba);
+               public bool parse (string spec);
                public unowned string to_string ();
        }
        [CCode (type_id = "GDK_TYPE_RECTANGLE", cheader_filename = "gdk/gdk.h")]
@@ -817,7 +735,7 @@ namespace Gdk {
                public int y;
                public int width;
                public int height;
-               public Gdk.WindowClass wclass;
+               public Gdk.WindowWindowClass wclass;
                public weak Gdk.Visual visual;
                public Gdk.WindowType window_type;
                public weak Gdk.Cursor cursor;
@@ -1025,7 +943,6 @@ namespace Gdk {
                DROP_FINISHED,
                CLIENT_EVENT,
                VISIBILITY_NOTIFY,
-               NO_EXPOSE,
                SCROLL,
                WINDOW_STATE,
                SETTING,
@@ -1204,11 +1121,6 @@ namespace Gdk {
                NOREDIR,
                TYPE_HINT
        }
-       [CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-       public enum WindowClass {
-               INPUT_OUTPUT,
-               INPUT_ONLY
-       }
        [CCode (cprefix = "GDK_WINDOW_EDGE_", cheader_filename = "gdk/gdk.h")]
        public enum WindowEdge {
                NORTH_WEST,
@@ -1270,6 +1182,11 @@ namespace Gdk {
                COMBO,
                DND
        }
+       [CCode (cprefix = "GDK_INPUT_", cheader_filename = "gdk/gdk.h")]
+       public enum WindowWindowClass {
+               OUTPUT,
+               ONLY
+       }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public delegate void EventFunc (Gdk.Event event);
        [CCode (cheader_filename = "gdk/gdk.h")]
@@ -1297,7 +1214,7 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void beep ();
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static Cairo.Context cairo_create (Gdk.Drawable drawable);
+       public static Cairo.Context cairo_create (Gdk.Window window);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static bool cairo_get_clip_rectangle (Cairo.Context cr, Gdk.Rectangle rect);
        [CCode (cheader_filename = "gdk/gdk.h")]
@@ -1307,8 +1224,6 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static unowned Cairo.Region cairo_region_create_from_surface (Cairo.Surface surface);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static void cairo_reset_clip (Cairo.Context cr, Gdk.Drawable drawable);
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public static void cairo_set_source_color (Cairo.Context cr, Gdk.Color color);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void cairo_set_source_pixbuf (Cairo.Context cr, Gdk.Pixbuf pixbuf, double pixbuf_x, double pixbuf_y);
@@ -1317,20 +1232,20 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void cairo_set_source_window (Cairo.Context cr, Gdk.Window window, double x, double y);
        [CCode (cheader_filename = "gdk/gdk.h")]
+       public static void disable_multidevice ();
+       [CCode (cheader_filename = "gdk/gdk.h")]
        public static void drag_abort (Gdk.DragContext context, uint32 time_);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static unowned Gdk.DragContext drag_begin (Gdk.Window window, GLib.List targets);
        [CCode (cheader_filename = "gdk/gdk.h")]
+       public static unowned Gdk.DragContext drag_begin_for_device (Gdk.Window window, Gdk.Device device, GLib.List targets);
+       [CCode (cheader_filename = "gdk/gdk.h")]
        public static void drag_drop (Gdk.DragContext context, uint32 time_);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static bool drag_drop_succeeded (Gdk.DragContext context);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static void drag_find_window (Gdk.DragContext context, Gdk.Window drag_window, int x_root, int y_root, out unowned Gdk.Window dest_window, Gdk.DragProtocol protocol);
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public static void drag_find_window_for_screen (Gdk.DragContext context, Gdk.Window drag_window, Gdk.Screen screen, int x_root, int y_root, out unowned Gdk.Window dest_window, Gdk.DragProtocol protocol);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static Gdk.NativeWindow drag_get_protocol (Gdk.NativeWindow xid, Gdk.DragProtocol protocol);
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public static Gdk.NativeWindow drag_get_protocol_for_display (Gdk.Display display, Gdk.NativeWindow xid, Gdk.DragProtocol protocol);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static Gdk.Atom drag_get_selection (Gdk.DragContext context);
@@ -1341,9 +1256,7 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void drop_finish (Gdk.DragContext context, bool success, uint32 time_);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static void drop_reply (Gdk.DragContext context, bool ok, uint32 time_);
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static void enable_multidevice ();
+       public static void drop_reply (Gdk.DragContext context, bool accepted, uint32 time_);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static int error_trap_pop ();
        [CCode (cheader_filename = "gdk/gdk.h")]
@@ -1361,10 +1274,6 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void flush ();
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static void free_compound_text (uchar[] ctext);
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static void free_text_list (string list);
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public static unowned Gdk.Window get_default_root_window ();
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static unowned string get_display ();
@@ -1379,10 +1288,6 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static bool init_check ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static Gdk.GrabStatus keyboard_grab (Gdk.Window window, bool owner_events, uint32 time_);
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static void keyboard_ungrab (uint32 time_);
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public static void keyval_convert_case (uint symbol, uint lower, uint upper);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static uint keyval_from_name (string keyval_name);
@@ -1425,12 +1330,6 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static unowned Gdk.Pixbuf pixbuf_get_from_window (Gdk.Window window, int src_x, int src_y, int width, int height);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static Gdk.GrabStatus pointer_grab (Gdk.Window window, bool owner_events, Gdk.EventMask event_mask, Gdk.Window? confine_to, Gdk.Cursor? cursor, uint32 time_);
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static bool pointer_is_grabbed ();
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static void pointer_ungrab (uint32 time_);
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public static void pre_parse_libgtk_only ();
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void property_change (Gdk.Window window, Gdk.Atom property, Gdk.Atom type, int format, Gdk.PropMode mode, [CCode (array_length = false)] uchar[] data, int nelements);
@@ -1469,40 +1368,18 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void set_double_click_time (uint msec);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static unowned string set_locale ();
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static unowned Gdk.PointerHooks set_pointer_hooks (Gdk.PointerHooks new_hooks);
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public static void set_program_class (string program_class);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void set_show_events (bool show_events);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static void set_sm_client_id (string sm_client_id);
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public static bool setting_get (string name, GLib.Value value);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static bool spawn_command_line_on_screen (Gdk.Screen screen, string command_line) throws GLib.Error;
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static bool spawn_on_screen (Gdk.Screen screen, string? working_directory, [CCode (array_length = false)] string[] argv, [CCode (array_length = false)] string[]? envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc? child_setup, out GLib.Pid child_pid) throws GLib.Error;
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static bool spawn_on_screen_with_pipes (Gdk.Screen screen, string? working_directory, [CCode (array_length = false)] string[] argv, [CCode (array_length = false)] string[] envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc? child_setup, out GLib.Pid child_pid, out int standard_input, out int standard_output, out int standard_error) throws GLib.Error;
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static int string_to_compound_text (string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static int string_to_compound_text_for_display (Gdk.Display display, string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public static void test_render_sync (Gdk.Window window);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static bool test_simulate_button (Gdk.Window window, int x, int y, uint button, Gdk.ModifierType modifiers, Gdk.EventType button_pressrelease);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static bool test_simulate_key (Gdk.Window window, int x, int y, uint keyval, Gdk.ModifierType modifiers, Gdk.EventType key_pressrelease);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static int text_property_to_text_list (Gdk.Atom encoding, int format, uchar[] text, int length, string list);
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static int text_property_to_text_list_for_display (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static int text_property_to_utf8_list (Gdk.Atom encoding, int format, uchar[] text, int length, string list);
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public static int text_property_to_utf8_list_for_display (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static uint threads_add_idle (GLib.SourceFunc function);
@@ -1527,9 +1404,5 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static uint unicode_to_keyval (uint32 wc);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static bool utf8_to_compound_text (string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public static bool utf8_to_compound_text_for_display (Gdk.Display display, string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public static unowned string utf8_to_string_target (string str);
 }

diff --git a/vapi/gdk-x11-3.0.vapi b/vapi/gdk-x11-3.0.vapi
index 1c3d3a15804574d0e0df65534bb5ab856cb52351..697581d3388a3f7281f12331c4816f498b1cba06 100644 (file)
--- a/vapi/gdk-x11-3.0.vapi
+++ b/vapi/gdk-x11-3.0.vapi
@@ -2,40 +2,124 @@
 
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
 namespace Gdk {
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11AppLaunchContext : Gdk.AppLaunchContext {
+               [CCode (has_construct_function = false)]
+               protected X11AppLaunchContext ();
+       }
+       [Compact]
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11AppLaunchContextClass {
+       }
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11Cursor : Gdk.Cursor {
+               [CCode (has_construct_function = false)]
+               protected X11Cursor ();
+               public static unowned Gdk.Cursor get_xcursor (Gdk.Cursor cursor);
+               public static unowned X.Display get_xdisplay (Gdk.Cursor cursor);
+       }
+       [Compact]
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11CursorClass {
+       }
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11Display : Gdk.Display {
+               [CCode (has_construct_function = false)]
+               protected X11Display ();
+               public static void broadcast_startup_message (Gdk.Display display, string message_type);
+               public static int error_trap_pop (Gdk.Display display);
+               public static void error_trap_pop_ignored (Gdk.Display display);
+               public static void error_trap_push (Gdk.Display display);
+               public static unowned string get_startup_notification_id (Gdk.Display display);
+               public static uint32 get_user_time (Gdk.Display display);
+               public static unowned X.Display get_xdisplay (Gdk.Display display);
+               public static void grab (Gdk.Display display);
+               public static void set_cursor_theme (Gdk.Display display, string theme, int size);
+               public static void set_startup_notification_id (Gdk.Display display, string startup_id);
+               public static int string_to_compound_text (Gdk.Display display, string str, out Gdk.Atom encoding, int format, uchar[] ctext, int length);
+               public static int text_property_to_text_list (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
+               public static void ungrab (Gdk.Display display);
+               public static bool utf8_to_compound_text (Gdk.Display display, string str, out Gdk.Atom encoding, int format, uchar[] ctext, int length);
+       }
+       [Compact]
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11DisplayClass {
+       }
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11DisplayManager : Gdk.DisplayManager {
+               [CCode (has_construct_function = false)]
+               protected X11DisplayManager ();
+       }
+       [Compact]
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11DisplayManagerClass {
+       }
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11DragContext : Gdk.DragContext {
+               [CCode (has_construct_function = false)]
+               protected X11DragContext ();
+       }
+       [Compact]
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11DragContextClass {
+       }
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11Keymap : Gdk.Keymap {
+               [CCode (has_construct_function = false)]
+               protected X11Keymap ();
+       }
+       [Compact]
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11KeymapClass {
+       }
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11Screen : Gdk.Screen {
+               [CCode (has_construct_function = false)]
+               protected X11Screen ();
+               public static X.ID get_monitor_output (Gdk.Screen screen, int monitor_num);
+               public static int get_screen_number (Gdk.Screen screen);
+               public static unowned string get_window_manager_name (Gdk.Screen screen);
+               public static unowned X.Screen get_xscreen (Gdk.Screen screen);
+               public static unowned Gdk.Visual lookup_visual (Gdk.Screen screen, uint32 xvisualid);
+               public static bool supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
+               public virtual signal void window_manager_changed ();
+       }
+       [Compact]
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11ScreenClass {
+       }
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11Visual : Gdk.Visual {
+               [CCode (has_construct_function = false)]
+               protected X11Visual ();
+               public static unowned Gdk.Visual get_xvisual (Gdk.Visual visual);
+       }
+       [Compact]
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11VisualClass {
+       }
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11Window : Gdk.Window {
+               [CCode (has_construct_function = false)]
+               protected X11Window ();
+               public static unowned Gdk.Window foreign_new_for_display (Gdk.Display display, X.Window window);
+               public static X.Window get_xid (Gdk.Window window);
+               public static unowned Gdk.Window lookup_for_display (Gdk.Display display, X.Window window);
+               public static void move_to_current_desktop (Gdk.Window window);
+               public static void set_user_time (Gdk.Window window, uint32 timestamp);
+       }
+       [Compact]
+       [CCode (cheader_filename = "gdk/gdkx.h")]
+       public class X11WindowClass {
+       }
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static X.Atom x11_atom_to_xatom (Gdk.Atom atom);
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static X.Atom x11_atom_to_xatom_for_display (Gdk.Display display, Gdk.Atom atom);
        [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned Gdk.Cursor x11_cursor_get_xcursor (Gdk.Cursor cursor);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned X.Display x11_cursor_get_xdisplay (Gdk.Cursor cursor);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static void x11_display_broadcast_startup_message (Gdk.Display display, string message_type);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static int x11_display_error_trap_pop (Gdk.Display display);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static void x11_display_error_trap_pop_ignored (Gdk.Display display);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static void x11_display_error_trap_push (Gdk.Display display);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned string x11_display_get_startup_notification_id (Gdk.Display display);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static uint32 x11_display_get_user_time (Gdk.Display display);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned X.Display x11_display_get_xdisplay (Gdk.Display display);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static void x11_display_grab (Gdk.Display display);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static void x11_display_set_cursor_theme (Gdk.Display display, string theme, int size);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static void x11_display_set_startup_notification_id (Gdk.Display display, string startup_id);
+       public static void x11_free_compound_text (uchar[] ctext);
        [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static void x11_display_ungrab (Gdk.Display display);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned X.Display x11_drawable_get_xdisplay (Gdk.Drawable drawable);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static X.ID x11_drawable_get_xid (Gdk.Drawable drawable);
+       public static void x11_free_text_list (string list);
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static X.Window x11_get_default_root_xwindow ();
        [CCode (cheader_filename = "gdk/gdkx.h")]
@@ -56,40 +140,14 @@ namespace Gdk {
        public static void x11_grab_server ();
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static unowned Gdk.Display x11_lookup_xdisplay (X.Display xdisplay);
-       [CCode (cname = "gdk_net_wm_supports", cheader_filename = "gdk/gdkx.h")]
-       public static bool x11_net_wm_supports (Gdk.Atom property);
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static void x11_register_standard_event_type (Gdk.Display display, int event_base, int n_events);
        [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static X.ID x11_screen_get_monitor_output (Gdk.Screen screen, int monitor_num);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static int x11_screen_get_screen_number (Gdk.Screen screen);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned string x11_screen_get_window_manager_name (Gdk.Screen screen);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned X.Screen x11_screen_get_xscreen (Gdk.Screen screen);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned Gdk.Visual x11_screen_lookup_visual (Gdk.Screen screen, uint32 xvisualid);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static bool x11_screen_supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
+       public static void x11_set_sm_client_id (string sm_client_id);
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static void x11_ungrab_server ();
-       [CCode (cname = "gdkx_visual_get", cheader_filename = "gdk/gdkx.h")]
-       public static unowned Gdk.Visual x11_visual_get (uint32 xvisualid);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned Gdk.Visual x11_visual_get_xvisual (Gdk.Visual visual);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned Gdk.Drawable x11_window_get_drawable_impl (Gdk.Window window);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static void x11_window_move_to_current_desktop (Gdk.Window window);
-       [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static void x11_window_set_user_time (Gdk.Window window, uint32 timestamp);
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static Gdk.Atom x11_xatom_to_atom (X.Atom xatom);
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static Gdk.Atom x11_xatom_to_atom_for_display (Gdk.Display display, X.Atom xatom);
-       [CCode (cname = "gdk_xid_table_lookup", cheader_filename = "gdk/gdkx.h")]
-       public static void* x11_xid_table_lookup (X.ID xid);
-       [CCode (cname = "gdk_xid_table_lookup_for_display", cheader_filename = "gdk/gdkx.h")]
-       public static void* x11_xid_table_lookup_for_display (Gdk.Display display, X.ID xid);
 }

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index a3ec805f822d6a6c66e803f4a017cf76b7e6b432..9fead42d7cea214038e400d40f4a036ec91444b5 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -503,6 +503,54 @@ namespace Gtk {
                public float yscale { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public class AppChooserButton : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable, Gtk.AppChooser {
+               [CCode (type = "GtkWidget*", has_construct_function = false)]
+               public AppChooserButton (string content_type);
+               public void append_custom_item (string name, string label, GLib.Icon icon);
+               public void append_separator ();
+               public bool get_show_dialog_item ();
+               public void set_active_custom_item (string name);
+               public void set_show_dialog_item (bool setting);
+               public bool show_dialog_item { get; set construct; }
+               public virtual signal void custom_item_activated (string item_name);
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public class AppChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.AppChooser {
+               [CCode (type = "GtkWidget*", has_construct_function = false)]
+               public AppChooserDialog (Gtk.Window parent, Gtk.DialogFlags flags, GLib.File file);
+               [CCode (type = "GtkWidget*", has_construct_function = false)]
+               public AppChooserDialog.for_content_type (Gtk.Window parent, Gtk.DialogFlags flags, string content_type);
+               public unowned Gtk.Widget get_widget ();
+               [NoAccessorMethod]
+               public GLib.File gfile { owned get; construct; }
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public class AppChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.AppChooser {
+               [CCode (type = "GtkWidget*", has_construct_function = false)]
+               public AppChooserWidget (string content_type);
+               public unowned string get_default_text ();
+               public bool get_show_all ();
+               public bool get_show_default ();
+               public bool get_show_fallback ();
+               public bool get_show_other ();
+               public bool get_show_recommended ();
+               public void set_default_text (string text);
+               public void set_show_all (bool setting);
+               public void set_show_default (bool setting);
+               public void set_show_fallback (bool setting);
+               public void set_show_other (bool setting);
+               public void set_show_recommended (bool setting);
+               public string default_text { get; set; }
+               public bool show_all { get; set construct; }
+               public bool show_default { get; set construct; }
+               public bool show_fallback { get; set construct; }
+               public bool show_other { get; set construct; }
+               public bool show_recommended { get; set construct; }
+               public virtual signal void application_activated (GLib.AppInfo app_info);
+               public virtual signal void application_selected (GLib.AppInfo app_info);
+               public virtual signal void populate_popup (Gtk.Menu menu, GLib.AppInfo app_info);
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public class Application : GLib.Application, GLib.ActionGroup {
                [CCode (has_construct_function = false)]
                public Application (string application_id, GLib.ApplicationFlags flags);
@@ -510,12 +558,6 @@ namespace Gtk {
                public unowned GLib.List<weak Gtk.Window> get_windows ();
                public void remove_window (Gtk.Window window);
        }
-       [Compact]
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Arg {
-               public weak string name;
-               public GLib.Type type;
-       }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -777,10 +819,110 @@ namespace Gtk {
                public virtual signal void prev_year ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public class CellArea : GLib.InitiallyUnowned, Gtk.CellLayout, Gtk.Buildable {
+               [CCode (has_construct_function = false)]
+               protected CellArea ();
+               public virtual bool activate (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Rectangle cell_area, Gtk.CellRendererState flags, bool edit_only);
+               public bool activate_cell (Gtk.Widget widget, Gtk.CellRenderer renderer, Gdk.Event event, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
+               public virtual void add (Gtk.CellRenderer renderer);
+               public void add_focus_sibling (Gtk.CellRenderer renderer, Gtk.CellRenderer sibling);
+               public void add_with_properties (Gtk.CellRenderer renderer, ...);
+               public void attribute_connect (Gtk.CellRenderer renderer, string attribute, int column);
+               public void attribute_disconnect (Gtk.CellRenderer renderer, string attribute);
+               public void cell_get (Gtk.CellRenderer renderer, ...);
+               public void cell_get_property (Gtk.CellRenderer renderer, string property_name, GLib.Value value);
+               public void cell_get_valist (Gtk.CellRenderer renderer, string first_property_name, void* var_args);
+               public void cell_set (Gtk.CellRenderer renderer, ...);
+               public void cell_set_property (Gtk.CellRenderer renderer, string property_name, GLib.Value value);
+               public void cell_set_valist (Gtk.CellRenderer renderer, string first_property_name, void* var_args);
+               public virtual unowned Gtk.CellAreaContext copy_context (Gtk.CellAreaContext context);
+               public virtual unowned Gtk.CellAreaContext create_context ();
+               public virtual int event (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Event event, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
+               [CCode (cname = "gtk_cell_area_class_find_cell_property")]
+               public class unowned GLib.ParamSpec find_cell_property (string property_name);
+               public virtual bool focus (Gtk.DirectionType direction);
+               public virtual void @foreach (Gtk.CellCallback callback, void* callback_data);
+               public virtual void foreach_alloc (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Rectangle cell_area, Gdk.Rectangle background_area, Gtk.CellAllocCallback callback, void* callback_data);
+               public void get_cell_allocation (Gtk.CellAreaContext context, Gtk.Widget widget, Gtk.CellRenderer renderer, Gdk.Rectangle cell_area, Gdk.Rectangle allocation);
+               public unowned Gtk.CellRenderer get_cell_at_position (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Rectangle cell_area, int x, int y, Gdk.Rectangle alloc_area);
+               [NoWrapper]
+               public virtual void get_cell_property (Gtk.CellRenderer renderer, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
+               public unowned string get_current_path_string ();
+               public unowned Gtk.CellEditable get_edit_widget ();
+               public unowned Gtk.CellRenderer get_edited_cell ();
+               public unowned Gtk.CellRenderer get_focus_cell ();
+               public unowned Gtk.CellRenderer get_focus_from_sibling (Gtk.CellRenderer renderer);
+               public unowned GLib.List get_focus_siblings (Gtk.CellRenderer renderer);
+               public virtual void get_preferred_height (Gtk.CellAreaContext context, Gtk.Widget widget, int minimum_height, int natural_height);
+               public virtual void get_preferred_height_for_width (Gtk.CellAreaContext context, Gtk.Widget widget, int width, int minimum_height, int natural_height);
+               public virtual void get_preferred_width (Gtk.CellAreaContext context, Gtk.Widget widget, int minimum_width, int natural_width);
+               public virtual void get_preferred_width_for_height (Gtk.CellAreaContext context, Gtk.Widget widget, int height, int minimum_width, int natural_width);
+               public virtual Gtk.SizeRequestMode get_request_mode ();
+               public unowned string get_style_detail ();
+               public bool has_renderer (Gtk.CellRenderer renderer);
+               public void inner_cell_area (Gtk.Widget widget, Gdk.Rectangle cell_area, Gdk.Rectangle inner_area);
+               [CCode (cname = "gtk_cell_area_class_install_cell_property")]
+               public class void install_cell_property (uint property_id, GLib.ParamSpec pspec);
+               public virtual bool is_activatable ();
+               public bool is_focus_sibling (Gtk.CellRenderer renderer, Gtk.CellRenderer sibling);
+               [CCode (cname = "gtk_cell_area_class_list_cell_properties")]
+               public class unowned GLib.ParamSpec list_cell_properties (uint n_properties);
+               public virtual void remove (Gtk.CellRenderer renderer);
+               public void remove_focus_sibling (Gtk.CellRenderer renderer, Gtk.CellRenderer sibling);
+               public virtual void render (Gtk.CellAreaContext context, Gtk.Widget widget, Cairo.Context cr, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags, bool paint_focus);
+               public void request_renderer (Gtk.CellRenderer renderer, Gtk.Orientation orientation, Gtk.Widget widget, int for_size, int minimum_size, int natural_size);
+               [NoWrapper]
+               public virtual void set_cell_property (Gtk.CellRenderer renderer, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
+               public void set_focus_cell (Gtk.CellRenderer renderer);
+               public void set_style_detail (string detail);
+               public void stop_editing (bool canceled);
+               public Gtk.CellEditable edit_widget { get; }
+               public Gtk.CellRenderer edited_cell { get; }
+               public Gtk.CellRenderer focus_cell { get; set; }
+               public virtual signal void add_editable (Gtk.CellRenderer p0, Gtk.CellEditable p1, Gdk.Rectangle p2, string p3);
+               [HasEmitter]
+               public virtual signal void apply_attributes (Gtk.TreeModel tree_model, Gtk.TreeIter iter, bool is_expander, bool is_expanded);
+               public virtual signal void focus_changed (Gtk.CellRenderer p0, string p1);
+               public virtual signal void remove_editable (Gtk.CellRenderer p0, Gtk.CellEditable p1);
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public class CellAreaBox : Gtk.CellArea, Gtk.CellLayout, Gtk.Buildable, Gtk.Orientable {
+               [CCode (type = "GtkCellArea*", has_construct_function = false)]
+               public CellAreaBox ();
+               public int get_spacing ();
+               public void set_spacing (int spacing);
+               public int spacing { get; set; }
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public class CellAreaContext : GLib.Object {
+               [CCode (has_construct_function = false)]
+               protected CellAreaContext ();
+               public virtual void allocate (int width, int height);
+               public void get_allocation (int width, int height);
+               public unowned Gtk.CellArea get_area ();
+               public void get_preferred_height (int minimum_height, int natural_height);
+               public virtual void get_preferred_height_for_width (int width, int minimum_height, int natural_height);
+               public void get_preferred_width (int minimum_width, int natural_width);
+               public virtual void get_preferred_width_for_height (int height, int minimum_width, int natural_width);
+               public void push_preferred_height (int minimum_height, int natural_height);
+               public void push_preferred_width (int minimum_width, int natural_width);
+               public virtual void reset ();
+               public Gtk.CellArea area { get; construct; }
+               [NoAccessorMethod]
+               public int minimum_height { get; }
+               [NoAccessorMethod]
+               public int minimum_width { get; }
+               [NoAccessorMethod]
+               public int natural_height { get; }
+               [NoAccessorMethod]
+               public int natural_width { get; }
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public abstract class CellRenderer : GLib.InitiallyUnowned {
                [CCode (has_construct_function = false)]
                protected CellRenderer ();
                public virtual bool activate (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
+               public virtual void get_aligned_area (Gtk.Widget widget, Gtk.CellRendererState flags, Gdk.Rectangle cell_area, Gdk.Rectangle aligned_area);
                public void get_alignment (float xalign, float yalign);
                public void get_fixed_size (out int width, out int height);
                public void get_padding (int xpad, int ypad);
@@ -794,6 +936,7 @@ namespace Gtk {
                [NoWrapper]
                public abstract void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height);
                public bool get_visible ();
+               public bool is_activatable ();
                public abstract void render (Cairo.Context cr, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
                public void set_alignment (float xalign, float yalign);
                public void set_fixed_size (int width, int height);
@@ -1046,18 +1189,22 @@ namespace Gtk {
                public virtual signal void toggled (string path);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
+       public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.Orientable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public CellView ();
-               public void get_desired_height_for_width_of_row (Gtk.TreePath path, int avail_size, int minimum_size, int natural_size);
-               public void get_desired_width_of_row (Gtk.TreePath path, int minimum_size, int natural_size);
                public unowned Gtk.TreePath get_displayed_row ();
+               public bool get_draw_sensitive ();
+               public bool get_fit_model ();
                public unowned Gtk.TreeModel get_model ();
                public void set_background_color (Gdk.Color color);
                public void set_background_rgba (Gdk.RGBA rgba);
                public void set_displayed_row (Gtk.TreePath path);
+               public void set_draw_sensitive (bool draw_sensitive);
+               public void set_fit_model (bool fit_model);
                public void set_model (Gtk.TreeModel? model);
                [CCode (type = "GtkWidget*", has_construct_function = false)]
+               public CellView.with_context (Gtk.CellArea area, Gtk.CellAreaContext context);
+               [CCode (type = "GtkWidget*", has_construct_function = false)]
                public CellView.with_markup (string markup);
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public CellView.with_pixbuf (Gdk.Pixbuf pixbuf);
@@ -1071,6 +1218,12 @@ namespace Gtk {
                public Gdk.RGBA background_rgba { get; set; }
                [NoAccessorMethod]
                public bool background_set { get; set; }
+               [NoAccessorMethod]
+               public Gtk.CellArea cell_area { owned get; construct; }
+               [NoAccessorMethod]
+               public Gtk.CellAreaContext cell_area_context { owned get; construct; }
+               public bool draw_sensitive { get; set; }
+               public bool fit_model { get; set; }
                public Gtk.TreeModel model { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -1214,6 +1367,7 @@ namespace Gtk {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public ComboBox ();
                public int get_active ();
+               public unowned string get_active_id ();
                public bool get_active_iter (out Gtk.TreeIter iter);
                public bool get_add_tearoffs ();
                public Gtk.SensitivityType get_button_sensitivity ();
@@ -1221,6 +1375,7 @@ namespace Gtk {
                public int get_entry_text_column ();
                public bool get_focus_on_click ();
                public bool get_has_entry ();
+               public int get_id_column ();
                public unowned Gtk.TreeModel get_model ();
                public unowned Atk.Object get_popup_accessible ();
                public bool get_popup_fixed_width ();
@@ -1230,12 +1385,14 @@ namespace Gtk {
                public int get_wrap_width ();
                public void popup_for_device (Gdk.Device device);
                public void set_active (int index_);
+               public void set_active_id (string active_id);
                public void set_active_iter (Gtk.TreeIter iter);
                public void set_add_tearoffs (bool add_tearoffs);
                public void set_button_sensitivity (Gtk.SensitivityType sensitivity);
                public void set_column_span_column (int column_span);
                public void set_entry_text_column (int text_column);
                public void set_focus_on_click (bool focus_on_click);
+               public void set_id_column (int id_column);
                public void set_model (Gtk.TreeModel? model);
                public void set_popup_fixed_width (bool fixed);
                public void set_row_separator_func (owned Gtk.TreeViewRowSeparatorFunc func);
@@ -1243,20 +1400,28 @@ namespace Gtk {
                public void set_title (string title);
                public void set_wrap_width (int width);
                [CCode (type = "GtkWidget*", has_construct_function = false)]
+               public ComboBox.with_area (Gtk.CellArea area);
+               [CCode (type = "GtkWidget*", has_construct_function = false)]
+               public ComboBox.with_area_and_entry (Gtk.CellArea area);
+               [CCode (type = "GtkWidget*", has_construct_function = false)]
                public ComboBox.with_entry ();
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public ComboBox.with_model (Gtk.TreeModel model);
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public ComboBox.with_model_and_entry (Gtk.TreeModel model);
                public int active { get; set; }
+               public string active_id { get; set; }
                public bool add_tearoffs { get; set; }
                public Gtk.SensitivityType button_sensitivity { get; set; }
+               [NoAccessorMethod]
+               public Gtk.CellArea cell_area { owned get; construct; }
                public int column_span_column { get; set; }
                public int entry_text_column { get; set; }
                public bool focus_on_click { get; set; }
                public bool has_entry { get; construct; }
                [NoAccessorMethod]
                public bool has_frame { get; set; }
+               public int id_column { get; set; }
                public Gtk.TreeModel model { get; set; }
                public bool popup_fixed_width { get; set; }
                [NoAccessorMethod]
@@ -1276,9 +1441,12 @@ namespace Gtk {
        public class ComboBoxText : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public ComboBoxText ();
+               public void append (string id, string text);
                public void append_text (string text);
                public unowned string get_active_text ();
+               public void insert (int position, string id, string text);
                public void insert_text (int position, string text);
+               public void prepend (string id, string text);
                public void prepend_text (string text);
                public void remove (int position);
                public void remove_all ();
@@ -1313,6 +1481,7 @@ namespace Gtk {
                public unowned Gtk.Widget get_focus_child ();
                public unowned Gtk.Adjustment get_focus_hadjustment ();
                public unowned Gtk.Adjustment get_focus_vadjustment ();
+               public virtual unowned Gtk.WidgetPath get_path_for_child (Gtk.Widget child);
                public Gtk.ResizeMode get_resize_mode ();
                [CCode (cname = "gtk_container_class_handle_border_width")]
                public class void handle_border_width ();
@@ -1343,6 +1512,17 @@ namespace Gtk {
                public virtual signal void set_focus_child (Gtk.Widget? widget);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public class CssProvider : GLib.Object, Gtk.StyleProvider {
+               [CCode (has_construct_function = false)]
+               public CssProvider ();
+               public static GLib.Quark error_quark ();
+               public static unowned Gtk.CssProvider get_default ();
+               public static unowned Gtk.CssProvider get_named (string name, string variant);
+               public bool load_from_data (string data, ssize_t length) throws GLib.Error;
+               public bool load_from_file (GLib.File file) throws GLib.Error;
+               public bool load_from_path (string path) throws GLib.Error;
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public Dialog ();
@@ -1367,6 +1547,7 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+               public void* dummy;
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public DrawingArea ();
        }
@@ -1569,6 +1750,10 @@ namespace Gtk {
                public void set_popup_set_width (bool popup_set_width);
                public void set_popup_single_match (bool popup_single_match);
                public void set_text_column (int column);
+               [CCode (has_construct_function = false)]
+               public EntryCompletion.with_area (Gtk.CellArea area);
+               [NoAccessorMethod]
+               public Gtk.CellArea cell_area { owned get; construct; }
                public bool inline_completion { get; set; }
                public bool inline_selection { get; set; }
                public int minimum_key_length { get; set; }
@@ -1766,6 +1951,16 @@ namespace Gtk {
                public float label_yalign { get; set; }
                public Gtk.ShadowType shadow_type { get; set; }
        }
+       [Compact]
+       [CCode (ref_function = "gtk_gradient_ref", unref_function = "gtk_gradient_unref", type_id = "GTK_TYPE_GRADIENT", cheader_filename = "gtk/gtk.h")]
+       public class Gradient {
+               public void add_color_stop (double offset, Gtk.SymbolicColor color);
+               [CCode (has_construct_function = false)]
+               public Gradient.linear (double x0, double y0, double x1, double y1);
+               [CCode (has_construct_function = false)]
+               public Gradient.radial (double x0, double y0, double radius0, double x1, double y1, double radius1);
+               public bool resolve (Gtk.StyleProperties props, out unowned Cairo.Pattern resolved_gradient);
+       }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Grid : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -1801,11 +1996,6 @@ namespace Gtk {
                public HPaned ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class HRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-               [CCode (type = "GtkWidget*", has_construct_function = false)]
-               public HRuler ();
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class HSV : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public HSV ();
@@ -1914,7 +2104,7 @@ namespace Gtk {
                public unowned string get_filename ();
                public Gdk.Pixbuf load_icon () throws GLib.Error;
                public unowned Gdk.Pixbuf load_symbolic (Gdk.RGBA fg, Gdk.RGBA success_color, Gdk.RGBA warning_color, Gdk.RGBA error_color, bool was_symbolic) throws GLib.Error;
-               public unowned Gdk.Pixbuf load_symbolic_for_style (Gtk.Style style, Gtk.StateType state, bool was_symbolic) throws GLib.Error;
+               public unowned Gdk.Pixbuf load_symbolic_for_context (Gtk.StyleContext context, bool was_symbolic) throws GLib.Error;
                public void set_raw_coordinates (bool raw_coordinates);
        }
        [Compact]
@@ -1928,6 +2118,7 @@ namespace Gtk {
                public IconSet.from_pixbuf (Gdk.Pixbuf pixbuf);
                public void get_sizes (Gtk.IconSize[] sizes);
                public unowned Gdk.Pixbuf render_icon (Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
+               public unowned Gdk.Pixbuf render_icon_pixbuf (Gtk.StyleContext context, Gtk.IconSize size);
        }
        [Compact]
        [CCode (copy_function = "gtk_icon_source_copy", type_id = "GTK_TYPE_ICON_SOURCE", cheader_filename = "gtk/gtk.h")]
@@ -2040,7 +2231,11 @@ namespace Gtk {
                public void unset_model_drag_dest ();
                public void unset_model_drag_source ();
                [CCode (type = "GtkWidget*", has_construct_function = false)]
+               public IconView.with_area (Gtk.CellArea area);
+               [CCode (type = "GtkWidget*", has_construct_function = false)]
                public IconView.with_model (Gtk.TreeModel model);
+               [NoAccessorMethod]
+               public Gtk.CellArea cell_area { owned get; construct; }
                public int column_spacing { get; set; }
                public int columns { get; set; }
                public Gtk.Orientation item_orientation { get; set; }
@@ -2407,11 +2602,13 @@ namespace Gtk {
                public MenuItem ();
                public unowned string get_accel_path ();
                public virtual unowned string get_label ();
+               public bool get_reserve_indicator ();
                public bool get_right_justified ();
                public unowned Gtk.Widget get_submenu ();
                public bool get_use_underline ();
                public void set_accel_path (string accel_path);
                public virtual void set_label (string label);
+               public void set_reserve_indicator (bool reserve);
                public void set_right_justified (bool right_justified);
                public void set_submenu (Gtk.Widget submenu);
                public void set_use_underline (bool setting);
@@ -2441,8 +2638,10 @@ namespace Gtk {
                public void activate_item (Gtk.Widget menu_item, bool force_deactivate);
                public void append ([CCode (type = "GtkWidget*")] Gtk.MenuItem child);
                public void deselect ();
+               public unowned Gtk.Widget get_parent_shell ();
                [NoWrapper]
                public virtual int get_popup_delay ();
+               public unowned Gtk.Widget get_selected_item ();
                public bool get_take_focus ();
                public virtual void insert (Gtk.Widget child, int position);
                public void prepend (Gtk.Widget child);
@@ -2600,6 +2799,29 @@ namespace Gtk {
                public virtual signal void switch_page (Gtk.Widget page, uint page_num);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public class NumerableIcon : GLib.EmblemedIcon, GLib.Icon {
+               [CCode (type = "GIcon*", has_construct_function = false)]
+               public NumerableIcon (GLib.Icon base_icon);
+               public unowned GLib.Icon get_background_gicon ();
+               public unowned string get_background_icon_name ();
+               public int get_count ();
+               public unowned string get_label ();
+               public unowned Gtk.StyleContext get_style_context ();
+               public void set_background_gicon (GLib.Icon icon);
+               public void set_background_icon_name (string icon_name);
+               public void set_count (int count);
+               public void set_label (string label);
+               public void set_style_context (Gtk.StyleContext style);
+               [CCode (type = "GIcon*", has_construct_function = false)]
+               public NumerableIcon.with_style_context (GLib.Icon base_icon, Gtk.StyleContext context);
+               [NoAccessorMethod]
+               public GLib.Icon background_icon { owned get; set; }
+               public string background_icon_name { get; set; }
+               public int count { get; set; }
+               public string label { get; set; }
+               public Gtk.StyleContext style_context { get; set; }
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public class OffscreenWindow : Gtk.Window, Atk.Implementor, Gtk.Buildable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public OffscreenWindow ();
@@ -2992,7 +3214,6 @@ namespace Gtk {
                public bool get_show_fill_level ();
                public void get_slider_range (int slider_start, int slider_end);
                public bool get_slider_size_fixed ();
-               public Gtk.UpdateType get_update_policy ();
                public Gtk.SensitivityType get_upper_stepper_sensitivity ();
                public double get_value ();
                public void set_adjustment (Gtk.Adjustment adjustment);
@@ -3006,7 +3227,6 @@ namespace Gtk {
                public void set_restrict_to_fill_level (bool restrict_to_fill_level);
                public void set_show_fill_level (bool show_fill_level);
                public void set_slider_size_fixed (bool size_fixed);
-               public void set_update_policy (Gtk.UpdateType policy);
                public void set_upper_stepper_sensitivity (Gtk.SensitivityType sensitivity);
                public void set_value (double value);
                public Gtk.Adjustment adjustment { get; set construct; }
@@ -3015,7 +3235,6 @@ namespace Gtk {
                public Gtk.SensitivityType lower_stepper_sensitivity { get; set; }
                public bool restrict_to_fill_level { get; set; }
                public bool show_fill_level { get; set; }
-               public Gtk.UpdateType update_policy { get; set; }
                public Gtk.SensitivityType upper_stepper_sensitivity { get; set; }
                public virtual signal void adjust_bounds (double new_value);
                public virtual signal bool change_value (Gtk.ScrollType scroll, double new_value);
@@ -3199,39 +3418,6 @@ namespace Gtk {
                public int natural_size;
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Ruler : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-               [CCode (type = "GtkWidget*", has_construct_function = false)]
-               public Ruler (Gtk.Orientation orientation);
-               [NoWrapper]
-               public virtual void draw_pos (Cairo.Context cr);
-               [NoWrapper]
-               public virtual void draw_ticks (Cairo.Context cr);
-               public Gtk.MetricType get_metric ();
-               public void get_range (double lower, double upper, double position, double max_size);
-               public void set_metric (Gtk.MetricType metric);
-               public void set_range (double lower, double upper, double position, double max_size);
-               [NoAccessorMethod]
-               public double lower { get; set; }
-               [NoAccessorMethod]
-               public double max_size { get; set; }
-               public Gtk.MetricType metric { get; set; }
-               [NoAccessorMethod]
-               public double position { get; set; }
-               [NoAccessorMethod]
-               public double upper { get; set; }
-       }
-       [Compact]
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class RulerMetric {
-               public weak string abbrev;
-               public weak string metric_name;
-               public double pixels_per_unit;
-               [CCode (array_length = false)]
-               public weak double[] ruler_scale;
-               [CCode (array_length = false)]
-               public weak int[] subdivide;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public Scale (Gtk.Orientation orientation, Gtk.Adjustment adjustment);
@@ -3325,6 +3511,7 @@ namespace Gtk {
                [CCode (array_length = false)]
                public unowned uchar[] get_data ();
                public Gdk.Atom get_data_type ();
+               public unowned uchar[] get_data_with_length (int length);
                public unowned Gdk.Display get_display ();
                public int get_format ();
                public int get_length ();
@@ -3363,7 +3550,7 @@ namespace Gtk {
                public bool draw { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Settings : GLib.Object {
+       public class Settings : GLib.Object, Gtk.StyleProvider {
                [CCode (has_construct_function = false)]
                protected Settings ();
                public static unowned Gtk.Settings get_default ();
@@ -3515,10 +3702,6 @@ namespace Gtk {
        }
        [Compact]
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class SettingsPropertyValue {
-       }
-       [Compact]
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class SettingsValue {
                public weak string origin;
                public GLib.Value value;
@@ -3767,16 +3950,116 @@ namespace Gtk {
                public void @get (GLib.Type widget_type, ...);
                public void get_style_property (GLib.Type widget_type, string property_name, out GLib.Value value);
                public void get_valist (GLib.Type widget_type, string first_property_name, void* var_args);
+               public bool has_context ();
                [NoWrapper]
                public virtual void init_from_rc (Gtk.RcStyle rc_style);
                public bool lookup_color (string color_name, out Gdk.Color color);
                public unowned Gtk.IconSet lookup_icon_set (string stock_id);
                public virtual unowned Gdk.Pixbuf render_icon (Gtk.IconSource source, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
                public virtual void set_background (Gdk.Window window, Gtk.StateType state_type);
+               [NoAccessorMethod]
+               public Gtk.StyleContext context { owned get; construct; }
                public virtual signal void realize ();
                public virtual signal void unrealize ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public class StyleContext : GLib.Object {
+               [CCode (has_construct_function = false)]
+               public StyleContext ();
+               public void add_class (string class_name);
+               public void add_provider (Gtk.StyleProvider provider, uint priority);
+               public static void add_provider_for_screen (Gdk.Screen screen, Gtk.StyleProvider provider, uint priority);
+               public void add_region (string region_name, Gtk.RegionFlags flags);
+               public void cancel_animations (void* region_id);
+               public void @get (Gtk.StateFlags state);
+               public void get_background_color (Gtk.StateFlags state, Gdk.RGBA color);
+               public void get_border (Gtk.StateFlags state, Gtk.Border border);
+               public void get_border_color (Gtk.StateFlags state, Gdk.RGBA color);
+               public void get_color (Gtk.StateFlags state, Gdk.RGBA color);
+               public Gtk.TextDirection get_direction ();
+               public unowned Pango.FontDescription get_font (Gtk.StateFlags state);
+               public Gtk.JunctionSides get_junction_sides ();
+               public void get_margin (Gtk.StateFlags state, Gtk.Border margin);
+               public void get_padding (Gtk.StateFlags state, Gtk.Border padding);
+               public unowned Gtk.WidgetPath get_path ();
+               public void get_property (string property, Gtk.StateFlags state, GLib.Value value);
+               public unowned Gdk.Screen get_screen ();
+               public Gtk.StateFlags get_state ();
+               public void get_style ();
+               public void get_style_property (string property_name, GLib.Value value);
+               public void get_style_valist (void* args);
+               public void get_valist (Gtk.StateFlags state, void* args);
+               public bool has_class (string class_name);
+               public bool has_region (string region_name, Gtk.RegionFlags flags_return);
+               public void invalidate ();
+               public unowned GLib.List list_classes ();
+               public unowned GLib.List list_regions ();
+               public bool lookup_color (string color_name, Gdk.RGBA color);
+               public unowned Gtk.IconSet lookup_icon_set (string stock_id);
+               public void notify_state_change (Gdk.Window window, void* region_id, Gtk.StateType state, bool state_value);
+               public void pop_animatable_region ();
+               public void push_animatable_region (void* region_id);
+               public void remove_class (string class_name);
+               public void remove_provider (Gtk.StyleProvider provider);
+               public static void remove_provider_for_screen (Gdk.Screen screen, Gtk.StyleProvider provider);
+               public void remove_region (string region_name);
+               public static void reset_widgets (Gdk.Screen screen);
+               public void restore ();
+               public void save ();
+               public void scroll_animations (Gdk.Window window, int dx, int dy);
+               public void set_background (Gdk.Window window);
+               public void set_direction (Gtk.TextDirection direction);
+               public void set_junction_sides (Gtk.JunctionSides sides);
+               public void set_path (Gtk.WidgetPath path);
+               public void set_screen (Gdk.Screen screen);
+               public void set_state (Gtk.StateFlags flags);
+               public bool state_is_running (Gtk.StateType state, double progress);
+               public Gtk.TextDirection direction { get; set; }
+               public Gdk.Screen screen { get; set; }
+               public virtual signal void changed ();
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public class StyleProperties : GLib.Object, Gtk.StyleProvider {
+               [CCode (has_construct_function = false)]
+               public StyleProperties ();
+               public void clear ();
+               public void @get (Gtk.StateFlags state);
+               public bool get_property (string property, Gtk.StateFlags state, GLib.Value value);
+               public void get_valist (Gtk.StateFlags state, void* args);
+               public unowned Gtk.SymbolicColor lookup_color (string name);
+               public static bool lookup_property (string property_name, Gtk.StylePropertyParser parse_func, out unowned GLib.ParamSpec pspec);
+               public void map_color (string name, Gtk.SymbolicColor color);
+               public void merge (Gtk.StyleProperties props_to_merge, bool replace);
+               public static void register_property (Gtk.StylePropertyParser parse_func, GLib.ParamSpec pspec);
+               public void @set (Gtk.StateFlags state);
+               public void set_property (string property, Gtk.StateFlags state, GLib.Value value);
+               public void set_valist (Gtk.StateFlags state, void* args);
+               public void unset_property (string property, Gtk.StateFlags state);
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public class Switch : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
+               [CCode (type = "GtkWidget*", has_construct_function = false)]
+               public Switch ();
+               public bool get_active ();
+               public void set_active (bool is_active);
+               public bool active { get; set; }
+       }
+       [Compact]
+       [CCode (ref_function = "gtk_symbolic_color_ref", unref_function = "gtk_symbolic_color_unref", type_id = "GTK_TYPE_SYMBOLIC_COLOR", cheader_filename = "gtk/gtk.h")]
+       public class SymbolicColor {
+               [CCode (has_construct_function = false)]
+               public SymbolicColor.alpha (Gtk.SymbolicColor color, double factor);
+               [CCode (has_construct_function = false)]
+               public SymbolicColor.literal (Gdk.RGBA color);
+               [CCode (has_construct_function = false)]
+               public SymbolicColor.mix (Gtk.SymbolicColor color1, Gtk.SymbolicColor color2, double factor);
+               [CCode (has_construct_function = false)]
+               public SymbolicColor.name (string name);
+               public bool resolve (Gtk.StyleProperties props, Gdk.RGBA resolved_color);
+               [CCode (has_construct_function = false)]
+               public SymbolicColor.shade (Gtk.SymbolicColor color, double factor);
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public class Table : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public Table (uint rows, uint columns, bool homogeneous);
@@ -3869,11 +4152,8 @@ namespace Gtk {
                public Gdk.Color fg_color;
                public uint inside_selection;
                public uint is_text;
-               public uint pad1;
-               public uint pad2;
-               public uint pad3;
-               public uint pad4;
-               public void* padding1;
+               [CCode (array_length = false)]
+               public weak uint[] padding;
                public int rise;
                public uint strikethrough;
                public uint underline;
@@ -3892,10 +4172,8 @@ namespace Gtk {
                public Gtk.Justification justification;
                public weak Pango.Language language;
                public int left_margin;
-               public uint pad1;
-               public uint pad2;
-               public uint pad3;
-               public uint pad4;
+               [CCode (array_length = false)]
+               public weak uint[] padding;
                public Gdk.Color pg_bg_color;
                public int pixels_above_lines;
                public int pixels_below_lines;
@@ -4013,6 +4291,7 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TextChildAnchor : GLib.Object {
+               public void* segment;
                [CCode (has_construct_function = false)]
                public TextChildAnchor ();
                public bool get_deleted ();
@@ -4020,6 +4299,7 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TextMark : GLib.Object {
+               public void* segment;
                [CCode (has_construct_function = false)]
                public TextMark (string name, bool left_gravity);
                public unowned Gtk.TextBuffer get_buffer ();
@@ -4163,7 +4443,7 @@ namespace Gtk {
                public virtual signal bool event (GLib.Object event_object, Gdk.Event event, Gtk.TextIter iter);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class TextTagTable : GLib.Object {
+       public class TextTagTable : GLib.Object, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                public TextTagTable ();
                public void add (Gtk.TextTag tag);
@@ -4274,6 +4554,67 @@ namespace Gtk {
        public class ThemeEngine {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public class ThemingEngine : GLib.Object {
+               [CCode (has_construct_function = false)]
+               protected ThemingEngine ();
+               public void @get (Gtk.StateFlags state);
+               public void get_background_color (Gtk.StateFlags state, Gdk.RGBA color);
+               public void get_border (Gtk.StateFlags state, Gtk.Border border);
+               public void get_border_color (Gtk.StateFlags state, Gdk.RGBA color);
+               public void get_color (Gtk.StateFlags state, Gdk.RGBA color);
+               public Gtk.TextDirection get_direction ();
+               public unowned Pango.FontDescription get_font (Gtk.StateFlags state);
+               public Gtk.JunctionSides get_junction_sides ();
+               public void get_margin (Gtk.StateFlags state, Gtk.Border margin);
+               public void get_padding (Gtk.StateFlags state, Gtk.Border padding);
+               public unowned Gtk.WidgetPath get_path ();
+               public void get_property (string property, Gtk.StateFlags state, GLib.Value value);
+               public unowned Gdk.Screen get_screen ();
+               public Gtk.StateFlags get_state ();
+               public void get_style ();
+               public void get_style_property (string property_name, GLib.Value value);
+               public void get_style_valist (void* args);
+               public void get_valist (Gtk.StateFlags state, void* args);
+               public bool has_class (string style_class);
+               public bool has_region (string style_region, Gtk.RegionFlags flags);
+               public static unowned Gtk.ThemingEngine load (string name);
+               public bool lookup_color (string color_name, Gdk.RGBA color);
+               public static void register_property (string name_space, Gtk.StylePropertyParser parse_func, GLib.ParamSpec pspec);
+               [NoWrapper]
+               public virtual void render_activity (Cairo.Context cr, double x, double y, double width, double height);
+               [NoWrapper]
+               public virtual void render_arrow (Cairo.Context cr, double angle, double x, double y, double size);
+               [NoWrapper]
+               public virtual void render_background (Cairo.Context cr, double x, double y, double width, double height);
+               [NoWrapper]
+               public virtual void render_check (Cairo.Context cr, double x, double y, double width, double height);
+               [NoWrapper]
+               public virtual void render_expander (Cairo.Context cr, double x, double y, double width, double height);
+               [NoWrapper]
+               public virtual void render_extension (Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side);
+               [NoWrapper]
+               public virtual void render_focus (Cairo.Context cr, double x, double y, double width, double height);
+               [NoWrapper]
+               public virtual void render_frame (Cairo.Context cr, double x, double y, double width, double height);
+               [NoWrapper]
+               public virtual void render_frame_gap (Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side, double xy0_gap, double xy1_gap);
+               [NoWrapper]
+               public virtual void render_handle (Cairo.Context cr, double x, double y, double width, double height);
+               [NoWrapper]
+               public virtual unowned Gdk.Pixbuf render_icon_pixbuf (Gtk.IconSource source, Gtk.IconSize size);
+               [NoWrapper]
+               public virtual void render_layout (Cairo.Context cr, double x, double y, Pango.Layout layout);
+               [NoWrapper]
+               public virtual void render_line (Cairo.Context cr, double x0, double y0, double x1, double y1);
+               [NoWrapper]
+               public virtual void render_option (Cairo.Context cr, double x, double y, double width, double height);
+               [NoWrapper]
+               public virtual void render_slider (Cairo.Context cr, double x, double y, double width, double height, Gtk.Orientation orientation);
+               public bool state_is_running (Gtk.StateType state, double progress);
+               [NoAccessorMethod]
+               public string name { owned get; construct; }
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public class ToggleAction : Gtk.Action, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                public ToggleAction (string name, string? label, string? tooltip, string? stock_id);
@@ -4664,6 +5005,7 @@ namespace Gtk {
                public int insert_column (Gtk.TreeViewColumn column, int position);
                public int insert_column_with_attributes (int position, string? title, Gtk.CellRenderer cell, ...);
                public int insert_column_with_data_func (int position, string title, Gtk.CellRenderer cell, owned Gtk.TreeCellDataFunc func);
+               public bool is_blank_at_pos (int x, int y, out unowned Gtk.TreePath path, out unowned Gtk.TreeViewColumn column, int cell_x, int cell_y);
                [CCode (cname = "gtk_tree_view_row_expanded")]
                public bool is_row_expanded (Gtk.TreePath path);
                public bool is_rubber_banding_active ();
@@ -4743,12 +5085,13 @@ namespace Gtk {
        public class TreeViewColumn : GLib.InitiallyUnowned, Gtk.CellLayout, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                public TreeViewColumn ();
-               public bool cell_get_position (Gtk.CellRenderer cell_renderer, int start_pos, int width);
+               public bool cell_get_position (Gtk.CellRenderer cell_renderer, int x_offset, int width);
                public void cell_get_size (out Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height);
                public bool cell_is_visible ();
                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 Gtk.Widget get_button ();
                public bool get_clickable ();
                public bool get_expand ();
                public int get_fixed_width ();
@@ -4785,8 +5128,12 @@ namespace Gtk {
                public void set_visible (bool visible);
                public void set_widget (Gtk.Widget widget);
                [CCode (has_construct_function = false)]
+               public TreeViewColumn.with_area (Gtk.CellArea area);
+               [CCode (has_construct_function = false)]
                public TreeViewColumn.with_attributes (string? title, Gtk.CellRenderer cell, ...);
                public float alignment { get; set; }
+               [NoAccessorMethod]
+               public Gtk.CellArea cell_area { owned get; construct; }
                public bool clickable { get; set; }
                public bool expand { get; set; }
                public int fixed_width { get; set; }
@@ -4851,11 +5198,6 @@ namespace Gtk {
                public VPaned ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class VRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-               [CCode (type = "GtkWidget*", has_construct_function = false)]
-               public VRuler ();
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class VScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public VScale (Gtk.Adjustment? adjustment);
@@ -4890,6 +5232,8 @@ namespace Gtk {
        public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Orientable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public VolumeButton ();
+               [NoAccessorMethod]
+               public bool use_symbolic { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Widget : GLib.InitiallyUnowned, Atk.Implementor, Gtk.Buildable {
@@ -4901,7 +5245,7 @@ namespace Gtk {
                public void add_events (int events);
                public void add_mnemonic_label (Gtk.Widget label);
                [NoWrapper]
-               public virtual void adjust_size_allocation (Gtk.Orientation orientation, int natural_size, int allocated_pos, int allocated_size);
+               public virtual void adjust_size_allocation (Gtk.Orientation orientation, int minimum_size, int natural_size, int allocated_pos, int allocated_size);
                [NoWrapper]
                public virtual void adjust_size_request (Gtk.Orientation orientation, int minimum_size, int natural_size);
                public bool child_focus (Gtk.DirectionType direction);
@@ -4931,12 +5275,12 @@ namespace Gtk {
                public unowned string get_composite_name ();
                public static Gtk.TextDirection get_default_direction ();
                public static unowned Gtk.Style get_default_style ();
+               public bool get_device_enabled (Gdk.Device device);
                public Gdk.EventMask get_device_events (Gdk.Device device);
                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 ();
                public Gtk.Align get_halign ();
                public bool get_has_tooltip ();
                public bool get_has_window ();
@@ -4952,6 +5296,7 @@ namespace Gtk {
                public unowned Pango.Context get_pango_context ();
                public unowned Gtk.Widget get_parent ();
                public unowned Gdk.Window get_parent_window ();
+               public unowned Gtk.WidgetPath get_path ();
                public void get_pointer (out int x, out int y);
                public virtual void get_preferred_height (int minimum_height, int natural_height);
                public virtual void get_preferred_height_for_width (int width, int minimum_height, int natural_height);
@@ -4968,7 +5313,9 @@ namespace Gtk {
                public unowned Gtk.Settings get_settings ();
                public void get_size_request (out int width, out int height);
                public Gtk.StateType get_state ();
+               public Gtk.StateFlags get_state_flags ();
                public unowned Gtk.Style get_style ();
+               public unowned Gtk.StyleContext get_style_context ();
                public bool get_support_multidevice ();
                public unowned string get_tooltip_markup ();
                public unowned string get_tooltip_text ();
@@ -5005,8 +5352,12 @@ namespace Gtk {
                public void modify_fg (Gtk.StateType state, Gdk.Color? color);
                public void modify_font (Pango.FontDescription? font_desc);
                public void modify_style (Gtk.RcStyle style);
-               public void modify_symbolic_color (string name, Gdk.Color color);
                public void modify_text (Gtk.StateType state, Gdk.Color? color);
+               public void override_background_color (Gtk.StateFlags state, Gdk.RGBA color);
+               public void override_color (Gtk.StateFlags state, Gdk.RGBA color);
+               public void override_cursor (Gdk.RGBA cursor, Gdk.RGBA secondary_cursor);
+               public void override_font (Pango.FontDescription font_desc);
+               public void override_symbolic_color (string name, Gdk.RGBA color);
                public void path (out uint path_length, out unowned string path, out unowned string path_reversed);
                public static void pop_composite_child ();
                public static void push_composite_child ();
@@ -5020,9 +5371,10 @@ namespace Gtk {
                public bool remove_accelerator (Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods);
                public void remove_mnemonic_label (Gtk.Widget label);
                public Gdk.Pixbuf render_icon (string stock_id, Gtk.IconSize size, string? detail);
+               public unowned Gdk.Pixbuf render_icon_pixbuf (string stock_id, Gtk.IconSize size);
                public void reparent (Gtk.Widget new_parent);
                public void reset_rc_styles ();
-               public void reset_shapes ();
+               public void reset_style ();
                public int send_expose (Gdk.Event event);
                public bool send_focus_change (Gdk.Event event);
                public void set_accel_path (string accel_path, Gtk.AccelGroup accel_group);
@@ -5033,11 +5385,11 @@ namespace Gtk {
                public void set_child_visible (bool is_visible);
                public void set_composite_name (string name);
                public static void set_default_direction (Gtk.TextDirection dir);
+               public void set_device_enabled (Gdk.Device device, bool enabled);
                public void set_device_events (Gdk.Device device, Gdk.EventMask events);
                public void set_direction (Gtk.TextDirection dir);
                public void set_double_buffered (bool double_buffered);
                public void set_events (int events);
-               public void set_extension_events (Gdk.ExtensionMode mode);
                public void set_halign (Gtk.Align align);
                public void set_has_tooltip (bool has_tooltip);
                public void set_has_window (bool has_window);
@@ -5057,6 +5409,7 @@ namespace Gtk {
                public void set_sensitive (bool sensitive);
                public void set_size_request (int width, int height);
                public void set_state (Gtk.StateType state);
+               public void set_state_flags (Gtk.StateFlags flags, bool clear);
                public void set_style (Gtk.Style? style);
                public void set_support_multidevice (bool support_multidevice);
                public void set_tooltip_markup (string markup);
@@ -5079,6 +5432,7 @@ namespace Gtk {
                public bool translate_coordinates (Gtk.Widget dest_widget, int src_x, int src_y, out int dest_x, out int dest_y);
                public void trigger_tooltip_query ();
                public void unparent ();
+               public void unset_state_flags (Gtk.StateFlags flags);
                public bool app_paintable { get; set; }
                public bool can_default { get; set; }
                [NoAccessorMethod]
@@ -5089,7 +5443,6 @@ namespace Gtk {
                public Gdk.EventMask events { get; set; }
                [NoAccessorMethod]
                public bool expand { get; set; }
-               public Gdk.ExtensionMode extension_events { get; set; }
                public Gtk.Align halign { get; set; }
                [NoAccessorMethod]
                public bool has_default { get; set; }
@@ -5144,7 +5497,7 @@ namespace Gtk {
                public virtual signal void drag_data_received (Gdk.DragContext context, int x, int y, Gtk.SelectionData selection_data, uint info, uint time_);
                public virtual signal bool drag_drop (Gdk.DragContext context, int x, int y, uint time_);
                public virtual signal void drag_end (Gdk.DragContext context);
-               public virtual signal bool drag_failed (Gdk.DragContext p0, Gtk.DragResult p1);
+               public virtual signal bool drag_failed (Gdk.DragContext context, Gtk.DragResult result);
                public virtual signal void drag_leave (Gdk.DragContext context, uint time_);
                public virtual signal bool drag_motion (Gdk.DragContext context, int x, int y, uint time_);
                [HasEmitter]
@@ -5175,7 +5528,6 @@ namespace Gtk {
                public virtual signal bool mnemonic_activate (bool group_cycling);
                public virtual signal bool motion_notify_event (Gdk.EventMotion event);
                public virtual signal void move_focus (Gtk.DirectionType direction);
-               public virtual signal bool no_expose_event (Gdk.EventNoExpose event);
                public virtual signal void parent_set (Gtk.Widget? previous_parent);
                public virtual signal bool popup_menu ();
                public virtual signal bool property_notify_event (Gdk.EventProperty event);
@@ -5196,10 +5548,10 @@ namespace Gtk {
                public virtual signal bool show_help (Gtk.WidgetHelpType help_type);
                [HasEmitter]
                public virtual signal void size_allocate (Gdk.Rectangle allocation);
-               [HasEmitter]
-               public virtual signal void size_request (out Gtk.Requisition requisition);
                public virtual signal void state_changed (Gtk.StateType previous_state);
+               public virtual signal void state_flags_changed (Gtk.StateFlags previous_state_flags);
                public virtual signal void style_set (Gtk.Style? previous_style);
+               public virtual signal void style_updated ();
                [HasEmitter]
                public virtual signal void unmap ();
                public virtual signal bool unmap_event (Gdk.Event event);
@@ -5217,6 +5569,37 @@ namespace Gtk {
                public uint valign;
                public int width;
        }
+       [Compact]
+       [CCode (copy_function = "gtk_widget_path_copy", type_id = "GTK_TYPE_WIDGET_PATH", cheader_filename = "gtk/gtk.h")]
+       public class WidgetPath {
+               [CCode (has_construct_function = false)]
+               public WidgetPath ();
+               public int append_type (GLib.Type type);
+               public unowned Gtk.WidgetPath copy ();
+               public GLib.Type get_object_type ();
+               public bool has_parent (GLib.Type type);
+               public bool is_type (GLib.Type type);
+               public void iter_add_class (int pos, string name);
+               public void iter_add_region (int pos, string name, Gtk.RegionFlags flags);
+               public void iter_clear_classes (int pos);
+               public void iter_clear_regions (int pos);
+               public unowned string iter_get_name (int pos);
+               public GLib.Type iter_get_object_type (int pos);
+               public bool iter_has_class (int pos, string name);
+               public bool iter_has_name (int pos, string name);
+               public bool iter_has_qclass (int pos, GLib.Quark qname);
+               public bool iter_has_qname (int pos, GLib.Quark qname);
+               public bool iter_has_qregion (int pos, GLib.Quark qname, Gtk.RegionFlags flags);
+               public bool iter_has_region (int pos, string name, Gtk.RegionFlags flags);
+               public unowned GLib.SList iter_list_classes (int pos);
+               public unowned GLib.SList iter_list_regions (int pos);
+               public void iter_remove_class (int pos, string name);
+               public void iter_remove_region (int pos, string name);
+               public void iter_set_name (int pos, string name);
+               public void iter_set_object_type (int pos, GLib.Type type);
+               public int length ();
+               public void prepend_type (GLib.Type type);
+       }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Window : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -5225,7 +5608,6 @@ namespace Gtk {
                public bool activate_focus ();
                public bool activate_key (Gdk.EventKey event);
                public void add_accel_group (Gtk.AccelGroup accel_group);
-               public void add_embedded_xid (Gdk.NativeWindow xid);
                public void add_mnemonic (uint keyval, Gtk.Widget target);
                public void begin_move_drag (int button, int root_x, int root_y, uint32 timestamp);
                public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint32 timestamp);
@@ -5242,10 +5624,8 @@ namespace Gtk {
                public bool get_destroy_with_parent ();
                public unowned Gtk.Widget get_focus ();
                public bool get_focus_on_map ();
-               public void get_frame_dimensions (int left, int top, int right, int bottom);
                public Gdk.Gravity get_gravity ();
                public unowned Gtk.WindowGroup get_group ();
-               public bool get_has_frame ();
                public bool get_has_resize_grip ();
                public unowned Gdk.Pixbuf get_icon ();
                public GLib.List<weak Gdk.Pixbuf> get_icon_list ();
@@ -5278,7 +5658,6 @@ namespace Gtk {
                public void present_with_time (uint32 timestamp);
                public bool propagate_key_event (Gdk.EventKey event);
                public void remove_accel_group (Gtk.AccelGroup accel_group);
-               public void remove_embedded_xid (Gdk.NativeWindow xid);
                public void remove_mnemonic (uint keyval, Gtk.Widget target);
                public void reshow_with_initial_size ();
                public void resize (int width, int height);
@@ -5298,11 +5677,10 @@ namespace Gtk {
                public void set_deletable (bool setting);
                public void set_destroy_with_parent (bool setting);
                public void set_focus_on_map (bool setting);
-               public void set_frame_dimensions (int left, int top, int right, int bottom);
                public void set_geometry_hints (Gtk.Widget geometry_widget, Gdk.Geometry geometry, Gdk.WindowHints geom_mask);
                public void set_gravity (Gdk.Gravity gravity);
-               public void set_has_frame (bool setting);
                public void set_has_resize_grip (bool value);
+               public void set_has_user_ref_count (bool setting);
                public void set_icon (Gdk.Pixbuf icon);
                public bool set_icon_from_file (string filename) throws GLib.Error;
                public void set_icon_list (GLib.List<Gdk.Pixbuf> list);
@@ -5368,7 +5746,6 @@ namespace Gtk {
                public Gtk.WindowPosition window_position { get; set; }
                public virtual signal void default_activated ();
                public virtual signal void focus_activated ();
-               public virtual signal bool frame_event (Gdk.Event event);
                public virtual signal void keys_changed ();
                [HasEmitter]
                public virtual signal void set_focus (Gtk.Widget? focus);
@@ -5401,6 +5778,13 @@ namespace Gtk {
                public bool use_action_appearance { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public interface AppChooser : Gtk.Widget {
+               public unowned GLib.AppInfo get_app_info ();
+               public unowned string get_content_type ();
+               public void refresh ();
+               public string content_type { get; construct; }
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public interface Buildable : GLib.Object {
                public abstract void add_child (Gtk.Builder builder, GLib.Object child, string? type);
                public abstract unowned GLib.Object construct_child (Gtk.Builder builder, string name);
@@ -5427,6 +5811,7 @@ namespace Gtk {
                public abstract void add_attribute (Gtk.CellRenderer cell, string attribute, int column);
                public abstract void clear ();
                public abstract void clear_attributes (Gtk.CellRenderer cell);
+               public abstract unowned Gtk.CellArea get_area ();
                public abstract GLib.List<weak Gtk.CellRenderer> get_cells ();
                public abstract void pack_end (Gtk.CellRenderer cell, bool expand);
                public abstract void pack_start (Gtk.CellRenderer cell, bool expand);
@@ -5618,6 +6003,12 @@ namespace Gtk {
                public Gtk.ScrollablePolicy vscroll_policy { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public interface StyleProvider {
+               public abstract unowned Gtk.IconFactory get_icon_factory (Gtk.WidgetPath path);
+               public abstract unowned Gtk.StyleProperties get_style (Gtk.WidgetPath path);
+               public abstract bool get_style_property (Gtk.WidgetPath path, Gtk.StateFlags state, GLib.ParamSpec pspec, GLib.Value value);
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public interface ToolShell : Gtk.Widget {
                public abstract Pango.EllipsizeMode get_ellipsize_mode ();
                public abstract Gtk.IconSize get_icon_size ();
@@ -5661,6 +6052,7 @@ namespace Gtk {
                public abstract bool iter_next (ref Gtk.TreeIter iter);
                public abstract bool iter_nth_child (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n);
                public abstract bool iter_parent (out Gtk.TreeIter iter, Gtk.TreeIter child);
+               public abstract bool iter_previous (Gtk.TreeIter iter);
                public abstract void ref_node (Gtk.TreeIter iter);
                public abstract void unref_node (Gtk.TreeIter iter);
                [HasEmitter]
@@ -5933,6 +6325,13 @@ namespace Gtk {
                SHRINK,
                FILL
        }
+       [CCode (cprefix = "GTK_BORDER_STYLE_", cheader_filename = "gtk/gtk.h")]
+       public enum BorderStyle {
+               NONE,
+               SOLID,
+               INSET,
+               OUTSET
+       }
        [CCode (cprefix = "GTK_BUTTONBOX_", cheader_filename = "gtk/gtk.h")]
        public enum ButtonBoxStyle {
                SPREAD,
@@ -5986,6 +6385,10 @@ namespace Gtk {
                TOP_RIGHT,
                BOTTOM_RIGHT
        }
+       [CCode (cprefix = "GTK_CSS_PROVIDER_ERROR_", cheader_filename = "gtk/gtk.h")]
+       public enum CssProviderError {
+               FAILED
+       }
        [CCode (cprefix = "GTK_DEBUG_", cheader_filename = "gtk/gtk.h")]
        [Flags]
        public enum DebugFlag {
@@ -6141,6 +6544,19 @@ namespace Gtk {
                ICON_NAME,
                GICON
        }
+       [CCode (cprefix = "GTK_JUNCTION_", cheader_filename = "gtk/gtk.h")]
+       [Flags]
+       public enum JunctionSides {
+               NONE,
+               CORNER_TOPLEFT,
+               CORNER_TOPRIGHT,
+               CORNER_BOTTOMLEFT,
+               CORNER_BOTTOMRIGHT,
+               TOP,
+               BOTTOM,
+               LEFT,
+               RIGHT
+       }
        [CCode (cprefix = "GTK_JUSTIFY_", cheader_filename = "gtk/gtk.h")]
        public enum Justification {
                LEFT,
@@ -6175,12 +6591,6 @@ namespace Gtk {
                ERROR,
                OTHER
        }
-       [CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
-       public enum MetricType {
-               PIXELS,
-               INCHES,
-               CENTIMETERS
-       }
        [CCode (cprefix = "GTK_MOVEMENT_", cheader_filename = "gtk/gtk.h")]
        public enum MovementStep {
                LOGICAL_POSITIONS,
@@ -6404,6 +6814,15 @@ namespace Gtk {
                LRU,
                CUSTOM
        }
+       [CCode (cprefix = "GTK_REGION_", cheader_filename = "gtk/gtk.h")]
+       [Flags]
+       public enum RegionFlags {
+               EVEN,
+               ODD,
+               FIRST,
+               LAST,
+               SORTED
+       }
        [CCode (cprefix = "GTK_RELIEF_", cheader_filename = "gtk/gtk.h")]
        public enum ReliefStyle {
                NORMAL,
@@ -6516,13 +6935,26 @@ namespace Gtk {
                END,
                USER_DEFINED
        }
+       [CCode (cprefix = "GTK_STATE_FLAG_", cheader_filename = "gtk/gtk.h")]
+       [Flags]
+       public enum StateFlags {
+               NORMAL,
+               ACTIVE,
+               PRELIGHT,
+               SELECTED,
+               INSENSITIVE,
+               INCONSISTENT,
+               FOCUSED
+       }
        [CCode (cprefix = "GTK_STATE_", cheader_filename = "gtk/gtk.h")]
        public enum StateType {
                NORMAL,
                ACTIVE,
                PRELIGHT,
                SELECTED,
-               INSENSITIVE
+               INSENSITIVE,
+               INCONSISTENT,
+               FOCUSED
        }
        [CCode (cprefix = "GTK_TARGET_", cheader_filename = "gtk/gtk.h")]
        [Flags]
@@ -6627,12 +7059,6 @@ namespace Gtk {
                INCH,
                MM
        }
-       [CCode (cprefix = "GTK_UPDATE_", cheader_filename = "gtk/gtk.h")]
-       public enum UpdateType {
-               CONTINUOUS,
-               DISCONTINUOUS,
-               DELAYED
-       }
        [CCode (cprefix = "GTK_WIDGET_HELP_", cheader_filename = "gtk/gtk.h")]
        public enum WidgetHelpType {
                TOOLTIP,
@@ -6686,8 +7112,10 @@ namespace Gtk {
        public delegate string CalendarDetailFunc (Gtk.Calendar calendar, uint year, uint month, uint day);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void Callback (Gtk.Widget widget);
-       [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
-       public delegate void CallbackMarshal (GLib.Object object, void* data, Gtk.Arg[] args);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public delegate bool CellAllocCallback (Gtk.CellRenderer renderer, Gdk.Rectangle cell_area, Gdk.Rectangle cell_background);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public delegate bool CellCallback (Gtk.CellRenderer renderer);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void CellLayoutDataFunc (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
@@ -6715,8 +7143,6 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate bool FileFilterFunc (Gtk.FileFilterInfo filter_info);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate bool Function ();
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void IconViewForeachFunc (Gtk.IconView icon_view, Gtk.TreePath path);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, void* func_data);
@@ -6740,6 +7166,8 @@ namespace Gtk {
        public delegate bool RecentFilterFunc (Gtk.RecentFilterInfo filter_info);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate int RecentSortFunc (Gtk.RecentInfo a, Gtk.RecentInfo b);
+       [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+       public delegate bool StylePropertyParser (string str, GLib.Value value, GLib.Error error);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, uchar data, size_t length, bool create_tags, GLib.Error error);
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -6777,8 +7205,6 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void TreeViewSearchPositionFunc (Gtk.TreeView tree_view, Gtk.Widget search_dialog);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void WindowKeysForeachFunc (Gtk.Window window, uint keyval, Gdk.ModifierType modifiers, bool is_mnemonic);
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public const int BINARY_AGE;
        [CCode (cheader_filename = "gtk/gtk.h")]
        public const int INPUT_ERROR;
@@ -7186,6 +7612,122 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public const string STOCK_ZOOM_OUT;
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_ACCELERATOR;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_BACKGROUND;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_BUTTON;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_CALENDAR;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_CELL;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_CHECK;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_DEFAULT;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_DND;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_DOCK;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_ENTRY;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_ERROR;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_EXPANDER;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_FRAME;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_GRIP;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_HEADER;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_HIGHLIGHT;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_HORIZONTAL;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_INFO;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_MARK;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_MENU;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_MENUBAR;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_MENUITEM;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_NOTEBOOK;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_PANE_SEPARATOR;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_PROGRESSBAR;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_QUESTION;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_RADIO;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_RUBBERBAND;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_SCALE;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_SCROLLBAR;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_SLIDER;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_SPINBUTTON;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_SPINNER;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_TOOLBAR;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_TOOLTIP;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_TROUGH;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_VERTICAL;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_VIEW;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_CLASS_WARNING;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_PROPERTY_BACKGROUND_COLOR;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_PROPERTY_BACKGROUND_IMAGE;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_PROPERTY_BORDER_COLOR;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_PROPERTY_BORDER_RADIUS;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_PROPERTY_BORDER_STYLE;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_PROPERTY_BORDER_WIDTH;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_PROPERTY_COLOR;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_PROPERTY_FONT;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_PROPERTY_MARGIN;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_PROPERTY_PADDING;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const int STYLE_PROVIDER_PRIORITY_APPLICATION;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const int STYLE_PROVIDER_PRIORITY_FALLBACK;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const int STYLE_PROVIDER_PRIORITY_SETTINGS;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const int STYLE_PROVIDER_PRIORITY_THEME;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const int STYLE_PROVIDER_PRIORITY_USER;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_REGION_COLUMN;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_REGION_COLUMN_HEADER;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_REGION_ROW;
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public const string STYLE_REGION_TAB;
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public const int TEXT_VIEW_PRIORITY_VALIDATE;
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool accel_groups_activate (GLib.Object object, uint accel_key, Gdk.ModifierType accel_mods);
@@ -7340,12 +7882,8 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void icon_size_register_alias (string alias, Gtk.IconSize target);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public static GLib.Type identifier_get_type ();
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public static void init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public static void init_add (Gtk.Function function);
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool init_check ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool init_with_args ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, string parameter_string, [CCode (array_length = false)] GLib.OptionEntry[] entries, string? translation_domain) throws GLib.Error;
@@ -7416,14 +7954,6 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void propagate_event (Gtk.Widget widget, Gdk.Event event);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public static uint quit_add (uint main_level, Gtk.Function function);
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public static void quit_add_destroy (uint main_level, Gtk.Widget object);
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public static void quit_remove (uint quit_handler_id);
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public static void quit_remove_by_data (void* data);
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public static void rc_add_default_file (string filename);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static unowned string rc_find_module_in_path (string module_file);
@@ -7466,6 +7996,36 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void rc_set_default_files (string filenames);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_activity (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_arrow (Gtk.StyleContext context, Cairo.Context cr, double angle, double x, double y, double size);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_background (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_check (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_expander (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_extension (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_focus (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_frame (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_frame_gap (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side, double xy0_gap, double xy1_gap);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_handle (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static unowned Gdk.Pixbuf render_icon_pixbuf (Gtk.StyleContext context, Gtk.IconSource source, Gtk.IconSize size);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_layout (Gtk.StyleContext context, Cairo.Context cr, double x, double y, Pango.Layout layout);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_line (Gtk.StyleContext context, Cairo.Context cr, double x0, double y0, double x1, double y1);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_option (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public static void render_slider (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height, Gtk.Orientation orientation);
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static void rgb_to_hsv (double r, double g, double b, double h, double s, double v);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void selection_add_target (Gtk.Widget widget, Gdk.Atom selection, Gdk.Atom target, uint info);
@@ -7484,8 +8044,6 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void set_debug_flags (uint flags);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public static unowned string set_locale ();
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public static void show_about_dialog (Gtk.Window? parent, ...);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool show_uri (Gdk.Screen? screen, string uri, uint32 timestamp) throws GLib.Error;

diff --git a/vapi/packages/gdk-3.0/gdk-3.0.excludes b/vapi/packages/gdk-3.0/gdk-3.0.excludes
index 735456ca2105cc075ed94ff3b24c1bb55bd34dbf..ab6c52dcc3a9d4958019a8b862b1838a6c88a424 100644 (file)
--- a/vapi/packages/gdk-3.0/gdk-3.0.excludes
+++ b/vapi/packages/gdk-3.0/gdk-3.0.excludes
@@ -2,6 +2,7 @@ gdkalias.h
 gdkkeysyms.h
 gdkkeysyms-compat.h
 gdkx.h
+gdkx11.*h
 gdkdirectfb.h
 gdkprivate.h
 gdkprivate-directfb.h

diff --git a/vapi/packages/gdk-3.0/gdk-3.0.files b/vapi/packages/gdk-3.0/gdk-3.0.files
index 570e43bb7b8c12992c0303b772b807446fc6acbd..6e8f5ca240f35632e36c025973ed9bde9ff5e46d 100644 (file)
--- a/vapi/packages/gdk-3.0/gdk-3.0.files
+++ b/vapi/packages/gdk-3.0/gdk-3.0.files
@@ -1,3 +1,3 @@
 include/gtk-3.0/gdk/gdk.h
 include/gtk-3.0/gdk
-lib/libgdk-x11-3.0.so
+lib/libgdk-3.0.so

diff --git a/vapi/packages/gdk-3.0/gdk-3.0.gi b/vapi/packages/gdk-3.0/gdk-3.0.gi
index 1c45ecd2bab9955c17c60dfc4895b84b6a678321..5cbd051f043f0a3525d71022899c9d3e997dfcac 100644 (file)
--- a/vapi/packages/gdk-3.0/gdk-3.0.gi
+++ b/vapi/packages/gdk-3.0/gdk-3.0.gi
@@ -21,7 +21,7 @@
                <function name="cairo_create" symbol="gdk_cairo_create">
                        <return-type type="cairo_t*"/>
                        <parameters>
-                               <parameter name="drawable" type="GdkDrawable*"/>
+                               <parameter name="window" type="GdkWindow*"/>
                        </parameters>
                </function>
                <function name="cairo_get_clip_rectangle" symbol="gdk_cairo_get_clip_rectangle">
@@ -51,13 +51,6 @@
                                <parameter name="surface" type="cairo_surface_t*"/>
                        </parameters>
                </function>
-               <function name="cairo_reset_clip" symbol="gdk_cairo_reset_clip">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cr" type="cairo_t*"/>
-                               <parameter name="drawable" type="GdkDrawable*"/>
-                       </parameters>
-               </function>
                <function name="cairo_set_source_color" symbol="gdk_cairo_set_source_color">
                        <return-type type="void"/>
                        <parameters>
@@ -90,6 +83,9 @@
                                <parameter name="y" type="double"/>
                        </parameters>
                </function>
+               <function name="disable_multidevice" symbol="gdk_disable_multidevice">
+                       <return-type type="void"/>
+               </function>
                <function name="drag_abort" symbol="gdk_drag_abort">
                        <return-type type="void"/>
                        <parameters>
@@ -104,6 +100,14 @@
                                <parameter name="targets" type="GList*"/>
                        </parameters>
                </function>
+               <function name="drag_begin_for_device" symbol="gdk_drag_begin_for_device">
+                       <return-type type="GdkDragContext*"/>
+                       <parameters>
+                               <parameter name="window" type="GdkWindow*"/>
+                               <parameter name="device" type="GdkDevice*"/>
+                               <parameter name="targets" type="GList*"/>
+                       </parameters>
+               </function>
                <function name="drag_drop" symbol="gdk_drag_drop">
                        <return-type type="void"/>
                        <parameters>
@@ -117,17 +121,6 @@
                                <parameter name="context" type="GdkDragContext*"/>
                        </parameters>
                </function>
-               <function name="drag_find_window" symbol="gdk_drag_find_window">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="context" type="GdkDragContext*"/>
-                               <parameter name="drag_window" type="GdkWindow*"/>
-                               <parameter name="x_root" type="gint"/>
-                               <parameter name="y_root" type="gint"/>
-                               <parameter name="dest_window" type="GdkWindow**"/>
-                               <parameter name="protocol" type="GdkDragProtocol*"/>
-                       </parameters>
-               </function>
                <function name="drag_find_window_for_screen" symbol="gdk_drag_find_window_for_screen">
                        <return-type type="void"/>
                        <parameters>
@@ -140,13 +133,6 @@
                                <parameter name="protocol" type="GdkDragProtocol*"/>
                        </parameters>
                </function>
-               <function name="drag_get_protocol" symbol="gdk_drag_get_protocol">
-                       <return-type type="GdkNativeWindow"/>
-                       <parameters>
-                               <parameter name="xid" type="GdkNativeWindow"/>
-                               <parameter name="protocol" type="GdkDragProtocol*"/>
-                       </parameters>
-               </function>
                <function name="drag_get_protocol_for_display" symbol="gdk_drag_get_protocol_for_display">
                        <return-type type="GdkNativeWindow"/>
                        <parameters>
@@ -194,13 +180,10 @@
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="context" type="GdkDragContext*"/>
-                               <parameter name="ok" type="gboolean"/>
+                               <parameter name="accepted" type="gboolean"/>
                                <parameter name="time_" type="guint32"/>
                        </parameters>
                </function>
-               <function name="enable_multidevice" symbol="gdk_enable_multidevice">
-                       <return-type type="void"/>
-               </function>
                <function name="error_trap_pop" symbol="gdk_error_trap_pop">
                        <return-type type="gint"/>
                </function>
@@ -241,18 +224,6 @@
                <function name="flush" symbol="gdk_flush">
                        <return-type type="void"/>
                </function>
-               <function name="free_compound_text" symbol="gdk_free_compound_text">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="ctext" type="guchar*"/>
-                       </parameters>
-               </function>
-               <function name="free_text_list" symbol="gdk_free_text_list">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="list" type="gchar**"/>
-                       </parameters>
-               </function>
                <function name="get_default_root_window" symbol="gdk_get_default_root_window">
                        <return-type type="GdkWindow*"/>
                </function>
@@ -282,20 +253,6 @@
                                <parameter name="argv" type="gchar***"/>
                        </parameters>
                </function>
-               <function name="keyboard_grab" symbol="gdk_keyboard_grab">
-                       <return-type type="GdkGrabStatus"/>
-                       <parameters>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="owner_events" type="gboolean"/>
-                               <parameter name="time_" type="guint32"/>
-                       </parameters>
-               </function>
-               <function name="keyboard_ungrab" symbol="gdk_keyboard_ungrab">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="time_" type="guint32"/>
-                       </parameters>
-               </function>
                <function name="keyval_convert_case" symbol="gdk_keyval_convert_case">
                        <return-type type="void"/>
                        <parameters>
@@ -433,26 +390,6 @@
                                <parameter name="height" type="int"/>
                        </parameters>
                </function>
-               <function name="pointer_grab" symbol="gdk_pointer_grab">
-                       <return-type type="GdkGrabStatus"/>
-                       <parameters>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="owner_events" type="gboolean"/>
-                               <parameter name="event_mask" type="GdkEventMask"/>
-                               <parameter name="confine_to" type="GdkWindow*"/>
-                               <parameter name="cursor" type="GdkCursor*"/>
-                               <parameter name="time_" type="guint32"/>
-                       </parameters>
-               </function>
-               <function name="pointer_is_grabbed" symbol="gdk_pointer_is_grabbed">
-                       <return-type type="gboolean"/>
-               </function>
-               <function name="pointer_ungrab" symbol="gdk_pointer_ungrab">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="time_" type="guint32"/>
-                       </parameters>
-               </function>
                <function name="pre_parse_libgtk_only" symbol="gdk_pre_parse_libgtk_only">
                        <return-type type="void"/>
                </function>
@@ -581,15 +518,6 @@
                                <parameter name="msec" type="guint"/>
                        </parameters>
                </function>
-               <function name="set_locale" symbol="gdk_set_locale">
-                       <return-type type="gchar*"/>
-               </function>
-               <function name="set_pointer_hooks" symbol="gdk_set_pointer_hooks">
-                       <return-type type="GdkPointerHooks*"/>
-                       <parameters>
-                               <parameter name="new_hooks" type="GdkPointerHooks*"/>
-                       </parameters>
-               </function>
                <function name="set_program_class" symbol="gdk_set_program_class">
                        <return-type type="void"/>
                        <parameters>
@@ -602,12 +530,6 @@
                                <parameter name="show_events" type="gboolean"/>
                        </parameters>
                </function>
-               <function name="set_sm_client_id" symbol="gdk_set_sm_client_id">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="sm_client_id" type="gchar*"/>
-                       </parameters>
-               </function>
                <function name="setting_get" symbol="gdk_setting_get">
                        <return-type type="gboolean"/>
                        <parameters>
@@ -615,66 +537,6 @@
                                <parameter name="value" type="GValue*"/>
                        </parameters>
                </function>
-               <function name="spawn_command_line_on_screen" symbol="gdk_spawn_command_line_on_screen">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="screen" type="GdkScreen*"/>
-                               <parameter name="command_line" type="gchar*"/>
-                               <parameter name="error" type="GError**"/>
-                       </parameters>
-               </function>
-               <function name="spawn_on_screen" symbol="gdk_spawn_on_screen">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="screen" type="GdkScreen*"/>
-                               <parameter name="working_directory" type="gchar*"/>
-                               <parameter name="argv" type="gchar**"/>
-                               <parameter name="envp" type="gchar**"/>
-                               <parameter name="flags" type="GSpawnFlags"/>
-                               <parameter name="child_setup" type="GSpawnChildSetupFunc"/>
-                               <parameter name="user_data" type="gpointer"/>
-                               <parameter name="child_pid" type="GPid*"/>
-                               <parameter name="error" type="GError**"/>
-                       </parameters>
-               </function>
-               <function name="spawn_on_screen_with_pipes" symbol="gdk_spawn_on_screen_with_pipes">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="screen" type="GdkScreen*"/>
-                               <parameter name="working_directory" type="gchar*"/>
-                               <parameter name="argv" type="gchar**"/>
-                               <parameter name="envp" type="gchar**"/>
-                               <parameter name="flags" type="GSpawnFlags"/>
-                               <parameter name="child_setup" type="GSpawnChildSetupFunc"/>
-                               <parameter name="user_data" type="gpointer"/>
-                               <parameter name="child_pid" type="GPid*"/>
-                               <parameter name="standard_input" type="gint*"/>
-                               <parameter name="standard_output" type="gint*"/>
-                               <parameter name="standard_error" type="gint*"/>
-                               <parameter name="error" type="GError**"/>
-                       </parameters>
-               </function>
-               <function name="string_to_compound_text" symbol="gdk_string_to_compound_text">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="str" type="gchar*"/>
-                               <parameter name="encoding" type="GdkAtom*"/>
-                               <parameter name="format" type="gint*"/>
-                               <parameter name="ctext" type="guchar**"/>
-                               <parameter name="length" type="gint*"/>
-                       </parameters>
-               </function>
-               <function name="string_to_compound_text_for_display" symbol="gdk_string_to_compound_text_for_display">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                               <parameter name="str" type="gchar*"/>
-                               <parameter name="encoding" type="GdkAtom*"/>
-                               <parameter name="format" type="gint*"/>
-                               <parameter name="ctext" type="guchar**"/>
-                               <parameter name="length" type="gint*"/>
-                       </parameters>
-               </function>
                <function name="test_render_sync" symbol="gdk_test_render_sync">
                        <return-type type="void"/>
                        <parameters>
@@ -703,37 +565,6 @@
                                <parameter name="key_pressrelease" type="GdkEventType"/>
                        </parameters>
                </function>
-               <function name="text_property_to_text_list" symbol="gdk_text_property_to_text_list">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="encoding" type="GdkAtom"/>
-                               <parameter name="format" type="gint"/>
-                               <parameter name="text" type="guchar*"/>
-                               <parameter name="length" type="gint"/>
-                               <parameter name="list" type="gchar***"/>
-                       </parameters>
-               </function>
-               <function name="text_property_to_text_list_for_display" symbol="gdk_text_property_to_text_list_for_display">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                               <parameter name="encoding" type="GdkAtom"/>
-                               <parameter name="format" type="gint"/>
-                               <parameter name="text" type="guchar*"/>
-                               <parameter name="length" type="gint"/>
-                               <parameter name="list" type="gchar***"/>
-                       </parameters>
-               </function>
-               <function name="text_property_to_utf8_list" symbol="gdk_text_property_to_utf8_list">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="encoding" type="GdkAtom"/>
-                               <parameter name="format" type="gint"/>
-                               <parameter name="text" type="guchar*"/>
-                               <parameter name="length" type="gint"/>
-                               <parameter name="list" type="gchar***"/>
-                       </parameters>
-               </function>
                <function name="text_property_to_utf8_list_for_display" symbol="gdk_text_property_to_utf8_list_for_display">
                        <return-type type="gint"/>
                        <parameters>
@@ -819,27 +650,6 @@
                                <parameter name="wc" type="guint32"/>
                        </parameters>
                </function>
-               <function name="utf8_to_compound_text" symbol="gdk_utf8_to_compound_text">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="str" type="gchar*"/>
-                               <parameter name="encoding" type="GdkAtom*"/>
-                               <parameter name="format" type="gint*"/>
-                               <parameter name="ctext" type="guchar**"/>
-                               <parameter name="length" type="gint*"/>
-                       </parameters>
-               </function>
-               <function name="utf8_to_compound_text_for_display" symbol="gdk_utf8_to_compound_text_for_display">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                               <parameter name="str" type="gchar*"/>
-                               <parameter name="encoding" type="GdkAtom*"/>
-                               <parameter name="format" type="gint*"/>
-                               <parameter name="ctext" type="guchar**"/>
-                               <parameter name="length" type="gint*"/>
-                       </parameters>
-               </function>
                <function name="utf8_to_string_target" symbol="gdk_utf8_to_string_target">
                        <return-type type="gchar*"/>
                        <parameters>
@@ -889,25 +699,6 @@
                                </parameters>
                        </method>
                </struct>
-               <struct name="GdkDeviceAxis">
-                       <field name="use" type="GdkAxisUse"/>
-                       <field name="min" type="gdouble"/>
-                       <field name="max" type="gdouble"/>
-               </struct>
-               <struct name="GdkDeviceKey">
-                       <field name="keyval" type="guint"/>
-                       <field name="modifiers" type="GdkModifierType"/>
-               </struct>
-               <struct name="GdkDisplayDeviceHooks">
-                       <field name="get_device_state" type="GCallback"/>
-                       <field name="window_get_device_position" type="GCallback"/>
-                       <field name="window_at_device_position" type="GCallback"/>
-               </struct>
-               <struct name="GdkDisplayPointerHooks">
-                       <field name="get_pointer" type="GCallback"/>
-                       <field name="window_get_pointer" type="GCallback"/>
-                       <field name="window_at_pointer" type="GCallback"/>
-               </struct>
                <struct name="GdkEventAny">
                        <field name="type" type="GdkEventType"/>
                        <field name="window" type="GdkWindow*"/>
@@ -1017,11 +808,6 @@
                        <field name="x_root" type="gdouble"/>
                        <field name="y_root" type="gdouble"/>
                </struct>
-               <struct name="GdkEventNoExpose">
-                       <field name="type" type="GdkEventType"/>
-                       <field name="window" type="GdkWindow*"/>
-                       <field name="send_event" type="gint8"/>
-               </struct>
                <struct name="GdkEventOwnerChange">
                        <field name="type" type="GdkEventType"/>
                        <field name="window" type="GdkWindow*"/>
@@ -1103,43 +889,17 @@
                        <field name="max_aspect" type="gdouble"/>
                        <field name="win_gravity" type="GdkGravity"/>
                </struct>
-               <struct name="GdkKeyboardGrabInfo">
-                       <field name="window" type="GdkWindow*"/>
-                       <field name="native_window" type="GdkWindow*"/>
-                       <field name="serial" type="gulong"/>
-                       <field name="owner_events" type="gboolean"/>
-                       <field name="time" type="guint32"/>
-               </struct>
                <struct name="GdkKeymapKey">
                        <field name="keycode" type="guint"/>
                        <field name="group" type="gint"/>
                        <field name="level" type="gint"/>
                </struct>
-               <struct name="GdkMultipleClickInfo">
-                       <field name="button_click_time" type="guint32[]"/>
-                       <field name="button_window" type="GdkWindow*[]"/>
-                       <field name="button_number" type="gint[]"/>
-                       <field name="button_x" type="gint[]"/>
-                       <field name="button_y" type="gint[]"/>
-               </struct>
                <struct name="GdkNativeWindow">
                </struct>
                <struct name="GdkPoint">
                        <field name="x" type="gint"/>
                        <field name="y" type="gint"/>
                </struct>
-               <struct name="GdkPointerHooks">
-                       <field name="get_pointer" type="GCallback"/>
-                       <field name="window_at_pointer" type="GCallback"/>
-               </struct>
-               <struct name="GdkPointerWindowInfo">
-                       <field name="toplevel_under_pointer" type="GdkWindow*"/>
-                       <field name="window_under_pointer" type="GdkWindow*"/>
-                       <field name="toplevel_x" type="gdouble"/>
-                       <field name="toplevel_y" type="gdouble"/>
-                       <field name="state" type="guint32"/>
-                       <field name="button" type="guint32"/>
-               </struct>
                <struct name="GdkRectangle">
                        <method name="intersect" symbol="gdk_rectangle_intersect">
                                <return-type type="gboolean"/>
@@ -1162,8 +922,6 @@
                        <field name="time" type="guint32"/>
                        <field name="axes" type="gdouble[]"/>
                </struct>
-               <struct name="GdkVisualClass">
-               </struct>
                <struct name="GdkWindowAttr">
                        <field name="title" type="gchar*"/>
                        <field name="event_mask" type="gint"/>
@@ -1171,7 +929,7 @@
                        <field name="y" type="gint"/>
                        <field name="width" type="gint"/>
                        <field name="height" type="gint"/>
-                       <field name="wclass" type="GdkWindowClass"/>
+                       <field name="wclass" type="GdkWindowWindowClass"/>
                        <field name="visual" type="GdkVisual*"/>
                        <field name="window_type" type="GdkWindowType"/>
                        <field name="cursor" type="GdkCursor*"/>
@@ -1180,23 +938,6 @@
                        <field name="override_redirect" type="gboolean"/>
                        <field name="type_hint" type="GdkWindowTypeHint"/>
                </struct>
-               <struct name="GdkWindowObject">
-               </struct>
-               <struct name="GdkWindowObjectClass">
-                       <field name="parent_class" type="GdkDrawableClass"/>
-                       <field name="pick_embedded_child" type="GCallback"/>
-                       <field name="to_embedder" type="GCallback"/>
-                       <field name="from_embedder" type="GCallback"/>
-                       <field name="create_surface" type="GCallback"/>
-                       <field name="_gdk_reserved1" type="GCallback"/>
-                       <field name="_gdk_reserved2" type="GCallback"/>
-                       <field name="_gdk_reserved3" type="GCallback"/>
-                       <field name="_gdk_reserved4" type="GCallback"/>
-                       <field name="_gdk_reserved5" type="GCallback"/>
-                       <field name="_gdk_reserved6" type="GCallback"/>
-                       <field name="_gdk_reserved7" type="GCallback"/>
-                       <field name="_gdk_reserved8" type="GCallback"/>
-               </struct>
                <struct name="GdkWindowRedirect">
                </struct>
                <struct name="GdkXEvent">
@@ -1245,69 +986,6 @@
                        <field name="green" type="guint16"/>
                        <field name="blue" type="guint16"/>
                </boxed>
-               <boxed name="GdkCursor" type-name="GdkCursor" get-type="gdk_cursor_get_type">
-                       <method name="get_cursor_type" symbol="gdk_cursor_get_cursor_type">
-                               <return-type type="GdkCursorType"/>
-                               <parameters>
-                                       <parameter name="cursor" type="GdkCursor*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_display" symbol="gdk_cursor_get_display">
-                               <return-type type="GdkDisplay*"/>
-                               <parameters>
-                                       <parameter name="cursor" type="GdkCursor*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_image" symbol="gdk_cursor_get_image">
-                               <return-type type="GdkPixbuf*"/>
-                               <parameters>
-                                       <parameter name="cursor" type="GdkCursor*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gdk_cursor_new">
-                               <return-type type="GdkCursor*"/>
-                               <parameters>
-                                       <parameter name="cursor_type" type="GdkCursorType"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_for_display" symbol="gdk_cursor_new_for_display">
-                               <return-type type="GdkCursor*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="cursor_type" type="GdkCursorType"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_name" symbol="gdk_cursor_new_from_name">
-                               <return-type type="GdkCursor*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="name" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_pixbuf" symbol="gdk_cursor_new_from_pixbuf">
-                               <return-type type="GdkCursor*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                               </parameters>
-                       </constructor>
-                       <method name="ref" symbol="gdk_cursor_ref">
-                               <return-type type="GdkCursor*"/>
-                               <parameters>
-                                       <parameter name="cursor" type="GdkCursor*"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gdk_cursor_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cursor" type="GdkCursor*"/>
-                               </parameters>
-                       </method>
-                       <field name="_g_sealed__type" type="GdkCursorType"/>
-                       <field name="_g_sealed__ref_count" type="guint"/>
-               </boxed>
                <boxed name="GdkEvent" type-name="GdkEvent" get-type="gdk_event_get_type">
                        <method name="copy" symbol="gdk_event_copy">
                                <return-type type="GdkEvent*"/>
@@ -1360,6 +1038,12 @@
                                        <parameter name="event" type="GdkEvent*"/>
                                </parameters>
                        </method>
+                       <method name="get_source_device" symbol="gdk_event_get_source_device">
+                               <return-type type="GdkDevice*"/>
+                               <parameters>
+                                       <parameter name="event" type="GdkEvent*"/>
+                               </parameters>
+                       </method>
                        <method name="get_state" symbol="gdk_event_get_state">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -1437,10 +1121,16 @@
                                        <parameter name="screen" type="GdkScreen*"/>
                                </parameters>
                        </method>
+                       <method name="set_source_device" symbol="gdk_event_set_source_device">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="device" type="GdkDevice*"/>
+                               </parameters>
+                       </method>
                        <field name="type" type="GdkEventType"/>
                        <field name="any" type="GdkEventAny"/>
                        <field name="expose" type="GdkEventExpose"/>
-                       <field name="no_expose" type="GdkEventNoExpose"/>
                        <field name="visibility" type="GdkEventVisibility"/>
                        <field name="motion" type="GdkEventMotion"/>
                        <field name="button" type="GdkEventButton"/>
@@ -1488,8 +1178,8 @@
                        <method name="parse" symbol="gdk_rgba_parse">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="spec" type="gchar*"/>
                                        <parameter name="rgba" type="GdkRGBA*"/>
+                                       <parameter name="spec" type="gchar*"/>
                                </parameters>
                        </method>
                        <method name="to_string" symbol="gdk_rgba_to_string">
@@ -1655,7 +1345,6 @@
                        <member name="GDK_DROP_FINISHED" value="27"/>
                        <member name="GDK_CLIENT_EVENT" value="28"/>
                        <member name="GDK_VISIBILITY_NOTIFY" value="29"/>
-                       <member name="GDK_NO_EXPOSE" value="30"/>
                        <member name="GDK_SCROLL" value="31"/>
                        <member name="GDK_WINDOW_STATE" value="32"/>
                        <member name="GDK_SETTING" value="33"/>
@@ -1763,10 +1452,6 @@
                        <member name="GDK_VISUAL_TRUE_COLOR" value="4"/>
                        <member name="GDK_VISUAL_DIRECT_COLOR" value="5"/>
                </enum>
-               <enum name="GdkWindowClass" type-name="GdkWindowClass" get-type="gdk_window_class_get_type">
-                       <member name="GDK_INPUT_OUTPUT" value="0"/>
-                       <member name="GDK_INPUT_ONLY" value="1"/>
-               </enum>
                <enum name="GdkWindowEdge" type-name="GdkWindowEdge" get-type="gdk_window_edge_get_type">
                        <member name="GDK_WINDOW_EDGE_NORTH_WEST" value="0"/>
                        <member name="GDK_WINDOW_EDGE_NORTH" value="1"/>
@@ -1801,6 +1486,10 @@
                        <member name="GDK_WINDOW_TYPE_HINT_COMBO" value="12"/>
                        <member name="GDK_WINDOW_TYPE_HINT_DND" value="13"/>
                </enum>
+               <enum name="GdkWindowWindowClass" type-name="GdkWindowWindowClass" get-type="gdk_window_window_class_get_type">
+                       <member name="GDK_INPUT_OUTPUT" value="0"/>
+                       <member name="GDK_INPUT_ONLY" value="1"/>
+               </enum>
                <flags name="GdkDragAction" type-name="GdkDragAction" get-type="gdk_drag_action_get_type">
                        <member name="GDK_ACTION_DEFAULT" value="1"/>
                        <member name="GDK_ACTION_COPY" value="2"/>
@@ -1901,9 +1590,6 @@
                        <member name="GDK_WINDOW_STATE_BELOW" value="64"/>
                </flags>
                <object name="GdkAppLaunchContext" parent="GAppLaunchContext" type-name="GdkAppLaunchContext" get-type="gdk_app_launch_context_get_type">
-                       <constructor name="new" symbol="gdk_app_launch_context_new">
-                               <return-type type="GdkAppLaunchContext*"/>
-                       </constructor>
                        <method name="set_desktop" symbol="gdk_app_launch_context_set_desktop">
                                <return-type type="void"/>
                                <parameters>
@@ -1911,13 +1597,6 @@
                                        <parameter name="desktop" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_display" symbol="gdk_app_launch_context_set_display">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="context" type="GdkAppLaunchContext*"/>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                               </parameters>
-                       </method>
                        <method name="set_icon" symbol="gdk_app_launch_context_set_icon">
                                <return-type type="void"/>
                                <parameters>
@@ -1942,10 +1621,62 @@
                        <method name="set_timestamp" symbol="gdk_app_launch_context_set_timestamp">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GdkAppLaunchContext*"/>
-                                       <parameter name="timestamp" type="guint32"/>
+                                       <parameter name="context" type="GdkAppLaunchContext*"/>
+                                       <parameter name="timestamp" type="guint32"/>
+                               </parameters>
+                       </method>
+                       <property name="display" type="GdkDisplay*" readable="1" writable="1" construct="0" construct-only="1"/>
+               </object>
+               <object name="GdkCursor" parent="GObject" type-name="GdkCursor" get-type="gdk_cursor_get_type">
+                       <method name="get_cursor_type" symbol="gdk_cursor_get_cursor_type">
+                               <return-type type="GdkCursorType"/>
+                               <parameters>
+                                       <parameter name="cursor" type="GdkCursor*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_display" symbol="gdk_cursor_get_display">
+                               <return-type type="GdkDisplay*"/>
+                               <parameters>
+                                       <parameter name="cursor" type="GdkCursor*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_image" symbol="gdk_cursor_get_image">
+                               <return-type type="GdkPixbuf*"/>
+                               <parameters>
+                                       <parameter name="cursor" type="GdkCursor*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gdk_cursor_new">
+                               <return-type type="GdkCursor*"/>
+                               <parameters>
+                                       <parameter name="cursor_type" type="GdkCursorType"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_for_display" symbol="gdk_cursor_new_for_display">
+                               <return-type type="GdkCursor*"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="cursor_type" type="GdkCursorType"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_from_name" symbol="gdk_cursor_new_from_name">
+                               <return-type type="GdkCursor*"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_from_pixbuf" symbol="gdk_cursor_new_from_pixbuf">
+                               <return-type type="GdkCursor*"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
-                       </method>
+                       </constructor>
+                       <property name="cursor-type" type="GdkCursorType" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="display" type="GdkDisplay*" readable="1" writable="1" construct="0" construct-only="1"/>
                </object>
                <object name="GdkDevice" parent="GObject" type-name="GdkDevice" get-type="gdk_device_get_type">
                        <method name="free_history" symbol="gdk_device_free_history">
@@ -2031,7 +1762,13 @@
                                </parameters>
                        </method>
                        <method name="get_n_axes" symbol="gdk_device_get_n_axes">
-                               <return-type type="guint"/>
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="device" type="GdkDevice*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_n_keys" symbol="gdk_device_get_n_keys">
+                               <return-type type="gint"/>
                                <parameters>
                                        <parameter name="device" type="GdkDevice*"/>
                                </parameters>
@@ -2042,6 +1779,15 @@
                                        <parameter name="device" type="GdkDevice*"/>
                                </parameters>
                        </method>
+                       <method name="get_position" symbol="gdk_device_get_position">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="device" type="GdkDevice*"/>
+                                       <parameter name="screen" type="GdkScreen**"/>
+                                       <parameter name="x" type="gint*"/>
+                                       <parameter name="y" type="gint*"/>
+                               </parameters>
+                       </method>
                        <method name="get_source" symbol="gdk_device_get_source">
                                <return-type type="GdkInputSource"/>
                                <parameters>
@@ -2057,6 +1803,14 @@
                                        <parameter name="mask" type="GdkModifierType*"/>
                                </parameters>
                        </method>
+                       <method name="get_window_at_position" symbol="gdk_device_get_window_at_position">
+                               <return-type type="GdkWindow*"/>
+                               <parameters>
+                                       <parameter name="device" type="GdkDevice*"/>
+                                       <parameter name="win_x" type="gint*"/>
+                                       <parameter name="win_y" type="gint*"/>
+                               </parameters>
+                       </method>
                        <method name="grab" symbol="gdk_device_grab">
                                <return-type type="GdkGrabStatus"/>
                                <parameters>
@@ -2084,6 +1838,12 @@
                                        <parameter name="device" type="GdkDevice*"/>
                                </parameters>
                        </method>
+                       <method name="list_slave_devices" symbol="gdk_device_list_slave_devices">
+                               <return-type type="GList*"/>
+                               <parameters>
+                                       <parameter name="device" type="GdkDevice*"/>
+                               </parameters>
+                       </method>
                        <method name="set_axis_use" symbol="gdk_device_set_axis_use">
                                <return-type type="void"/>
                                <parameters>
@@ -2108,18 +1868,20 @@
                                        <parameter name="mode" type="GdkInputMode"/>
                                </parameters>
                        </method>
-                       <method name="set_source" symbol="gdk_device_set_source">
+                       <method name="ungrab" symbol="gdk_device_ungrab">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="device" type="GdkDevice*"/>
-                                       <parameter name="source" type="GdkInputSource"/>
+                                       <parameter name="time_" type="guint32"/>
                                </parameters>
                        </method>
-                       <method name="ungrab" symbol="gdk_device_ungrab">
+                       <method name="warp" symbol="gdk_device_warp">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="device" type="GdkDevice*"/>
-                                       <parameter name="time_" type="guint32"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
                        </method>
                        <property name="associated-device" type="GdkDevice*" readable="1" writable="0" construct="0" construct-only="0"/>
@@ -2131,6 +1893,12 @@
                        <property name="n-axes" type="guint" readable="1" writable="0" construct="0" construct-only="0"/>
                        <property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
                        <property name="type" type="GdkDeviceType" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <signal name="changed" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="object" type="GdkDevice*"/>
+                               </parameters>
+                       </signal>
                </object>
                <object name="GdkDeviceManager" parent="GObject" type-name="GdkDeviceManager" get-type="gdk_device_manager_get_type">
                        <method name="get_client_pointer" symbol="gdk_device_manager_get_client_pointer">
@@ -2156,37 +1924,24 @@
                        <signal name="device-added" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="device_manager" type="GdkDeviceManager*"/>
-                                       <parameter name="device" type="GdkDevice*"/>
+                                       <parameter name="object" type="GdkDeviceManager*"/>
+                                       <parameter name="p0" type="GdkDevice*"/>
                                </parameters>
                        </signal>
                        <signal name="device-changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="device_manager" type="GdkDeviceManager*"/>
-                                       <parameter name="device" type="GdkDevice*"/>
+                                       <parameter name="object" type="GdkDeviceManager*"/>
+                                       <parameter name="p0" type="GdkDevice*"/>
                                </parameters>
                        </signal>
                        <signal name="device-removed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="device_manager" type="GdkDeviceManager*"/>
-                                       <parameter name="device" type="GdkDevice*"/>
+                                       <parameter name="object" type="GdkDeviceManager*"/>
+                                       <parameter name="p0" type="GdkDevice*"/>
                                </parameters>
                        </signal>
-                       <vfunc name="get_client_pointer">
-                               <return-type type="GdkDevice*"/>
-                               <parameters>
-                                       <parameter name="device_manager" type="GdkDeviceManager*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="list_devices">
-                               <return-type type="GList*"/>
-                               <parameters>
-                                       <parameter name="device_manager" type="GdkDeviceManager*"/>
-                                       <parameter name="type" type="GdkDeviceType"/>
-                               </parameters>
-                       </vfunc>
                </object>
                <object name="GdkDisplay" parent="GObject" type-name="GdkDisplay" get-type="gdk_display_get_type">
                        <method name="add_client_message_filter" symbol="gdk_display_add_client_message_filter">
@@ -2223,6 +1978,12 @@
                                        <parameter name="display" type="GdkDisplay*"/>
                                </parameters>
                        </method>
+                       <method name="get_app_launch_context" symbol="gdk_display_get_app_launch_context">
+                               <return-type type="GdkAppLaunchContext*"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                               </parameters>
+                       </method>
                        <method name="get_default" symbol="gdk_display_get_default">
                                <return-type type="GdkDisplay*"/>
                        </method>
@@ -2250,17 +2011,6 @@
                                        <parameter name="display" type="GdkDisplay*"/>
                                </parameters>
                        </method>
-                       <method name="get_device_state" symbol="gdk_display_get_device_state">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="device" type="GdkDevice*"/>
-                                       <parameter name="screen" type="GdkScreen**"/>
-                                       <parameter name="x" type="gint*"/>
-                                       <parameter name="y" type="gint*"/>
-                                       <parameter name="mask" type="GdkModifierType*"/>
-                               </parameters>
-                       </method>
                        <method name="get_event" symbol="gdk_display_get_event">
                                <return-type type="GdkEvent*"/>
                                <parameters>
@@ -2287,16 +2037,6 @@
                                        <parameter name="display" type="GdkDisplay*"/>
                                </parameters>
                        </method>
-                       <method name="get_pointer" symbol="gdk_display_get_pointer">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="screen" type="GdkScreen**"/>
-                                       <parameter name="x" type="gint*"/>
-                                       <parameter name="y" type="gint*"/>
-                                       <parameter name="mask" type="GdkModifierType*"/>
-                               </parameters>
-                       </method>
                        <method name="get_screen" symbol="gdk_display_get_screen">
                                <return-type type="GdkScreen*"/>
                                <parameters>
@@ -2304,21 +2044,10 @@
                                        <parameter name="screen_num" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_window_at_device_position" symbol="gdk_display_get_window_at_device_position">
-                               <return-type type="GdkWindow*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="device" type="GdkDevice*"/>
-                                       <parameter name="win_x" type="gint*"/>
-                                       <parameter name="win_y" type="gint*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_window_at_pointer" symbol="gdk_display_get_window_at_pointer">
-                               <return-type type="GdkWindow*"/>
+                       <method name="has_pending" symbol="gdk_display_has_pending">
+                               <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="win_x" type="gint*"/>
-                                       <parameter name="win_y" type="gint*"/>
                                </parameters>
                        </method>
                        <method name="is_closed" symbol="gdk_display_is_closed">
@@ -2327,11 +2056,11 @@
                                        <parameter name="display" type="GdkDisplay*"/>
                                </parameters>
                        </method>
-                       <method name="keyboard_ungrab" symbol="gdk_display_keyboard_ungrab">
+                       <method name="notify_startup_complete" symbol="gdk_display_notify_startup_complete">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="time_" type="guint32"/>
+                                       <parameter name="startup_id" type="gchar*"/>
                                </parameters>
                        </method>
                        <method name="open" symbol="gdk_display_open">
@@ -2349,19 +2078,6 @@
                                        <parameter name="display" type="GdkDisplay*"/>
                                </parameters>
                        </method>
-                       <method name="pointer_is_grabbed" symbol="gdk_display_pointer_is_grabbed">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                               </parameters>
-                       </method>
-                       <method name="pointer_ungrab" symbol="gdk_display_pointer_ungrab">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="time_" type="guint32"/>
-                               </parameters>
-                       </method>
                        <method name="put_event" symbol="gdk_display_put_event">
                                <return-type type="void"/>
                                <parameters>
@@ -2376,13 +2092,6 @@
                                        <parameter name="selection" type="GdkAtom"/>
                                </parameters>
                        </method>
-                       <method name="set_device_hooks" symbol="gdk_display_set_device_hooks">
-                               <return-type type="GdkDisplayDeviceHooks*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="new_hooks" type="GdkDisplayDeviceHooks*"/>
-                               </parameters>
-                       </method>
                        <method name="set_double_click_distance" symbol="gdk_display_set_double_click_distance">
                                <return-type type="void"/>
                                <parameters>
@@ -2397,13 +2106,6 @@
                                        <parameter name="msec" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="set_pointer_hooks" symbol="gdk_display_set_pointer_hooks">
-                               <return-type type="GdkDisplayPointerHooks*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="new_hooks" type="GdkDisplayPointerHooks*"/>
-                               </parameters>
-                       </method>
                        <method name="store_clipboard" symbol="gdk_display_store_clipboard">
                                <return-type type="void"/>
                                <parameters>
@@ -2462,30 +2164,11 @@
                                        <parameter name="display" type="GdkDisplay*"/>
                                </parameters>
                        </method>
-                       <method name="warp_device" symbol="gdk_display_warp_device">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="device" type="GdkDevice*"/>
-                                       <parameter name="screen" type="GdkScreen*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="warp_pointer" symbol="gdk_display_warp_pointer">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="screen" type="GdkScreen*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                               </parameters>
-                       </method>
                        <signal name="closed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="is_error" type="gboolean"/>
+                                       <parameter name="object" type="GdkDisplay*"/>
+                                       <parameter name="p0" type="gboolean"/>
                                </parameters>
                        </signal>
                        <signal name="opened" when="LAST">
@@ -2494,31 +2177,6 @@
                                        <parameter name="object" type="GdkDisplay*"/>
                                </parameters>
                        </signal>
-                       <vfunc name="get_default_screen">
-                               <return-type type="GdkScreen*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="get_display_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="get_n_screens">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="get_screen">
-                               <return-type type="GdkScreen*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="screen_num" type="gint"/>
-                               </parameters>
-                       </vfunc>
                </object>
                <object name="GdkDisplayManager" parent="GObject" type-name="GdkDisplayManager" get-type="gdk_display_manager_get_type">
                        <method name="get" symbol="gdk_display_manager_get">
@@ -2527,19 +2185,26 @@
                        <method name="get_default_display" symbol="gdk_display_manager_get_default_display">
                                <return-type type="GdkDisplay*"/>
                                <parameters>
-                                       <parameter name="display_manager" type="GdkDisplayManager*"/>
+                                       <parameter name="manager" type="GdkDisplayManager*"/>
                                </parameters>
                        </method>
                        <method name="list_displays" symbol="gdk_display_manager_list_displays">
                                <return-type type="GSList*"/>
                                <parameters>
-                                       <parameter name="display_manager" type="GdkDisplayManager*"/>
+                                       <parameter name="manager" type="GdkDisplayManager*"/>
+                               </parameters>
+                       </method>
+                       <method name="open_display" symbol="gdk_display_manager_open_display">
+                               <return-type type="GdkDisplay*"/>
+                               <parameters>
+                                       <parameter name="manager" type="GdkDisplayManager*"/>
+                                       <parameter name="name" type="gchar*"/>
                                </parameters>
                        </method>
                        <method name="set_default_display" symbol="gdk_display_manager_set_default_display">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="display_manager" type="GdkDisplayManager*"/>
+                                       <parameter name="manager" type="GdkDisplayManager*"/>
                                        <parameter name="display" type="GdkDisplay*"/>
                                </parameters>
                        </method>
@@ -2547,8 +2212,8 @@
                        <signal name="display-opened" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="display_manager" type="GdkDisplayManager*"/>
-                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="object" type="GdkDisplayManager*"/>
+                                       <parameter name="p0" type="GdkDisplay*"/>
                                </parameters>
                        </signal>
                </object>
@@ -2559,12 +2224,24 @@
                                        <parameter name="context" type="GdkDragContext*"/>
                                </parameters>
                        </method>
+                       <method name="get_dest_window" symbol="gdk_drag_context_get_dest_window">
+                               <return-type type="GdkWindow*"/>
+                               <parameters>
+                                       <parameter name="context" type="GdkDragContext*"/>
+                               </parameters>
+                       </method>
                        <method name="get_device" symbol="gdk_drag_context_get_device">
                                <return-type type="GdkDevice*"/>
                                <parameters>
                                        <parameter name="context" type="GdkDragContext*"/>
                                </parameters>
                        </method>
+                       <method name="get_protocol" symbol="gdk_drag_context_get_protocol">
+                               <return-type type="GdkDragProtocol"/>
+                               <parameters>
+                                       <parameter name="context" type="GdkDragContext*"/>
+                               </parameters>
+                       </method>
                        <method name="get_selected_action" symbol="gdk_drag_context_get_selected_action">
                                <return-type type="GdkDragAction"/>
                                <parameters>
@@ -2589,9 +2266,6 @@
                                        <parameter name="context" type="GdkDragContext*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gdk_drag_context_new">
-                               <return-type type="GdkDragContext*"/>
-                       </constructor>
                        <method name="set_device" symbol="gdk_drag_context_set_device">
                                <return-type type="void"/>
                                <parameters>
@@ -2600,53 +2274,6 @@
                                </parameters>
                        </method>
                </object>
-               <object name="GdkDrawable" parent="GObject" type-name="GdkDrawable" get-type="gdk_drawable_get_type">
-                       <method name="get_clip_region" symbol="gdk_drawable_get_clip_region">
-                               <return-type type="cairo_region_t*"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_visible_region" symbol="gdk_drawable_get_visible_region">
-                               <return-type type="cairo_region_t*"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                               </parameters>
-                       </method>
-                       <vfunc name="create_cairo_surface">
-                               <return-type type="cairo_surface_t*"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                                       <parameter name="width" type="int"/>
-                                       <parameter name="height" type="int"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="get_clip_region">
-                               <return-type type="cairo_region_t*"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="get_visible_region">
-                               <return-type type="cairo_region_t*"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="ref_cairo_surface">
-                               <return-type type="cairo_surface_t*"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="set_cairo_clip">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                               </parameters>
-                       </vfunc>
-               </object>
                <object name="GdkKeymap" parent="GObject" type-name="GdkKeymap" get-type="gdk_keymap_get_type">
                        <method name="add_virtual_modifiers" symbol="gdk_keymap_add_virtual_modifiers">
                                <return-type type="void"/>
@@ -2737,19 +2364,19 @@
                        <signal name="direction-changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="keymap" type="GdkKeymap*"/>
+                                       <parameter name="object" type="GdkKeymap*"/>
                                </parameters>
                        </signal>
                        <signal name="keys-changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="keymap" type="GdkKeymap*"/>
+                                       <parameter name="object" type="GdkKeymap*"/>
                                </parameters>
                        </signal>
                        <signal name="state-changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="keymap" type="GdkKeymap*"/>
+                                       <parameter name="object" type="GdkKeymap*"/>
                                </parameters>
                        </signal>
                </object>
@@ -2961,19 +2588,19 @@
                        <signal name="composited-changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="object" type="GdkScreen*"/>
                                </parameters>
                        </signal>
                        <signal name="monitors-changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="object" type="GdkScreen*"/>
                                </parameters>
                        </signal>
                        <signal name="size-changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="object" type="GdkScreen*"/>
                                </parameters>
                        </signal>
                </object>
@@ -3073,7 +2700,7 @@
                                </parameters>
                        </method>
                </object>
-               <object name="GdkWindow" parent="GdkDrawable" type-name="GdkWindow" get-type="gdk_window_object_get_type">
+               <object name="GdkWindow" parent="GObject" type-name="GdkWindow" get-type="gdk_window_get_type">
                        <method name="add_filter" symbol="gdk_window_add_filter">
                                <return-type type="void"/>
                                <parameters>
@@ -3219,19 +2846,6 @@
                                        <parameter name="timestamp" type="guint32"/>
                                </parameters>
                        </method>
-                       <method name="foreign_new" symbol="gdk_window_foreign_new">
-                               <return-type type="GdkWindow*"/>
-                               <parameters>
-                                       <parameter name="anid" type="GdkNativeWindow"/>
-                               </parameters>
-                       </method>
-                       <method name="foreign_new_for_display" symbol="gdk_window_foreign_new_for_display">
-                               <return-type type="GdkWindow*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="anid" type="GdkNativeWindow"/>
-                               </parameters>
-                       </method>
                        <method name="freeze_toplevel_updates_libgtk_only" symbol="gdk_window_freeze_toplevel_updates_libgtk_only">
                                <return-type type="void"/>
                                <parameters>
@@ -3274,6 +2888,12 @@
                                        <parameter name="window" type="GdkWindow*"/>
                                </parameters>
                        </method>
+                       <method name="get_clip_region" symbol="gdk_window_get_clip_region">
+                               <return-type type="cairo_region_t*"/>
+                               <parameters>
+                                       <parameter name="window" type="GdkWindow*"/>
+                               </parameters>
+                       </method>
                        <method name="get_composited" symbol="gdk_window_get_composited">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -3362,7 +2982,6 @@
                                        <parameter name="y" type="gint*"/>
                                        <parameter name="width" type="gint*"/>
                                        <parameter name="height" type="gint*"/>
-                                       <parameter name="depth" type="gint*"/>
                                </parameters>
                        </method>
                        <method name="get_group" symbol="gdk_window_get_group">
@@ -3438,6 +3057,13 @@
                                        <parameter name="window" type="GdkWindow*"/>
                                </parameters>
                        </method>
+                       <method name="get_source_events" symbol="gdk_window_get_source_events">
+                               <return-type type="GdkEventMask"/>
+                               <parameters>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="source" type="GdkInputSource"/>
+                               </parameters>
+                       </method>
                        <method name="get_state" symbol="gdk_window_get_state">
                                <return-type type="GdkWindowState"/>
                                <parameters>
@@ -3475,6 +3101,12 @@
                                        <parameter name="data" type="gpointer*"/>
                                </parameters>
                        </method>
+                       <method name="get_visible_region" symbol="gdk_window_get_visible_region">
+                               <return-type type="cairo_region_t*"/>
+                               <parameters>
+                                       <parameter name="window" type="GdkWindow*"/>
+                               </parameters>
+                       </method>
                        <method name="get_visual" symbol="gdk_window_get_visual">
                                <return-type type="GdkVisual*"/>
                                <parameters>
@@ -3575,19 +3207,6 @@
                                        <parameter name="window" type="GdkWindow*"/>
                                </parameters>
                        </method>
-                       <method name="lookup" symbol="gdk_window_lookup">
-                               <return-type type="GdkWindow*"/>
-                               <parameters>
-                                       <parameter name="anid" type="GdkNativeWindow"/>
-                               </parameters>
-                       </method>
-                       <method name="lookup_for_display" symbol="gdk_window_lookup_for_display">
-                               <return-type type="GdkWindow*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="anid" type="GdkNativeWindow"/>
-                               </parameters>
-                       </method>
                        <method name="lower" symbol="gdk_window_lower">
                                <return-type type="void"/>
                                <parameters>
@@ -3905,6 +3524,14 @@
                                        <parameter name="skips_taskbar" type="gboolean"/>
                                </parameters>
                        </method>
+                       <method name="set_source_events" symbol="gdk_window_set_source_events">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="source" type="GdkInputSource"/>
+                                       <parameter name="event_mask" type="GdkEventMask"/>
+                               </parameters>
+                       </method>
                        <method name="set_startup_id" symbol="gdk_window_set_startup_id">
                                <return-type type="void"/>
                                <parameters>
@@ -4028,37 +3655,37 @@
                        <signal name="create-surface" when="LAST">
                                <return-type type="CairoSurface*"/>
                                <parameters>
-                                       <parameter name="object" type="GdkWindow*"/>
-                                       <parameter name="p0" type="gint"/>
-                                       <parameter name="p1" type="gint"/>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
                                </parameters>
                        </signal>
                        <signal name="from-embedder" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GdkWindow*"/>
-                                       <parameter name="p0" type="gdouble"/>
-                                       <parameter name="p1" type="gdouble"/>
-                                       <parameter name="p2" type="gpointer"/>
-                                       <parameter name="p3" type="gpointer"/>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="embedder_x" type="gdouble"/>
+                                       <parameter name="embedder_y" type="gdouble"/>
+                                       <parameter name="offscreen_x" type="gpointer"/>
+                                       <parameter name="offscreen_y" type="gpointer"/>
                                </parameters>
                        </signal>
                        <signal name="pick-embedded-child" when="LAST">
                                <return-type type="GdkWindow*"/>
                                <parameters>
-                                       <parameter name="object" type="GdkWindow*"/>
-                                       <parameter name="p0" type="gdouble"/>
-                                       <parameter name="p1" type="gdouble"/>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
                                </parameters>
                        </signal>
                        <signal name="to-embedder" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GdkWindow*"/>
-                                       <parameter name="p0" type="gdouble"/>
-                                       <parameter name="p1" type="gdouble"/>
-                                       <parameter name="p2" type="gpointer"/>
-                                       <parameter name="p3" type="gpointer"/>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="offscreen_x" type="gdouble"/>
+                                       <parameter name="offscreen_y" type="gdouble"/>
+                                       <parameter name="embedder_x" type="gpointer"/>
+                                       <parameter name="embedder_y" type="gpointer"/>
                                </parameters>
                        </signal>
                </object>

diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines
index a912cd84cd95a74a8bb27e73ce53cf0f309faae6..4cc33b2dc44cb8570c13a17639840dbc078e85a4 100644 (file)
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines
@@ -1,2 +1,3 @@
+-DGDK_COMPILATION
 -DGDK_DISABLE_DEPRECATED
 -DGSEAL_ENABLE

diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.excludes b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.excludes
new file mode 100644 (file)
index 0000000..e0d9187
--- /dev/null
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.excludes
@@ -0,0 +1 @@
+gdkx11device.*h

diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files
index 490ca8bf60b0cefa276f277dad221720b85088e8..8a07537afde8c294630be11d0d18b53328c6bb0f 100644 (file)
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files
@@ -1,2 +1,3 @@
 include/gtk-3.0/gdk/gdkx.h
-lib/libgdk-x11-3.0.so
+include/gtk-3.0/gdk/x11
+lib/libgdk-3.0.so

diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi
index b196f1767d4b9dfd5d7d2ae689b68118e47a1cc3..72f77c1b1c0270a353c4aa12f2042bc19fc5cd15 100644 (file)
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi
@@ -1,18 +1,6 @@
 <?xml version="1.0"?>
 <api version="1.0">
        <namespace name="Gdk">
-               <function name="gdkx_visual_get" symbol="gdkx_visual_get">
-                       <return-type type="GdkVisual*"/>
-                       <parameters>
-                               <parameter name="xvisualid" type="VisualID"/>
-                       </parameters>
-               </function>
-               <function name="net_wm_supports" symbol="gdk_net_wm_supports">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="property" type="GdkAtom"/>
-                       </parameters>
-               </function>
                <function name="x11_atom_to_xatom" symbol="gdk_x11_atom_to_xatom">
                        <return-type type="Atom"/>
                        <parameters>
@@ -26,98 +14,16 @@
                                <parameter name="atom" type="GdkAtom"/>
                        </parameters>
                </function>
-               <function name="x11_cursor_get_xcursor" symbol="gdk_x11_cursor_get_xcursor">
-                       <return-type type="Cursor"/>
-                       <parameters>
-                               <parameter name="cursor" type="GdkCursor*"/>
-                       </parameters>
-               </function>
-               <function name="x11_cursor_get_xdisplay" symbol="gdk_x11_cursor_get_xdisplay">
-                       <return-type type="Display*"/>
-                       <parameters>
-                               <parameter name="cursor" type="GdkCursor*"/>
-                       </parameters>
-               </function>
-               <function name="x11_display_broadcast_startup_message" symbol="gdk_x11_display_broadcast_startup_message">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                               <parameter name="message_type" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="x11_display_error_trap_pop" symbol="gdk_x11_display_error_trap_pop">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                       </parameters>
-               </function>
-               <function name="x11_display_error_trap_pop_ignored" symbol="gdk_x11_display_error_trap_pop_ignored">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                       </parameters>
-               </function>
-               <function name="x11_display_error_trap_push" symbol="gdk_x11_display_error_trap_push">
+               <function name="x11_free_compound_text" symbol="gdk_x11_free_compound_text">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                       </parameters>
-               </function>
-               <function name="x11_display_get_startup_notification_id" symbol="gdk_x11_display_get_startup_notification_id">
-                       <return-type type="gchar*"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                       </parameters>
-               </function>
-               <function name="x11_display_get_user_time" symbol="gdk_x11_display_get_user_time">
-                       <return-type type="guint32"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
+                               <parameter name="ctext" type="guchar*"/>
                        </parameters>
                </function>
-               <function name="x11_display_get_xdisplay" symbol="gdk_x11_display_get_xdisplay">
-                       <return-type type="Display*"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                       </parameters>
-               </function>
-               <function name="x11_display_grab" symbol="gdk_x11_display_grab">
+               <function name="x11_free_text_list" symbol="gdk_x11_free_text_list">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                       </parameters>
-               </function>
-               <function name="x11_display_set_cursor_theme" symbol="gdk_x11_display_set_cursor_theme">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                               <parameter name="theme" type="gchar*"/>
-                               <parameter name="size" type="gint"/>
-                       </parameters>
-               </function>
-               <function name="x11_display_set_startup_notification_id" symbol="gdk_x11_display_set_startup_notification_id">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                               <parameter name="startup_id" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="x11_display_ungrab" symbol="gdk_x11_display_ungrab">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                       </parameters>
-               </function>
-               <function name="x11_drawable_get_xdisplay" symbol="gdk_x11_drawable_get_xdisplay">
-                       <return-type type="Display*"/>
-                       <parameters>
-                               <parameter name="drawable" type="GdkDrawable*"/>
-                       </parameters>
-               </function>
-               <function name="x11_drawable_get_xid" symbol="gdk_x11_drawable_get_xid">
-                       <return-type type="XID"/>
-                       <parameters>
-                               <parameter name="drawable" type="GdkDrawable*"/>
+                               <parameter name="list" type="gchar**"/>
                        </parameters>
                </function>
                <function name="x11_get_default_root_xwindow" symbol="gdk_x11_get_default_root_xwindow">
@@ -178,72 +84,14 @@
                                <parameter name="n_events" type="gint"/>
                        </parameters>
                </function>
-               <function name="x11_screen_get_monitor_output" symbol="gdk_x11_screen_get_monitor_output">
-                       <return-type type="XID"/>
-                       <parameters>
-                               <parameter name="screen" type="GdkScreen*"/>
-                               <parameter name="monitor_num" type="gint"/>
-                       </parameters>
-               </function>
-               <function name="x11_screen_get_screen_number" symbol="gdk_x11_screen_get_screen_number">
-                       <return-type type="int"/>
-                       <parameters>
-                               <parameter name="screen" type="GdkScreen*"/>
-                       </parameters>
-               </function>
-               <function name="x11_screen_get_window_manager_name" symbol="gdk_x11_screen_get_window_manager_name">
-                       <return-type type="char*"/>
-                       <parameters>
-                               <parameter name="screen" type="GdkScreen*"/>
-                       </parameters>
-               </function>
-               <function name="x11_screen_get_xscreen" symbol="gdk_x11_screen_get_xscreen">
-                       <return-type type="Screen*"/>
-                       <parameters>
-                               <parameter name="screen" type="GdkScreen*"/>
-                       </parameters>
-               </function>
-               <function name="x11_screen_lookup_visual" symbol="gdk_x11_screen_lookup_visual">
-                       <return-type type="GdkVisual*"/>
-                       <parameters>
-                               <parameter name="screen" type="GdkScreen*"/>
-                               <parameter name="xvisualid" type="VisualID"/>
-                       </parameters>
-               </function>
-               <function name="x11_screen_supports_net_wm_hint" symbol="gdk_x11_screen_supports_net_wm_hint">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="screen" type="GdkScreen*"/>
-                               <parameter name="property" type="GdkAtom"/>
-                       </parameters>
-               </function>
-               <function name="x11_ungrab_server" symbol="gdk_x11_ungrab_server">
-                       <return-type type="void"/>
-               </function>
-               <function name="x11_visual_get_xvisual" symbol="gdk_x11_visual_get_xvisual">
-                       <return-type type="Visual*"/>
-                       <parameters>
-                               <parameter name="visual" type="GdkVisual*"/>
-                       </parameters>
-               </function>
-               <function name="x11_window_get_drawable_impl" symbol="gdk_x11_window_get_drawable_impl">
-                       <return-type type="GdkDrawable*"/>
-                       <parameters>
-                               <parameter name="window" type="GdkWindow*"/>
-                       </parameters>
-               </function>
-               <function name="x11_window_move_to_current_desktop" symbol="gdk_x11_window_move_to_current_desktop">
+               <function name="x11_set_sm_client_id" symbol="gdk_x11_set_sm_client_id">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="window" type="GdkWindow*"/>
+                               <parameter name="sm_client_id" type="gchar*"/>
                        </parameters>
                </function>
-               <function name="x11_window_set_user_time" symbol="gdk_x11_window_set_user_time">
+               <function name="x11_ungrab_server" symbol="gdk_x11_ungrab_server">
                        <return-type type="void"/>
-                       <parameters>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="timestamp" type="guint32"/>
-                       </parameters>
                </function>
                <function name="x11_xatom_to_atom" symbol="gdk_x11_xatom_to_atom">
                        <return-type type="GdkAtom"/>
@@ -258,18 +106,243 @@
                                <parameter name="xatom" type="Atom"/>
                        </parameters>
                </function>
-               <function name="xid_table_lookup" symbol="gdk_xid_table_lookup">
-                       <return-type type="gpointer"/>
-                       <parameters>
-                               <parameter name="xid" type="XID"/>
-                       </parameters>
-               </function>
-               <function name="xid_table_lookup_for_display" symbol="gdk_xid_table_lookup_for_display">
-                       <return-type type="gpointer"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                               <parameter name="xid" type="XID"/>
-                       </parameters>
-               </function>
+               <struct name="GdkX11AppLaunchContextClass">
+               </struct>
+               <struct name="GdkX11CursorClass">
+               </struct>
+               <struct name="GdkX11DisplayClass">
+               </struct>
+               <struct name="GdkX11DisplayManagerClass">
+               </struct>
+               <struct name="GdkX11DragContextClass">
+               </struct>
+               <struct name="GdkX11KeymapClass">
+               </struct>
+               <struct name="GdkX11ScreenClass">
+               </struct>
+               <struct name="GdkX11VisualClass">
+               </struct>
+               <struct name="GdkX11WindowClass">
+               </struct>
+               <object name="GdkX11AppLaunchContext" parent="GdkAppLaunchContext" type-name="GdkX11AppLaunchContext" get-type="gdk_x11_app_launch_context_get_type">
+               </object>
+               <object name="GdkX11Cursor" parent="GdkCursor" type-name="GdkX11Cursor" get-type="gdk_x11_cursor_get_type">
+                       <method name="get_xcursor" symbol="gdk_x11_cursor_get_xcursor">
+                               <return-type type="Cursor"/>
+                               <parameters>
+                                       <parameter name="cursor" type="GdkCursor*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_xdisplay" symbol="gdk_x11_cursor_get_xdisplay">
+                               <return-type type="Display*"/>
+                               <parameters>
+                                       <parameter name="cursor" type="GdkCursor*"/>
+                               </parameters>
+                       </method>
+               </object>
+               <object name="GdkX11Display" parent="GdkDisplay" type-name="GdkX11Display" get-type="gdk_x11_display_get_type">
+                       <implements>
+                               <interface name="GdkEventTranslator"/>
+                       </implements>
+                       <method name="broadcast_startup_message" symbol="gdk_x11_display_broadcast_startup_message">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="message_type" type="char*"/>
+                               </parameters>
+                       </method>
+                       <method name="error_trap_pop" symbol="gdk_x11_display_error_trap_pop">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                               </parameters>
+                       </method>
+                       <method name="error_trap_pop_ignored" symbol="gdk_x11_display_error_trap_pop_ignored">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                               </parameters>
+                       </method>
+                       <method name="error_trap_push" symbol="gdk_x11_display_error_trap_push">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_startup_notification_id" symbol="gdk_x11_display_get_startup_notification_id">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_user_time" symbol="gdk_x11_display_get_user_time">
+                               <return-type type="guint32"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_xdisplay" symbol="gdk_x11_display_get_xdisplay">
+                               <return-type type="Display*"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                               </parameters>
+                       </method>
+                       <method name="grab" symbol="gdk_x11_display_grab">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_cursor_theme" symbol="gdk_x11_display_set_cursor_theme">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="theme" type="gchar*"/>
+                                       <parameter name="size" type="gint"/>
+                               </parameters>
+                       </method>
+                       <method name="set_startup_notification_id" symbol="gdk_x11_display_set_startup_notification_id">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="startup_id" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="string_to_compound_text" symbol="gdk_x11_display_string_to_compound_text">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="encoding" type="GdkAtom*"/>
+                                       <parameter name="format" type="gint*"/>
+                                       <parameter name="ctext" type="guchar**"/>
+                                       <parameter name="length" type="gint*"/>
+                               </parameters>
+                       </method>
+                       <method name="text_property_to_text_list" symbol="gdk_x11_display_text_property_to_text_list">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="encoding" type="GdkAtom"/>
+                                       <parameter name="format" type="gint"/>
+                                       <parameter name="text" type="guchar*"/>
+                                       <parameter name="length" type="gint"/>
+                                       <parameter name="list" type="gchar***"/>
+                               </parameters>
+                       </method>
+                       <method name="ungrab" symbol="gdk_x11_display_ungrab">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                               </parameters>
+                       </method>
+                       <method name="utf8_to_compound_text" symbol="gdk_x11_display_utf8_to_compound_text">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="encoding" type="GdkAtom*"/>
+                                       <parameter name="format" type="gint*"/>
+                                       <parameter name="ctext" type="guchar**"/>
+                                       <parameter name="length" type="gint*"/>
+                               </parameters>
+                       </method>
+               </object>
+               <object name="GdkX11DisplayManager" parent="GdkDisplayManager" type-name="GdkX11DisplayManager" get-type="gdk_x11_display_manager_get_type">
+               </object>
+               <object name="GdkX11DragContext" parent="GdkDragContext" type-name="GdkX11DragContext" get-type="gdk_x11_drag_context_get_type">
+               </object>
+               <object name="GdkX11Keymap" parent="GdkKeymap" type-name="GdkX11Keymap" get-type="gdk_x11_keymap_get_type">
+               </object>
+               <object name="GdkX11Screen" parent="GdkScreen" type-name="GdkX11Screen" get-type="gdk_x11_screen_get_type">
+                       <method name="get_monitor_output" symbol="gdk_x11_screen_get_monitor_output">
+                               <return-type type="XID"/>
+                               <parameters>
+                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="monitor_num" type="gint"/>
+                               </parameters>
+                       </method>
+                       <method name="get_screen_number" symbol="gdk_x11_screen_get_screen_number">
+                               <return-type type="int"/>
+                               <parameters>
+                                       <parameter name="screen" type="GdkScreen*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_window_manager_name" symbol="gdk_x11_screen_get_window_manager_name">
+                               <return-type type="char*"/>
+                               <parameters>
+                                       <parameter name="screen" type="GdkScreen*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_xscreen" symbol="gdk_x11_screen_get_xscreen">
+                               <return-type type="Screen*"/>
+                               <parameters>
+                                       <parameter name="screen" type="GdkScreen*"/>
+                               </parameters>
+                       </method>
+                       <method name="lookup_visual" symbol="gdk_x11_screen_lookup_visual">
+                               <return-type type="GdkVisual*"/>
+                               <parameters>
+                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="xvisualid" type="VisualID"/>
+                               </parameters>
+                       </method>
+                       <method name="supports_net_wm_hint" symbol="gdk_x11_screen_supports_net_wm_hint">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="property" type="GdkAtom"/>
+                               </parameters>
+                       </method>
+                       <signal name="window-manager-changed" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="object" type="GdkX11Screen*"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GdkX11Visual" parent="GdkVisual" type-name="GdkX11Visual" get-type="gdk_x11_visual_get_type">
+                       <method name="get_xvisual" symbol="gdk_x11_visual_get_xvisual">
+                               <return-type type="Visual*"/>
+                               <parameters>
+                                       <parameter name="visual" type="GdkVisual*"/>
+                               </parameters>
+                       </method>
+               </object>
+               <object name="GdkX11Window" parent="GdkWindow" type-name="GdkX11Window" get-type="gdk_x11_window_get_type">
+                       <method name="foreign_new_for_display" symbol="gdk_x11_window_foreign_new_for_display">
+                               <return-type type="GdkWindow*"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="window" type="Window"/>
+                               </parameters>
+                       </method>
+                       <method name="get_xid" symbol="gdk_x11_window_get_xid">
+                               <return-type type="Window"/>
+                               <parameters>
+                                       <parameter name="window" type="GdkWindow*"/>
+                               </parameters>
+                       </method>
+                       <method name="lookup_for_display" symbol="gdk_x11_window_lookup_for_display">
+                               <return-type type="GdkWindow*"/>
+                               <parameters>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="window" type="Window"/>
+                               </parameters>
+                       </method>
+                       <method name="move_to_current_desktop" symbol="gdk_x11_window_move_to_current_desktop">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="window" type="GdkWindow*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_user_time" symbol="gdk_x11_window_set_user_time">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="timestamp" type="guint32"/>
+                               </parameters>
+                       </method>
+               </object>
        </namespace>
 </api>

diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata
index a8c19a9e16e59833f5ec71eeac4606533889e6e9..2561a026b9012ef0c11936bb120b1f7288d7db26 100644 (file)
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata
@@ -4,7 +4,4 @@ XID name="uint32"
 XImage name="pointer"
 GC name="pointer"
 Display name="pointer"
-gdkx_visual_get name="x11_visual_get"
-gdk_net_wm_supports name="x11_net_wm_supports"
-gdk_xid_table_lookup name="x11_xid_table_lookup"
-gdk_xid_table_lookup_for_display name="x11_xid_table_lookup_for_display"
+GdkEventTranslator hidden="1"

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
index a1cc6bd7477cba74ec474d4dbb190a0a62c530e3..a19a7e7d35638021b63cae1b20d77c12643f419d 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
@@ -67,9 +67,6 @@ namespace Gtk {
                public GLib.SList<GLib.File> get_files ();
        }
 
-       [CCode (has_target = false)]
-       public delegate void CallbackMarshal (GLib.Object object, void* data, Arg[] args);
-
        public delegate void ActionCallback (Action action);
 
        public delegate void MenuPositionFunc (Gtk.Menu menu, out int x, out int y, out bool push_in);

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.excludes b/vapi/packages/gtk+-3.0/gtk+-3.0.excludes
index 402971681c0cf89c57ac766bad98266db468c9cf..d5efc7470247b812defe769b6b71cf815990586d 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.excludes
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.excludes
@@ -1,3 +1,3 @@
-gtkfilesystem.h
+gtkcellareaboxcontextprivate.h
 gtktextdisplay.h
 gtktextlayout.h

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.files b/vapi/packages/gtk+-3.0/gtk+-3.0.files
index 212e69cc4357c56b77e136cc0391e4881aadabaf..9b819f7c02416d45010fa56b08de31cd7a178a47 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.files
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.files
@@ -1,2 +1,2 @@
 include/gtk-3.0/gtk
-lib/libgtk-x11-3.0.so
+lib/libgtk-3.0.so

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
index 9688d07b5601399d9a2e725cf83a1b9b5640c261..8d645fcb37333ae48f22d45e798932f5ea649b8d 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
@@ -497,9 +497,6 @@
                                <parameter name="target" type="GtkIconSize"/>
                        </parameters>
                </function>
-               <function name="identifier_get_type" symbol="gtk_identifier_get_type">
-                       <return-type type="GType"/>
-               </function>
                <function name="init" symbol="gtk_init">
                        <return-type type="void"/>
                        <parameters>
@@ -507,13 +504,6 @@
                                <parameter name="argv" type="char***"/>
                        </parameters>
                </function>
-               <function name="init_add" symbol="gtk_init_add">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="function" type="GtkFunction"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </function>
                <function name="init_check" symbol="gtk_init_check">
                        <return-type type="gboolean"/>
                        <parameters>
@@ -907,43 +897,6 @@
                                <parameter name="event" type="GdkEvent*"/>
                        </parameters>
                </function>
-               <function name="quit_add" symbol="gtk_quit_add">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="main_level" type="guint"/>
-                               <parameter name="function" type="GtkFunction"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </function>
-               <function name="quit_add_destroy" symbol="gtk_quit_add_destroy">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="main_level" type="guint"/>
-                               <parameter name="object" type="GtkWidget*"/>
-                       </parameters>
-               </function>
-               <function name="quit_add_full" symbol="gtk_quit_add_full">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="main_level" type="guint"/>
-                               <parameter name="function" type="GtkFunction"/>
-                               <parameter name="marshal" type="GtkCallbackMarshal"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="destroy" type="GDestroyNotify"/>
-                       </parameters>
-               </function>
-               <function name="quit_remove" symbol="gtk_quit_remove">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="quit_handler_id" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="quit_remove_by_data" symbol="gtk_quit_remove_by_data">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </function>
                <function name="rc_add_default_file" symbol="gtk_rc_add_default_file">
                        <return-type type="void"/>
                        <parameters>
@@ -1060,6 +1013,172 @@
                                <parameter name="filenames" type="gchar**"/>
                        </parameters>
                </function>
+               <function name="render_activity" symbol="gtk_render_activity">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="width" type="gdouble"/>
+                               <parameter name="height" type="gdouble"/>
+                       </parameters>
+               </function>
+               <function name="render_arrow" symbol="gtk_render_arrow">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="angle" type="gdouble"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="size" type="gdouble"/>
+                       </parameters>
+               </function>
+               <function name="render_background" symbol="gtk_render_background">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="width" type="gdouble"/>
+                               <parameter name="height" type="gdouble"/>
+                       </parameters>
+               </function>
+               <function name="render_check" symbol="gtk_render_check">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="width" type="gdouble"/>
+                               <parameter name="height" type="gdouble"/>
+                       </parameters>
+               </function>
+               <function name="render_expander" symbol="gtk_render_expander">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="width" type="gdouble"/>
+                               <parameter name="height" type="gdouble"/>
+                       </parameters>
+               </function>
+               <function name="render_extension" symbol="gtk_render_extension">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="width" type="gdouble"/>
+                               <parameter name="height" type="gdouble"/>
+                               <parameter name="gap_side" type="GtkPositionType"/>
+                       </parameters>
+               </function>
+               <function name="render_focus" symbol="gtk_render_focus">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="width" type="gdouble"/>
+                               <parameter name="height" type="gdouble"/>
+                       </parameters>
+               </function>
+               <function name="render_frame" symbol="gtk_render_frame">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="width" type="gdouble"/>
+                               <parameter name="height" type="gdouble"/>
+                       </parameters>
+               </function>
+               <function name="render_frame_gap" symbol="gtk_render_frame_gap">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="width" type="gdouble"/>
+                               <parameter name="height" type="gdouble"/>
+                               <parameter name="gap_side" type="GtkPositionType"/>
+                               <parameter name="xy0_gap" type="gdouble"/>
+                               <parameter name="xy1_gap" type="gdouble"/>
+                       </parameters>
+               </function>
+               <function name="render_handle" symbol="gtk_render_handle">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="width" type="gdouble"/>
+                               <parameter name="height" type="gdouble"/>
+                       </parameters>
+               </function>
+               <function name="render_icon_pixbuf" symbol="gtk_render_icon_pixbuf">
+                       <return-type type="GdkPixbuf*"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="source" type="GtkIconSource*"/>
+                               <parameter name="size" type="GtkIconSize"/>
+                       </parameters>
+               </function>
+               <function name="render_layout" symbol="gtk_render_layout">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="layout" type="PangoLayout*"/>
+                       </parameters>
+               </function>
+               <function name="render_line" symbol="gtk_render_line">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x0" type="gdouble"/>
+                               <parameter name="y0" type="gdouble"/>
+                               <parameter name="x1" type="gdouble"/>
+                               <parameter name="y1" type="gdouble"/>
+                       </parameters>
+               </function>
+               <function name="render_option" symbol="gtk_render_option">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="width" type="gdouble"/>
+                               <parameter name="height" type="gdouble"/>
+                       </parameters>
+               </function>
+               <function name="render_slider" symbol="gtk_render_slider">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="context" type="GtkStyleContext*"/>
+                               <parameter name="cr" type="cairo_t*"/>
+                               <parameter name="x" type="gdouble"/>
+                               <parameter name="y" type="gdouble"/>
+                               <parameter name="width" type="gdouble"/>
+                               <parameter name="height" type="gdouble"/>
+                               <parameter name="orientation" type="GtkOrientation"/>
+                       </parameters>
+               </function>
                <function name="rgb_to_hsv" symbol="gtk_rgb_to_hsv">
                        <return-type type="void"/>
                        <parameters>
@@ -1134,9 +1253,6 @@
                                <parameter name="flags" type="guint"/>
                        </parameters>
                </function>
-               <function name="set_locale" symbol="gtk_set_locale">
-                       <return-type type="gchar*"/>
-               </function>
                <function name="show_about_dialog" symbol="gtk_show_about_dialog">
                        <return-type type="void"/>
                        <parameters>
@@ -1421,13 +1537,20 @@
                                <parameter name="data" type="gpointer"/>
                        </parameters>
                </callback>
-               <callback name="GtkCallbackMarshal">
-                       <return-type type="void"/>
+               <callback name="GtkCellAllocCallback">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="object" type="GObject*"/>
+                               <parameter name="renderer" type="GtkCellRenderer*"/>
+                               <parameter name="cell_area" type="GdkRectangle*"/>
+                               <parameter name="cell_background" type="GdkRectangle*"/>
+                               <parameter name="data" type="gpointer"/>
+                       </parameters>
+               </callback>
+               <callback name="GtkCellCallback">
+                       <return-type type="gboolean"/>
+                       <parameters>
+                               <parameter name="renderer" type="GtkCellRenderer*"/>
                                <parameter name="data" type="gpointer"/>
-                               <parameter name="n_args" type="guint"/>
-                               <parameter name="args" type="GtkArg*"/>
                        </parameters>
                </callback>
                <callback name="GtkCellLayoutDataFunc">
@@ -1538,12 +1661,6 @@
                                <parameter name="data" type="gpointer"/>
                        </parameters>
                </callback>
-               <callback name="GtkFunction">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
                <callback name="GtkIconViewForeachFunc">
                        <return-type type="void"/>
                        <parameters>
@@ -1628,6 +1745,14 @@
                                <parameter name="user_data" type="gpointer"/>
                        </parameters>
                </callback>
+               <callback name="GtkStylePropertyParser">
+                       <return-type type="gboolean"/>
+                       <parameters>
+                               <parameter name="string" type="gchar*"/>
+                               <parameter name="value" type="GValue*"/>
+                               <parameter name="error" type="GError**"/>
+                       </parameters>
+               </callback>
                <callback name="GtkTextBufferDeserializeFunc">
                        <return-type type="gboolean"/>
                        <parameters>
@@ -1791,16 +1916,6 @@
                                <parameter name="user_data" type="gpointer"/>
                        </parameters>
                </callback>
-               <callback name="GtkWindowKeysForeachFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="window" type="GtkWindow*"/>
-                               <parameter name="keyval" type="guint"/>
-                               <parameter name="modifiers" type="GdkModifierType"/>
-                               <parameter name="is_mnemonic" type="gboolean"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
                <struct name="GtkAccelGroupEntry">
                        <field name="key" type="GtkAccelKey"/>
                        <field name="closure" type="GClosure*"/>
@@ -1823,11 +1938,6 @@
                </struct>
                <struct name="GtkAllocation">
                </struct>
-               <struct name="GtkArg">
-                       <field name="type" type="GType"/>
-                       <field name="name" type="gchar*"/>
-                       <field name="d" type="gpointer"/>
-               </struct>
                <struct name="GtkBindingArg">
                        <field name="arg_type" type="GType"/>
                        <field name="d" type="gpointer"/>
@@ -2059,15 +2169,6 @@
                        <field name="minimum_size" type="gint"/>
                        <field name="natural_size" type="gint"/>
                </struct>
-               <struct name="GtkRulerMetric">
-                       <field name="metric_name" type="gchar*"/>
-                       <field name="abbrev" type="gchar*"/>
-                       <field name="pixels_per_unit" type="gdouble"/>
-                       <field name="ruler_scale" type="gdouble[]"/>
-                       <field name="subdivide" type="gint[]"/>
-               </struct>
-               <struct name="GtkSettingsPropertyValue">
-               </struct>
                <struct name="GtkSettingsValue">
                        <field name="origin" type="gchar*"/>
                        <field name="value" type="GValue"/>
@@ -2125,16 +2226,12 @@
                        <field name="bg_color" type="GdkColor"/>
                        <field name="fg_color" type="GdkColor"/>
                        <field name="rise" type="gint"/>
-                       <field name="padding1" type="gpointer"/>
                        <field name="underline" type="guint"/>
                        <field name="strikethrough" type="guint"/>
                        <field name="draw_bg" type="guint"/>
                        <field name="inside_selection" type="guint"/>
                        <field name="is_text" type="guint"/>
-                       <field name="pad1" type="guint"/>
-                       <field name="pad2" type="guint"/>
-                       <field name="pad3" type="guint"/>
-                       <field name="pad4" type="guint"/>
+                       <field name="padding" type="guint[]"/>
                </struct>
                <struct name="GtkTextBTree">
                </struct>
@@ -2179,6 +2276,56 @@
                        <field name="top" type="gint16"/>
                        <field name="bottom" type="gint16"/>
                </boxed>
+               <boxed name="GtkGradient" type-name="GtkGradient" get-type="gtk_gradient_get_type">
+                       <method name="add_color_stop" symbol="gtk_gradient_add_color_stop">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="gradient" type="GtkGradient*"/>
+                                       <parameter name="offset" type="gdouble"/>
+                                       <parameter name="color" type="GtkSymbolicColor*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new_linear" symbol="gtk_gradient_new_linear">
+                               <return-type type="GtkGradient*"/>
+                               <parameters>
+                                       <parameter name="x0" type="gdouble"/>
+                                       <parameter name="y0" type="gdouble"/>
+                                       <parameter name="x1" type="gdouble"/>
+                                       <parameter name="y1" type="gdouble"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_radial" symbol="gtk_gradient_new_radial">
+                               <return-type type="GtkGradient*"/>
+                               <parameters>
+                                       <parameter name="x0" type="gdouble"/>
+                                       <parameter name="y0" type="gdouble"/>
+                                       <parameter name="radius0" type="gdouble"/>
+                                       <parameter name="x1" type="gdouble"/>
+                                       <parameter name="y1" type="gdouble"/>
+                                       <parameter name="radius1" type="gdouble"/>
+                               </parameters>
+                       </constructor>
+                       <method name="ref" symbol="gtk_gradient_ref">
+                               <return-type type="GtkGradient*"/>
+                               <parameters>
+                                       <parameter name="gradient" type="GtkGradient*"/>
+                               </parameters>
+                       </method>
+                       <method name="resolve" symbol="gtk_gradient_resolve">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="gradient" type="GtkGradient*"/>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="resolved_gradient" type="cairo_pattern_t**"/>
+                               </parameters>
+                       </method>
+                       <method name="unref" symbol="gtk_gradient_unref">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="gradient" type="GtkGradient*"/>
+                               </parameters>
+                       </method>
+               </boxed>
                <boxed name="GtkIconInfo" type-name="GtkIconInfo" get-type="gtk_icon_info_get_type">
                        <method name="copy" symbol="gtk_icon_info_copy">
                                <return-type type="GtkIconInfo*"/>
@@ -2250,12 +2397,11 @@
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="load_symbolic_for_style" symbol="gtk_icon_info_load_symbolic_for_style">
+                       <method name="load_symbolic_for_context" symbol="gtk_icon_info_load_symbolic_for_context">
                                <return-type type="GdkPixbuf*"/>
                                <parameters>
                                        <parameter name="icon_info" type="GtkIconInfo*"/>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="state" type="GtkStateType"/>
+                                       <parameter name="context" type="GtkStyleContext*"/>
                                        <parameter name="was_symbolic" type="gboolean*"/>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
@@ -2321,7 +2467,15 @@
                                        <parameter name="state" type="GtkStateType"/>
                                        <parameter name="size" type="GtkIconSize"/>
                                        <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="char*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="render_icon_pixbuf" symbol="gtk_icon_set_render_icon_pixbuf">
+                               <return-type type="GdkPixbuf*"/>
+                               <parameters>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
                        </method>
                        <method name="unref" symbol="gtk_icon_set_unref">
@@ -2819,6 +2973,13 @@
                                        <parameter name="selection_data" type="GtkSelectionData*"/>
                                </parameters>
                        </method>
+                       <method name="get_data_with_length" symbol="gtk_selection_data_get_data_with_length">
+                               <return-type type="guchar*"/>
+                               <parameters>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
+                                       <parameter name="length" type="gint*"/>
+                               </parameters>
+                       </method>
                        <method name="get_display" symbol="gtk_selection_data_get_display">
                                <return-type type="GdkDisplay*"/>
                                <parameters>
@@ -2933,13 +3094,62 @@
                                        <parameter name="selection_data" type="GtkSelectionData*"/>
                                </parameters>
                        </method>
-                       <field name="_g_sealed__selection" type="GdkAtom"/>
-                       <field name="_g_sealed__target" type="GdkAtom"/>
-                       <field name="_g_sealed__type" type="GdkAtom"/>
-                       <field name="_g_sealed__format" type="gint"/>
-                       <field name="_g_sealed__data" type="guchar*"/>
-                       <field name="_g_sealed__length" type="gint"/>
-                       <field name="_g_sealed__display" type="GdkDisplay*"/>
+               </boxed>
+               <boxed name="GtkSymbolicColor" type-name="GtkSymbolicColor" get-type="gtk_symbolic_color_get_type">
+                       <constructor name="new_alpha" symbol="gtk_symbolic_color_new_alpha">
+                               <return-type type="GtkSymbolicColor*"/>
+                               <parameters>
+                                       <parameter name="color" type="GtkSymbolicColor*"/>
+                                       <parameter name="factor" type="gdouble"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_literal" symbol="gtk_symbolic_color_new_literal">
+                               <return-type type="GtkSymbolicColor*"/>
+                               <parameters>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_mix" symbol="gtk_symbolic_color_new_mix">
+                               <return-type type="GtkSymbolicColor*"/>
+                               <parameters>
+                                       <parameter name="color1" type="GtkSymbolicColor*"/>
+                                       <parameter name="color2" type="GtkSymbolicColor*"/>
+                                       <parameter name="factor" type="gdouble"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_name" symbol="gtk_symbolic_color_new_name">
+                               <return-type type="GtkSymbolicColor*"/>
+                               <parameters>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_shade" symbol="gtk_symbolic_color_new_shade">
+                               <return-type type="GtkSymbolicColor*"/>
+                               <parameters>
+                                       <parameter name="color" type="GtkSymbolicColor*"/>
+                                       <parameter name="factor" type="gdouble"/>
+                               </parameters>
+                       </constructor>
+                       <method name="ref" symbol="gtk_symbolic_color_ref">
+                               <return-type type="GtkSymbolicColor*"/>
+                               <parameters>
+                                       <parameter name="color" type="GtkSymbolicColor*"/>
+                               </parameters>
+                       </method>
+                       <method name="resolve" symbol="gtk_symbolic_color_resolve">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="color" type="GtkSymbolicColor*"/>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="resolved_color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="unref" symbol="gtk_symbolic_color_unref">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="color" type="GtkSymbolicColor*"/>
+                               </parameters>
+                       </method>
                </boxed>
                <boxed name="GtkTargetEntry" type-name="GtkTargetEntry" get-type="gtk_target_entry_get_type">
                        <method name="copy" symbol="gtk_target_entry_copy">
@@ -3088,8 +3298,8 @@
                        <field name="font" type="PangoFontDescription*"/>
                        <field name="font_scale" type="gdouble"/>
                        <field name="left_margin" type="gint"/>
-                       <field name="indent" type="gint"/>
                        <field name="right_margin" type="gint"/>
+                       <field name="indent" type="gint"/>
                        <field name="pixels_above_lines" type="gint"/>
                        <field name="pixels_below_lines" type="gint"/>
                        <field name="pixels_inside_wrap" type="gint"/>
@@ -3100,10 +3310,7 @@
                        <field name="invisible" type="guint"/>
                        <field name="bg_full_height" type="guint"/>
                        <field name="editable" type="guint"/>
-                       <field name="pad1" type="guint"/>
-                       <field name="pad2" type="guint"/>
-                       <field name="pad3" type="guint"/>
-                       <field name="pad4" type="guint"/>
+                       <field name="padding" type="guint[]"/>
                </boxed>
                <boxed name="GtkTextIter" type-name="GtkTextIter" get-type="gtk_text_iter_get_type">
                        <method name="backward_char" symbol="gtk_text_iter_backward_char">
@@ -3922,55 +4129,259 @@
                                </parameters>
                        </method>
                </boxed>
-               <enum name="GtkAlign" type-name="GtkAlign" get-type="gtk_align_get_type">
-                       <member name="GTK_ALIGN_FILL" value="0"/>
-                       <member name="GTK_ALIGN_START" value="1"/>
-                       <member name="GTK_ALIGN_END" value="2"/>
-                       <member name="GTK_ALIGN_CENTER" value="3"/>
-               </enum>
-               <enum name="GtkArrowPlacement" type-name="GtkArrowPlacement" get-type="gtk_arrow_placement_get_type">
-                       <member name="GTK_ARROWS_BOTH" value="0"/>
-                       <member name="GTK_ARROWS_START" value="1"/>
-                       <member name="GTK_ARROWS_END" value="2"/>
-               </enum>
-               <enum name="GtkArrowType" type-name="GtkArrowType" get-type="gtk_arrow_type_get_type">
-                       <member name="GTK_ARROW_UP" value="0"/>
-                       <member name="GTK_ARROW_DOWN" value="1"/>
-                       <member name="GTK_ARROW_LEFT" value="2"/>
-                       <member name="GTK_ARROW_RIGHT" value="3"/>
-                       <member name="GTK_ARROW_NONE" value="4"/>
-               </enum>
-               <enum name="GtkAssistantPageType" type-name="GtkAssistantPageType" get-type="gtk_assistant_page_type_get_type">
-                       <member name="GTK_ASSISTANT_PAGE_CONTENT" value="0"/>
-                       <member name="GTK_ASSISTANT_PAGE_INTRO" value="1"/>
-                       <member name="GTK_ASSISTANT_PAGE_CONFIRM" value="2"/>
-                       <member name="GTK_ASSISTANT_PAGE_SUMMARY" value="3"/>
-                       <member name="GTK_ASSISTANT_PAGE_PROGRESS" value="4"/>
-                       <member name="GTK_ASSISTANT_PAGE_CUSTOM" value="5"/>
-               </enum>
-               <enum name="GtkBuilderError" type-name="GtkBuilderError" get-type="gtk_builder_error_get_type">
-                       <member name="GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" value="0"/>
-                       <member name="GTK_BUILDER_ERROR_UNHANDLED_TAG" value="1"/>
-                       <member name="GTK_BUILDER_ERROR_MISSING_ATTRIBUTE" value="2"/>
-                       <member name="GTK_BUILDER_ERROR_INVALID_ATTRIBUTE" value="3"/>
-                       <member name="GTK_BUILDER_ERROR_INVALID_TAG" value="4"/>
-                       <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_SPREAD" value="1"/>
-                       <member name="GTK_BUTTONBOX_EDGE" value="2"/>
-                       <member name="GTK_BUTTONBOX_START" value="3"/>
-                       <member name="GTK_BUTTONBOX_END" value="4"/>
-                       <member name="GTK_BUTTONBOX_CENTER" value="5"/>
-               </enum>
-               <enum name="GtkButtonsType" type-name="GtkButtonsType" get-type="gtk_buttons_type_get_type">
-                       <member name="GTK_BUTTONS_NONE" value="0"/>
-                       <member name="GTK_BUTTONS_OK" value="1"/>
-                       <member name="GTK_BUTTONS_CLOSE" value="2"/>
-                       <member name="GTK_BUTTONS_CANCEL" value="3"/>
+               <boxed name="GtkWidgetPath" type-name="GtkWidgetPath" get-type="gtk_widget_path_get_type">
+                       <method name="append_type" symbol="gtk_widget_path_append_type">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="type" type="GType"/>
+                               </parameters>
+                       </method>
+                       <method name="copy" symbol="gtk_widget_path_copy">
+                               <return-type type="GtkWidgetPath*"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                               </parameters>
+                       </method>
+                       <method name="free" symbol="gtk_widget_path_free">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_object_type" symbol="gtk_widget_path_get_object_type">
+                               <return-type type="GType"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                               </parameters>
+                       </method>
+                       <method name="has_parent" symbol="gtk_widget_path_has_parent">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="type" type="GType"/>
+                               </parameters>
+                       </method>
+                       <method name="is_type" symbol="gtk_widget_path_is_type">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="type" type="GType"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_add_class" symbol="gtk_widget_path_iter_add_class">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_add_region" symbol="gtk_widget_path_iter_add_region">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="flags" type="GtkRegionFlags"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_clear_classes" symbol="gtk_widget_path_iter_clear_classes">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_clear_regions" symbol="gtk_widget_path_iter_clear_regions">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_get_name" symbol="gtk_widget_path_iter_get_name">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_get_object_type" symbol="gtk_widget_path_iter_get_object_type">
+                               <return-type type="GType"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_has_class" symbol="gtk_widget_path_iter_has_class">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_has_name" symbol="gtk_widget_path_iter_has_name">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_has_qclass" symbol="gtk_widget_path_iter_has_qclass">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="qname" type="GQuark"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_has_qname" symbol="gtk_widget_path_iter_has_qname">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="qname" type="GQuark"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_has_qregion" symbol="gtk_widget_path_iter_has_qregion">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="qname" type="GQuark"/>
+                                       <parameter name="flags" type="GtkRegionFlags*"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_has_region" symbol="gtk_widget_path_iter_has_region">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="flags" type="GtkRegionFlags*"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_list_classes" symbol="gtk_widget_path_iter_list_classes">
+                               <return-type type="GSList*"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_list_regions" symbol="gtk_widget_path_iter_list_regions">
+                               <return-type type="GSList*"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_remove_class" symbol="gtk_widget_path_iter_remove_class">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_remove_region" symbol="gtk_widget_path_iter_remove_region">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_set_name" symbol="gtk_widget_path_iter_set_name">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="iter_set_object_type" symbol="gtk_widget_path_iter_set_object_type">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="pos" type="gint"/>
+                                       <parameter name="type" type="GType"/>
+                               </parameters>
+                       </method>
+                       <method name="length" symbol="gtk_widget_path_length">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_widget_path_new">
+                               <return-type type="GtkWidgetPath*"/>
+                       </constructor>
+                       <method name="prepend_type" symbol="gtk_widget_path_prepend_type">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="type" type="GType"/>
+                               </parameters>
+                       </method>
+               </boxed>
+               <enum name="GtkAlign" type-name="GtkAlign" get-type="gtk_align_get_type">
+                       <member name="GTK_ALIGN_FILL" value="0"/>
+                       <member name="GTK_ALIGN_START" value="1"/>
+                       <member name="GTK_ALIGN_END" value="2"/>
+                       <member name="GTK_ALIGN_CENTER" value="3"/>
+               </enum>
+               <enum name="GtkArrowPlacement" type-name="GtkArrowPlacement" get-type="gtk_arrow_placement_get_type">
+                       <member name="GTK_ARROWS_BOTH" value="0"/>
+                       <member name="GTK_ARROWS_START" value="1"/>
+                       <member name="GTK_ARROWS_END" value="2"/>
+               </enum>
+               <enum name="GtkArrowType" type-name="GtkArrowType" get-type="gtk_arrow_type_get_type">
+                       <member name="GTK_ARROW_UP" value="0"/>
+                       <member name="GTK_ARROW_DOWN" value="1"/>
+                       <member name="GTK_ARROW_LEFT" value="2"/>
+                       <member name="GTK_ARROW_RIGHT" value="3"/>
+                       <member name="GTK_ARROW_NONE" value="4"/>
+               </enum>
+               <enum name="GtkAssistantPageType" type-name="GtkAssistantPageType" get-type="gtk_assistant_page_type_get_type">
+                       <member name="GTK_ASSISTANT_PAGE_CONTENT" value="0"/>
+                       <member name="GTK_ASSISTANT_PAGE_INTRO" value="1"/>
+                       <member name="GTK_ASSISTANT_PAGE_CONFIRM" value="2"/>
+                       <member name="GTK_ASSISTANT_PAGE_SUMMARY" value="3"/>
+                       <member name="GTK_ASSISTANT_PAGE_PROGRESS" value="4"/>
+                       <member name="GTK_ASSISTANT_PAGE_CUSTOM" value="5"/>
+               </enum>
+               <enum name="GtkBorderStyle" type-name="GtkBorderStyle" get-type="gtk_border_style_get_type">
+                       <member name="GTK_BORDER_STYLE_NONE" value="0"/>
+                       <member name="GTK_BORDER_STYLE_SOLID" value="1"/>
+                       <member name="GTK_BORDER_STYLE_INSET" value="2"/>
+                       <member name="GTK_BORDER_STYLE_OUTSET" value="3"/>
+               </enum>
+               <enum name="GtkBuilderError" type-name="GtkBuilderError" get-type="gtk_builder_error_get_type">
+                       <member name="GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" value="0"/>
+                       <member name="GTK_BUILDER_ERROR_UNHANDLED_TAG" value="1"/>
+                       <member name="GTK_BUILDER_ERROR_MISSING_ATTRIBUTE" value="2"/>
+                       <member name="GTK_BUILDER_ERROR_INVALID_ATTRIBUTE" value="3"/>
+                       <member name="GTK_BUILDER_ERROR_INVALID_TAG" value="4"/>
+                       <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_SPREAD" value="1"/>
+                       <member name="GTK_BUTTONBOX_EDGE" value="2"/>
+                       <member name="GTK_BUTTONBOX_START" value="3"/>
+                       <member name="GTK_BUTTONBOX_END" value="4"/>
+                       <member name="GTK_BUTTONBOX_CENTER" value="5"/>
+               </enum>
+               <enum name="GtkButtonsType" type-name="GtkButtonsType" get-type="gtk_buttons_type_get_type">
+                       <member name="GTK_BUTTONS_NONE" value="0"/>
+                       <member name="GTK_BUTTONS_OK" value="1"/>
+                       <member name="GTK_BUTTONS_CLOSE" value="2"/>
+                       <member name="GTK_BUTTONS_CANCEL" value="3"/>
                        <member name="GTK_BUTTONS_YES_NO" value="4"/>
                        <member name="GTK_BUTTONS_OK_CANCEL" value="5"/>
                </enum>
@@ -3989,6 +4400,9 @@
                        <member name="GTK_CORNER_TOP_RIGHT" value="2"/>
                        <member name="GTK_CORNER_BOTTOM_RIGHT" value="3"/>
                </enum>
+               <enum name="GtkCssProviderError" type-name="GtkCssProviderError" get-type="gtk_css_provider_error_get_type">
+                       <member name="GTK_CSS_PROVIDER_ERROR_FAILED" value="0"/>
+               </enum>
                <enum name="GtkDeleteType" type-name="GtkDeleteType" get-type="gtk_delete_type_get_type">
                        <member name="GTK_DELETE_CHARS" value="0"/>
                        <member name="GTK_DELETE_WORD_ENDS" value="1"/>
@@ -4112,11 +4526,6 @@
                        <member name="GTK_MESSAGE_ERROR" value="3"/>
                        <member name="GTK_MESSAGE_OTHER" value="4"/>
                </enum>
-               <enum name="GtkMetricType" type-name="GtkMetricType" get-type="gtk_metric_type_get_type">
-                       <member name="GTK_PIXELS" value="0"/>
-                       <member name="GTK_INCHES" value="1"/>
-                       <member name="GTK_CENTIMETERS" value="2"/>
-               </enum>
                <enum name="GtkMovementStep" type-name="GtkMovementStep" get-type="gtk_movement_step_get_type">
                        <member name="GTK_MOVEMENT_LOGICAL_POSITIONS" value="0"/>
                        <member name="GTK_MOVEMENT_VISUAL_POSITIONS" value="1"/>
@@ -4403,6 +4812,8 @@
                        <member name="GTK_STATE_PRELIGHT" value="2"/>
                        <member name="GTK_STATE_SELECTED" value="3"/>
                        <member name="GTK_STATE_INSENSITIVE" value="4"/>
+                       <member name="GTK_STATE_INCONSISTENT" value="5"/>
+                       <member name="GTK_STATE_FOCUSED" value="6"/>
                </enum>
                <enum name="GtkTextBufferTargetInfo" type-name="GtkTextBufferTargetInfo" get-type="gtk_text_buffer_target_info_get_type">
                        <member name="GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" value="-1"/>
@@ -4456,11 +4867,6 @@
                        <member name="GTK_UNIT_INCH" value="2"/>
                        <member name="GTK_UNIT_MM" value="3"/>
                </enum>
-               <enum name="GtkUpdateType" type-name="GtkUpdateType" get-type="gtk_update_type_get_type">
-                       <member name="GTK_UPDATE_CONTINUOUS" value="0"/>
-                       <member name="GTK_UPDATE_DISCONTINUOUS" value="1"/>
-                       <member name="GTK_UPDATE_DELAYED" value="2"/>
-               </enum>
                <enum name="GtkWidgetHelpType" type-name="GtkWidgetHelpType" get-type="gtk_widget_help_type_get_type">
                        <member name="GTK_WIDGET_HELP_TOOLTIP" value="0"/>
                        <member name="GTK_WIDGET_HELP_WHATS_THIS" value="1"/>
@@ -4544,6 +4950,17 @@
                        <member name="GTK_ICON_LOOKUP_GENERIC_FALLBACK" value="8"/>
                        <member name="GTK_ICON_LOOKUP_FORCE_SIZE" value="16"/>
                </flags>
+               <flags name="GtkJunctionSides" type-name="GtkJunctionSides" get-type="gtk_junction_sides_get_type">
+                       <member name="GTK_JUNCTION_NONE" value="0"/>
+                       <member name="GTK_JUNCTION_CORNER_TOPLEFT" value="1"/>
+                       <member name="GTK_JUNCTION_CORNER_TOPRIGHT" value="2"/>
+                       <member name="GTK_JUNCTION_CORNER_BOTTOMLEFT" value="4"/>
+                       <member name="GTK_JUNCTION_CORNER_BOTTOMRIGHT" value="8"/>
+                       <member name="GTK_JUNCTION_TOP" value="3"/>
+                       <member name="GTK_JUNCTION_BOTTOM" value="12"/>
+                       <member name="GTK_JUNCTION_LEFT" value="5"/>
+                       <member name="GTK_JUNCTION_RIGHT" value="10"/>
+               </flags>
                <flags name="GtkRcFlags" type-name="GtkRcFlags" get-type="gtk_rc_flags_get_type">
                        <member name="GTK_RC_FG" value="1"/>
                        <member name="GTK_RC_BG" value="2"/>
@@ -4558,6 +4975,22 @@
                        <member name="GTK_RECENT_FILTER_GROUP" value="16"/>
                        <member name="GTK_RECENT_FILTER_AGE" value="32"/>
                </flags>
+               <flags name="GtkRegionFlags" type-name="GtkRegionFlags" get-type="gtk_region_flags_get_type">
+                       <member name="GTK_REGION_EVEN" value="1"/>
+                       <member name="GTK_REGION_ODD" value="2"/>
+                       <member name="GTK_REGION_FIRST" value="4"/>
+                       <member name="GTK_REGION_LAST" value="8"/>
+                       <member name="GTK_REGION_SORTED" value="32"/>
+               </flags>
+               <flags name="GtkStateFlags" type-name="GtkStateFlags" get-type="gtk_state_flags_get_type">
+                       <member name="GTK_STATE_FLAG_NORMAL" value="0"/>
+                       <member name="GTK_STATE_FLAG_ACTIVE" value="1"/>
+                       <member name="GTK_STATE_FLAG_PRELIGHT" value="2"/>
+                       <member name="GTK_STATE_FLAG_SELECTED" value="4"/>
+                       <member name="GTK_STATE_FLAG_INSENSITIVE" value="8"/>
+                       <member name="GTK_STATE_FLAG_INCONSISTENT" value="16"/>
+                       <member name="GTK_STATE_FLAG_FOCUSED" value="32"/>
+               </flags>
                <flags name="GtkTargetFlags" type-name="GtkTargetFlags" get-type="gtk_target_flags_get_type">
                        <member name="GTK_TARGET_SAME_APP" value="1"/>
                        <member name="GTK_TARGET_SAME_WIDGET" value="2"/>
@@ -5829,67 +6262,275 @@
                        <property name="yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="yscale" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
-               <object name="GtkApplication" parent="GApplication" type-name="GtkApplication" get-type="gtk_application_get_type">
+               <object name="GtkAppChooserButton" parent="GtkComboBox" type-name="GtkAppChooserButton" get-type="gtk_app_chooser_button_get_type">
                        <implements>
-                               <interface name="GActionGroup"/>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkCellLayout"/>
+                               <interface name="GtkCellEditable"/>
+                               <interface name="GtkAppChooser"/>
                        </implements>
-                       <method name="add_window" symbol="gtk_application_add_window">
+                       <method name="append_custom_item" symbol="gtk_app_chooser_button_append_custom_item">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="application" type="GtkApplication*"/>
-                                       <parameter name="window" type="GtkWindow*"/>
+                                       <parameter name="self" type="GtkAppChooserButton*"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="icon" type="GIcon*"/>
                                </parameters>
                        </method>
-                       <method name="get_windows" symbol="gtk_application_get_windows">
-                               <return-type type="GList*"/>
+                       <method name="append_separator" symbol="gtk_app_chooser_button_append_separator">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="application" type="GtkApplication*"/>
+                                       <parameter name="self" type="GtkAppChooserButton*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_application_new">
-                               <return-type type="GtkApplication*"/>
+                       <method name="get_show_dialog_item" symbol="gtk_app_chooser_button_get_show_dialog_item">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="application_id" type="gchar*"/>
-                                       <parameter name="flags" type="GApplicationFlags"/>
+                                       <parameter name="self" type="GtkAppChooserButton*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_app_chooser_button_new">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="content_type" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <method name="remove_window" symbol="gtk_application_remove_window">
+                       <method name="set_active_custom_item" symbol="gtk_app_chooser_button_set_active_custom_item">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="application" type="GtkApplication*"/>
-                                       <parameter name="window" type="GtkWindow*"/>
+                                       <parameter name="self" type="GtkAppChooserButton*"/>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_show_dialog_item" symbol="gtk_app_chooser_button_set_show_dialog_item">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserButton*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
+                       <property name="show-dialog-item" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <signal name="custom-item-activated" when="FIRST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserButton*"/>
+                                       <parameter name="item_name" type="char*"/>
+                               </parameters>
+                       </signal>
                </object>
-               <object name="GtkArrow" parent="GtkMisc" type-name="GtkArrow" get-type="gtk_arrow_get_type">
+               <object name="GtkAppChooserDialog" parent="GtkDialog" type-name="GtkAppChooserDialog" get-type="gtk_app_chooser_dialog_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
+                               <interface name="GtkAppChooser"/>
                        </implements>
-                       <constructor name="new" symbol="gtk_arrow_new">
+                       <method name="get_widget" symbol="gtk_app_chooser_dialog_get_widget">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="arrow_type" type="GtkArrowType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="self" type="GtkAppChooserDialog*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_app_chooser_dialog_new">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="flags" type="GtkDialogFlags"/>
+                                       <parameter name="file" type="GFile*"/>
                                </parameters>
                        </constructor>
-                       <method name="set" symbol="gtk_arrow_set">
-                               <return-type type="void"/>
+                       <constructor name="new_for_content_type" symbol="gtk_app_chooser_dialog_new_for_content_type">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="arrow" type="GtkArrow*"/>
-                                       <parameter name="arrow_type" type="GtkArrowType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="flags" type="GtkDialogFlags"/>
+                                       <parameter name="content_type" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <property name="arrow-type" type="GtkArrowType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       </constructor>
+                       <property name="gfile" type="GFile*" readable="1" writable="1" construct="0" construct-only="1"/>
                </object>
-               <object name="GtkAspectFrame" parent="GtkFrame" type-name="GtkAspectFrame" get-type="gtk_aspect_frame_get_type">
+               <object name="GtkAppChooserWidget" parent="GtkBox" type-name="GtkAppChooserWidget" get-type="gtk_app_chooser_widget_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                               <interface name="GtkAppChooser"/>
                        </implements>
-                       <constructor name="new" symbol="gtk_aspect_frame_new">
+                       <method name="get_default_text" symbol="gtk_app_chooser_widget_get_default_text">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_show_all" symbol="gtk_app_chooser_widget_get_show_all">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_show_default" symbol="gtk_app_chooser_widget_get_show_default">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_show_fallback" symbol="gtk_app_chooser_widget_get_show_fallback">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_show_other" symbol="gtk_app_chooser_widget_get_show_other">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_show_recommended" symbol="gtk_app_chooser_widget_get_show_recommended">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_app_chooser_widget_new">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="content_type" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_default_text" symbol="gtk_app_chooser_widget_set_default_text">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                                       <parameter name="text" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_show_all" symbol="gtk_app_chooser_widget_set_show_all">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                                       <parameter name="setting" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_show_default" symbol="gtk_app_chooser_widget_set_show_default">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                                       <parameter name="setting" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_show_fallback" symbol="gtk_app_chooser_widget_set_show_fallback">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                                       <parameter name="setting" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_show_other" symbol="gtk_app_chooser_widget_set_show_other">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                                       <parameter name="setting" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_show_recommended" symbol="gtk_app_chooser_widget_set_show_recommended">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                                       <parameter name="setting" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <property name="default-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="show-all" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="show-default" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="show-fallback" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="show-other" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="show-recommended" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <signal name="application-activated" when="FIRST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                                       <parameter name="app_info" type="GAppInfo*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="application-selected" when="FIRST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                                       <parameter name="app_info" type="GAppInfo*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="populate-popup" when="FIRST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooserWidget*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="app_info" type="GAppInfo*"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GtkApplication" parent="GApplication" type-name="GtkApplication" get-type="gtk_application_get_type">
+                       <implements>
+                               <interface name="GActionGroup"/>
+                       </implements>
+                       <method name="add_window" symbol="gtk_application_add_window">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="application" type="GtkApplication*"/>
+                                       <parameter name="window" type="GtkWindow*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_windows" symbol="gtk_application_get_windows">
+                               <return-type type="GList*"/>
+                               <parameters>
+                                       <parameter name="application" type="GtkApplication*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_application_new">
+                               <return-type type="GtkApplication*"/>
+                               <parameters>
+                                       <parameter name="application_id" type="gchar*"/>
+                                       <parameter name="flags" type="GApplicationFlags"/>
+                               </parameters>
+                       </constructor>
+                       <method name="remove_window" symbol="gtk_application_remove_window">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="application" type="GtkApplication*"/>
+                                       <parameter name="window" type="GtkWindow*"/>
+                               </parameters>
+                       </method>
+               </object>
+               <object name="GtkArrow" parent="GtkMisc" type-name="GtkArrow" get-type="gtk_arrow_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_arrow_new">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="arrow_type" type="GtkArrowType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set" symbol="gtk_arrow_set">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="arrow" type="GtkArrow*"/>
+                                       <parameter name="arrow_type" type="GtkArrowType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                               </parameters>
+                       </method>
+                       <property name="arrow-type" type="GtkArrowType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkAspectFrame" parent="GtkFrame" type-name="GtkAspectFrame" get-type="gtk_aspect_frame_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_aspect_frame_new">
                                <return-type type="GtkWidget*"/>
                                <parameters>
                                        <parameter name="label" type="gchar*"/>
@@ -6736,10658 +7377,11650 @@
                                </parameters>
                        </signal>
                </object>
-               <object name="GtkCellRenderer" parent="GInitiallyUnowned" type-name="GtkCellRenderer" get-type="gtk_cell_renderer_get_type">
-                       <method name="activate" symbol="gtk_cell_renderer_activate">
+               <object name="GtkCellArea" parent="GInitiallyUnowned" type-name="GtkCellArea" get-type="gtk_cell_area_get_type">
+                       <implements>
+                               <interface name="GtkCellLayout"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="activate" symbol="gtk_cell_area_activate">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                        <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="path" type="gchar*"/>
-                                       <parameter name="background_area" type="GdkRectangle*"/>
                                        <parameter name="cell_area" type="GdkRectangle*"/>
                                        <parameter name="flags" type="GtkCellRendererState"/>
+                                       <parameter name="edit_only" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_alignment" symbol="gtk_cell_renderer_get_alignment">
-                               <return-type type="void"/>
+                       <method name="activate_cell" symbol="gtk_cell_area_activate_cell">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="xalign" type="gfloat*"/>
-                                       <parameter name="yalign" type="gfloat*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
                                </parameters>
                        </method>
-                       <method name="get_fixed_size" symbol="gtk_cell_renderer_get_fixed_size">
+                       <method name="add" symbol="gtk_cell_area_add">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="width" type="gint*"/>
-                                       <parameter name="height" type="gint*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
                                </parameters>
                        </method>
-                       <method name="get_padding" symbol="gtk_cell_renderer_get_padding">
+                       <method name="add_focus_sibling" symbol="gtk_cell_area_add_focus_sibling">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="xpad" type="gint*"/>
-                                       <parameter name="ypad" type="gint*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="sibling" type="GtkCellRenderer*"/>
                                </parameters>
                        </method>
-                       <method name="get_preferred_height" symbol="gtk_cell_renderer_get_preferred_height">
+                       <method name="add_with_properties" symbol="gtk_cell_area_add_with_properties">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="minimum_size" type="gint*"/>
-                                       <parameter name="natural_size" type="gint*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="first_prop_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_preferred_height_for_width" symbol="gtk_cell_renderer_get_preferred_height_for_width">
+                       <method name="apply_attributes" symbol="gtk_cell_area_apply_attributes">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="minimum_height" type="gint*"/>
-                                       <parameter name="natural_height" type="gint*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="tree_model" type="GtkTreeModel*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="is_expander" type="gboolean"/>
+                                       <parameter name="is_expanded" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_preferred_size" symbol="gtk_cell_renderer_get_preferred_size">
+                       <method name="attribute_connect" symbol="gtk_cell_area_attribute_connect">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="minimum_size" type="GtkRequisition*"/>
-                                       <parameter name="natural_size" type="GtkRequisition*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="attribute" type="gchar*"/>
+                                       <parameter name="column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_preferred_width" symbol="gtk_cell_renderer_get_preferred_width">
+                       <method name="attribute_disconnect" symbol="gtk_cell_area_attribute_disconnect">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="minimum_size" type="gint*"/>
-                                       <parameter name="natural_size" type="gint*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="attribute" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_preferred_width_for_height" symbol="gtk_cell_renderer_get_preferred_width_for_height">
+                       <method name="cell_get" symbol="gtk_cell_area_cell_get">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="height" type="gint"/>
-                                       <parameter name="minimum_width" type="gint*"/>
-                                       <parameter name="natural_width" type="gint*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="first_prop_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_request_mode" symbol="gtk_cell_renderer_get_request_mode">
-                               <return-type type="GtkSizeRequestMode"/>
+                       <method name="cell_get_property" symbol="gtk_cell_area_cell_get_property">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="property_name" type="gchar*"/>
+                                       <parameter name="value" type="GValue*"/>
                                </parameters>
                        </method>
-                       <method name="get_sensitive" symbol="gtk_cell_renderer_get_sensitive">
-                               <return-type type="gboolean"/>
+                       <method name="cell_get_valist" symbol="gtk_cell_area_cell_get_valist">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="first_property_name" type="gchar*"/>
+                                       <parameter name="var_args" type="va_list"/>
                                </parameters>
                        </method>
-                       <method name="get_visible" symbol="gtk_cell_renderer_get_visible">
-                               <return-type type="gboolean"/>
+                       <method name="cell_set" symbol="gtk_cell_area_cell_set">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="first_prop_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="render" symbol="gtk_cell_renderer_render">
+                       <method name="cell_set_property" symbol="gtk_cell_area_cell_set_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="background_area" type="GdkRectangle*"/>
-                                       <parameter name="cell_area" type="GdkRectangle*"/>
-                                       <parameter name="flags" type="GtkCellRendererState"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="property_name" type="gchar*"/>
+                                       <parameter name="value" type="GValue*"/>
                                </parameters>
                        </method>
-                       <method name="set_alignment" symbol="gtk_cell_renderer_set_alignment">
+                       <method name="cell_set_valist" symbol="gtk_cell_area_cell_set_valist">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="xalign" type="gfloat"/>
-                                       <parameter name="yalign" type="gfloat"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="first_property_name" type="gchar*"/>
+                                       <parameter name="var_args" type="va_list"/>
                                </parameters>
                        </method>
-                       <method name="set_fixed_size" symbol="gtk_cell_renderer_set_fixed_size">
-                               <return-type type="void"/>
+                       <method name="class_find_cell_property" symbol="gtk_cell_area_class_find_cell_property">
+                               <return-type type="GParamSpec*"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="aclass" type="GtkCellAreaClass*"/>
+                                       <parameter name="property_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_padding" symbol="gtk_cell_renderer_set_padding">
+                       <method name="class_install_cell_property" symbol="gtk_cell_area_class_install_cell_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="xpad" type="gint"/>
-                                       <parameter name="ypad" type="gint"/>
+                                       <parameter name="aclass" type="GtkCellAreaClass*"/>
+                                       <parameter name="property_id" type="guint"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
                                </parameters>
                        </method>
-                       <method name="set_sensitive" symbol="gtk_cell_renderer_set_sensitive">
-                               <return-type type="void"/>
+                       <method name="class_list_cell_properties" symbol="gtk_cell_area_class_list_cell_properties">
+                               <return-type type="GParamSpec**"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="sensitive" type="gboolean"/>
+                                       <parameter name="aclass" type="GtkCellAreaClass*"/>
+                                       <parameter name="n_properties" type="guint*"/>
                                </parameters>
                        </method>
-                       <method name="set_visible" symbol="gtk_cell_renderer_set_visible">
-                               <return-type type="void"/>
+                       <method name="copy_context" symbol="gtk_cell_area_copy_context">
+                               <return-type type="GtkCellAreaContext*"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="visible" type="gboolean"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                </parameters>
                        </method>
-                       <method name="start_editing" symbol="gtk_cell_renderer_start_editing">
-                               <return-type type="GtkCellEditable*"/>
+                       <method name="create_context" symbol="gtk_cell_area_create_context">
+                               <return-type type="GtkCellAreaContext*"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                               </parameters>
+                       </method>
+                       <method name="event" symbol="gtk_cell_area_event">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                        <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="path" type="gchar*"/>
-                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="event" type="GdkEvent*"/>
                                        <parameter name="cell_area" type="GdkRectangle*"/>
                                        <parameter name="flags" type="GtkCellRendererState"/>
                                </parameters>
                        </method>
-                       <method name="stop_editing" symbol="gtk_cell_renderer_stop_editing">
+                       <method name="focus" symbol="gtk_cell_area_focus">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="direction" type="GtkDirectionType"/>
+                               </parameters>
+                       </method>
+                       <method name="foreach" symbol="gtk_cell_area_foreach">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="canceled" type="gboolean"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="callback" type="GtkCellCallback"/>
+                                       <parameter name="callback_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <property name="cell-background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="cell-background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="cell-background-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="cell-background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="editing" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="height" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="is-expanded" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="is-expander" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="mode" type="GtkCellRendererMode" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="visible" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="xpad" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="ypad" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="editing-canceled" when="FIRST">
+                       <method name="foreach_alloc" symbol="gtk_cell_area_foreach_alloc">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="callback" type="GtkCellAllocCallback"/>
+                                       <parameter name="callback_data" type="gpointer"/>
                                </parameters>
-                       </signal>
-                       <signal name="editing-started" when="FIRST">
+                       </method>
+                       <method name="get_cell_allocation" symbol="gtk_cell_area_get_cell_allocation">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="editable" type="GtkCellEditable*"/>
-                                       <parameter name="path" type="char*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="allocation" type="GdkRectangle*"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="activate">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <method name="get_cell_at_position" symbol="gtk_cell_area_get_cell_at_position">
+                               <return-type type="GtkCellRenderer*"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                        <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="path" type="gchar*"/>
-                                       <parameter name="background_area" type="GdkRectangle*"/>
                                        <parameter name="cell_area" type="GdkRectangle*"/>
-                                       <parameter name="flags" type="GtkCellRendererState"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="alloc_area" type="GdkRectangle*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_preferred_height">
+                       </method>
+                       <method name="get_current_path_string" symbol="gtk_cell_area_get_current_path_string">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_edit_widget" symbol="gtk_cell_area_get_edit_widget">
+                               <return-type type="GtkCellEditable*"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_edited_cell" symbol="gtk_cell_area_get_edited_cell">
+                               <return-type type="GtkCellRenderer*"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_focus_cell" symbol="gtk_cell_area_get_focus_cell">
+                               <return-type type="GtkCellRenderer*"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_focus_from_sibling" symbol="gtk_cell_area_get_focus_from_sibling">
+                               <return-type type="GtkCellRenderer*"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_focus_siblings" symbol="gtk_cell_area_get_focus_siblings">
+                               <return-type type="GList*"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_preferred_height" symbol="gtk_cell_area_get_preferred_height">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                        <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="minimum_size" type="gint*"/>
-                                       <parameter name="natural_size" type="gint*"/>
+                                       <parameter name="minimum_height" type="gint*"/>
+                                       <parameter name="natural_height" type="gint*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_preferred_height_for_width">
+                       </method>
+                       <method name="get_preferred_height_for_width" symbol="gtk_cell_area_get_preferred_height_for_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                        <parameter name="widget" type="GtkWidget*"/>
                                        <parameter name="width" type="gint"/>
                                        <parameter name="minimum_height" type="gint*"/>
                                        <parameter name="natural_height" type="gint*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_preferred_width">
+                       </method>
+                       <method name="get_preferred_width" symbol="gtk_cell_area_get_preferred_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                        <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="minimum_size" type="gint*"/>
-                                       <parameter name="natural_size" type="gint*"/>
+                                       <parameter name="minimum_width" type="gint*"/>
+                                       <parameter name="natural_width" type="gint*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_preferred_width_for_height">
+                       </method>
+                       <method name="get_preferred_width_for_height" symbol="gtk_cell_area_get_preferred_width_for_height">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                        <parameter name="widget" type="GtkWidget*"/>
                                        <parameter name="height" type="gint"/>
                                        <parameter name="minimum_width" type="gint*"/>
                                        <parameter name="natural_width" type="gint*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_request_mode">
+                       </method>
+                       <method name="get_request_mode" symbol="gtk_cell_area_get_request_mode">
                                <return-type type="GtkSizeRequestMode"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_size">
+                       </method>
+                       <method name="get_style_detail" symbol="gtk_cell_area_get_style_detail">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                               </parameters>
+                       </method>
+                       <method name="has_renderer" symbol="gtk_cell_area_has_renderer">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                               </parameters>
+                       </method>
+                       <method name="inner_cell_area" symbol="gtk_cell_area_inner_cell_area">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
                                        <parameter name="widget" type="GtkWidget*"/>
                                        <parameter name="cell_area" type="GdkRectangle*"/>
-                                       <parameter name="x_offset" type="gint*"/>
-                                       <parameter name="y_offset" type="gint*"/>
-                                       <parameter name="width" type="gint*"/>
-                                       <parameter name="height" type="gint*"/>
+                                       <parameter name="inner_area" type="GdkRectangle*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="render">
+                       </method>
+                       <method name="is_activatable" symbol="gtk_cell_area_is_activatable">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                               </parameters>
+                       </method>
+                       <method name="is_focus_sibling" symbol="gtk_cell_area_is_focus_sibling">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="sibling" type="GtkCellRenderer*"/>
+                               </parameters>
+                       </method>
+                       <method name="remove" symbol="gtk_cell_area_remove">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="background_area" type="GdkRectangle*"/>
-                                       <parameter name="cell_area" type="GdkRectangle*"/>
-                                       <parameter name="flags" type="GtkCellRendererState"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="start_editing">
-                               <return-type type="GtkCellEditable*"/>
+                       </method>
+                       <method name="remove_focus_sibling" symbol="gtk_cell_area_remove_focus_sibling">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="sibling" type="GtkCellRenderer*"/>
+                               </parameters>
+                       </method>
+                       <method name="render" symbol="gtk_cell_area_render">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                        <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
                                        <parameter name="background_area" type="GdkRectangle*"/>
                                        <parameter name="cell_area" type="GdkRectangle*"/>
                                        <parameter name="flags" type="GtkCellRendererState"/>
+                                       <parameter name="paint_focus" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkCellRendererAccel" parent="GtkCellRendererText" type-name="GtkCellRendererAccel" get-type="gtk_cell_renderer_accel_get_type">
-                       <constructor name="new" symbol="gtk_cell_renderer_accel_new">
-                               <return-type type="GtkCellRenderer*"/>
-                       </constructor>
-                       <property name="accel-key" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="accel-mode" type="GtkCellRendererAccelMode" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="accel-mods" type="GdkModifierType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="keycode" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="accel-cleared" when="LAST">
+                       </method>
+                       <method name="request_renderer" symbol="gtk_cell_area_request_renderer">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="accel" type="GtkCellRendererAccel*"/>
-                                       <parameter name="path_string" type="char*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="for_size" type="gint"/>
+                                       <parameter name="minimum_size" type="gint*"/>
+                                       <parameter name="natural_size" type="gint*"/>
                                </parameters>
-                       </signal>
-                       <signal name="accel-edited" when="LAST">
+                       </method>
+                       <method name="set_focus_cell" symbol="gtk_cell_area_set_focus_cell">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="accel" type="GtkCellRendererAccel*"/>
-                                       <parameter name="path_string" type="char*"/>
-                                       <parameter name="accel_key" type="guint"/>
-                                       <parameter name="accel_mods" type="GdkModifierType"/>
-                                       <parameter name="hardware_keycode" type="guint"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkCellRendererCombo" parent="GtkCellRendererText" type-name="GtkCellRendererCombo" get-type="gtk_cell_renderer_combo_get_type">
-                       <constructor name="new" symbol="gtk_cell_renderer_combo_new">
-                               <return-type type="GtkCellRenderer*"/>
-                       </constructor>
-                       <property name="has-entry" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="changed" when="LAST">
+                       </method>
+                       <method name="set_style_detail" symbol="gtk_cell_area_set_style_detail">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkCellRendererCombo*"/>
-                                       <parameter name="p0" type="char*"/>
-                                       <parameter name="p1" type="GtkTreeIter*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="detail" type="gchar*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkCellRendererPixbuf" parent="GtkCellRenderer" type-name="GtkCellRendererPixbuf" get-type="gtk_cell_renderer_pixbuf_get_type">
-                       <constructor name="new" symbol="gtk_cell_renderer_pixbuf_new">
-                               <return-type type="GtkCellRenderer*"/>
-                       </constructor>
-                       <property name="follow-state" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pixbuf" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pixbuf-expander-closed" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pixbuf-expander-open" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="stock-detail" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="stock-id" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="stock-size" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkCellRendererProgress" parent="GtkCellRenderer" type-name="GtkCellRendererProgress" get-type="gtk_cell_renderer_progress_get_type">
-                       <implements>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_cell_renderer_progress_new">
-                               <return-type type="GtkCellRenderer*"/>
-                       </constructor>
-                       <property name="inverted" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pulse" 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"/>
-                       <property name="text-xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="text-yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="value" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkCellRendererSpin" parent="GtkCellRendererText" type-name="GtkCellRendererSpin" get-type="gtk_cell_renderer_spin_get_type">
-                       <constructor name="new" symbol="gtk_cell_renderer_spin_new">
-                               <return-type type="GtkCellRenderer*"/>
-                       </constructor>
-                       <property name="adjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="climb-rate" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="digits" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkCellRendererSpinner" parent="GtkCellRenderer" type-name="GtkCellRendererSpinner" get-type="gtk_cell_renderer_spinner_get_type">
-                       <constructor name="new" symbol="gtk_cell_renderer_spinner_new">
-                               <return-type type="GtkCellRenderer*"/>
-                       </constructor>
-                       <property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pulse" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="size" type="GtkIconSize" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkCellRendererText" parent="GtkCellRenderer" type-name="GtkCellRendererText" get-type="gtk_cell_renderer_text_get_type">
-                       <constructor name="new" symbol="gtk_cell_renderer_text_new">
-                               <return-type type="GtkCellRenderer*"/>
-                       </constructor>
-                       <method name="set_fixed_height_from_font" symbol="gtk_cell_renderer_text_set_fixed_height_from_font">
+                       </method>
+                       <method name="stop_editing" symbol="gtk_cell_area_stop_editing">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="renderer" type="GtkCellRendererText*"/>
-                                       <parameter name="number_of_rows" type="gint"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="canceled" type="gboolean"/>
                                </parameters>
                        </method>
-                       <property name="align-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="alignment" type="PangoAlignment" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="attributes" type="PangoAttrList*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="background-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="editable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="editable-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="ellipsize" type="PangoEllipsizeMode" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="ellipsize-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="family" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="family-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="font" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="font-desc" type="PangoFontDescription*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="foreground" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="foreground-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="foreground-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="foreground-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="language" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="language-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="markup" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="max-width-chars" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="rise" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="rise-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="scale" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="scale-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="single-paragraph-mode" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="size-points" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="size-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="stretch" type="PangoStretch" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="stretch-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="strikethrough" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="strikethrough-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="style" type="PangoStyle" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="style-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="underline" type="PangoUnderline" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="underline-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="variant" type="PangoVariant" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="variant-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="weight" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="weight-set" 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-mode" type="PangoWrapMode" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="wrap-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="edited" when="LAST">
+                       <property name="edit-widget" type="GtkCellEditable*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="edited-cell" type="GtkCellRenderer*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="focus-cell" type="GtkCellRenderer*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="add-editable" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_renderer_text" type="GtkCellRendererText*"/>
-                                       <parameter name="path" type="char*"/>
-                                       <parameter name="new_text" type="char*"/>
+                                       <parameter name="object" type="GtkCellArea*"/>
+                                       <parameter name="p0" type="GtkCellRenderer*"/>
+                                       <parameter name="p1" type="GtkCellEditable*"/>
+                                       <parameter name="p2" type="GdkRectangle*"/>
+                                       <parameter name="p3" type="char*"/>
                                </parameters>
                        </signal>
-               </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"/>
+                       <signal name="apply-attributes" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="tree_model" type="GtkTreeModel*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="is_expander" type="gboolean"/>
+                                       <parameter name="is_expanded" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <method name="get_active" symbol="gtk_cell_renderer_toggle_get_active">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="focus-changed" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="object" type="GtkCellArea*"/>
+                                       <parameter name="p0" type="GtkCellRenderer*"/>
+                                       <parameter name="p1" type="char*"/>
                                </parameters>
-                       </method>
-                       <method name="get_radio" symbol="gtk_cell_renderer_toggle_get_radio">
+                       </signal>
+                       <signal name="remove-editable" when="FIRST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="object" type="GtkCellArea*"/>
+                                       <parameter name="p0" type="GtkCellRenderer*"/>
+                                       <parameter name="p1" type="GtkCellEditable*"/>
+                               </parameters>
+                       </signal>
+                       <vfunc name="activate">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
+                                       <parameter name="edit_only" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <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">
+                       </vfunc>
+                       <vfunc name="add">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
                                </parameters>
-                       </method>
-                       <method name="set_active" symbol="gtk_cell_renderer_toggle_set_active">
-                               <return-type type="void"/>
+                       </vfunc>
+                       <vfunc name="copy_context">
+                               <return-type type="GtkCellAreaContext*"/>
                                <parameters>
-                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                </parameters>
-                       </method>
-                       <method name="set_radio" symbol="gtk_cell_renderer_toggle_set_radio">
-                               <return-type type="void"/>
+                       </vfunc>
+                       <vfunc name="create_context">
+                               <return-type type="GtkCellAreaContext*"/>
                                <parameters>
-                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
-                                       <parameter name="radio" type="gboolean"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
                                </parameters>
-                       </method>
-                       <property name="activatable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="inconsistent" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="indicator-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="radio" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="toggled" when="LAST">
+                       </vfunc>
+                       <vfunc name="event">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="focus">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="direction" type="GtkDirectionType"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="foreach">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_renderer_toggle" type="GtkCellRendererToggle*"/>
-                                       <parameter name="path" type="char*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="callback" type="GtkCellCallback"/>
+                                       <parameter name="callback_data" type="gpointer"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkCellView" parent="GtkWidget" type-name="GtkCellView" get-type="gtk_cell_view_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkCellLayout"/>
-                       </implements>
-                       <method name="get_desired_height_for_width_of_row" symbol="gtk_cell_view_get_desired_height_for_width_of_row">
+                       </vfunc>
+                       <vfunc name="foreach_alloc">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="avail_size" type="gint"/>
-                                       <parameter name="minimum_size" type="gint*"/>
-                                       <parameter name="natural_size" type="gint*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="callback" type="GtkCellAllocCallback"/>
+                                       <parameter name="callback_data" type="gpointer"/>
                                </parameters>
-                       </method>
-                       <method name="get_desired_width_of_row" symbol="gtk_cell_view_get_desired_width_of_row">
+                       </vfunc>
+                       <vfunc name="get_cell_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="minimum_size" type="gint*"/>
-                                       <parameter name="natural_size" type="gint*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="property_id" type="guint"/>
+                                       <parameter name="value" type="GValue*"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
                                </parameters>
-                       </method>
-                       <method name="get_displayed_row" symbol="gtk_cell_view_get_displayed_row">
-                               <return-type type="GtkTreePath*"/>
+                       </vfunc>
+                       <vfunc name="get_preferred_height">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="minimum_height" type="gint*"/>
+                                       <parameter name="natural_height" type="gint*"/>
                                </parameters>
-                       </method>
-                       <method name="get_model" symbol="gtk_cell_view_get_model">
-                               <return-type type="GtkTreeModel*"/>
+                       </vfunc>
+                       <vfunc name="get_preferred_height_for_width">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="minimum_height" type="gint*"/>
+                                       <parameter name="natural_height" type="gint*"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_cell_view_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_markup" symbol="gtk_cell_view_new_with_markup">
-                               <return-type type="GtkWidget*"/>
+                       </vfunc>
+                       <vfunc name="get_preferred_width">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="markup" type="gchar*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="minimum_width" type="gint*"/>
+                                       <parameter name="natural_width" type="gint*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_pixbuf" symbol="gtk_cell_view_new_with_pixbuf">
-                               <return-type type="GtkWidget*"/>
+                       </vfunc>
+                       <vfunc name="get_preferred_width_for_height">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="height" type="gint"/>
+                                       <parameter name="minimum_width" type="gint*"/>
+                                       <parameter name="natural_width" type="gint*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_text" symbol="gtk_cell_view_new_with_text">
-                               <return-type type="GtkWidget*"/>
+                       </vfunc>
+                       <vfunc name="get_request_mode">
+                               <return-type type="GtkSizeRequestMode"/>
                                <parameters>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_background_color" symbol="gtk_cell_view_set_background_color">
-                               <return-type type="void"/>
+                       </vfunc>
+                       <vfunc name="is_activatable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
                                </parameters>
-                       </method>
-                       <method name="set_background_rgba" symbol="gtk_cell_view_set_background_rgba">
+                       </vfunc>
+                       <vfunc name="remove">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
-                                       <parameter name="rgba" type="GdkRGBA*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
                                </parameters>
-                       </method>
-                       <method name="set_displayed_row" symbol="gtk_cell_view_set_displayed_row">
+                       </vfunc>
+                       <vfunc name="render">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
+                                       <parameter name="paint_focus" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <method name="set_model" symbol="gtk_cell_view_set_model">
+                       </vfunc>
+                       <vfunc name="set_cell_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="property_id" type="guint"/>
+                                       <parameter name="value" type="GValue*"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
                                </parameters>
-                       </method>
-                       <property name="background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="background-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       </vfunc>
                </object>
-               <object name="GtkCheckButton" parent="GtkToggleButton" type-name="GtkCheckButton" get-type="gtk_check_button_get_type">
+               <object name="GtkCellAreaBox" parent="GtkCellArea" type-name="GtkCellAreaBox" get-type="gtk_cell_area_box_get_type">
                        <implements>
-                               <interface name="AtkImplementor"/>
+                               <interface name="GtkCellLayout"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkActivatable"/>
+                               <interface name="GtkOrientable"/>
                        </implements>
-                       <constructor name="new" symbol="gtk_check_button_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_label" symbol="gtk_check_button_new_with_label">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="label" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_check_button_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_spacing" symbol="gtk_cell_area_box_get_spacing">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="box" type="GtkCellAreaBox*"/>
                                </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_cell_area_box_new">
+                               <return-type type="GtkCellArea*"/>
                        </constructor>
-                       <vfunc name="draw_indicator">
+                       <method name="pack_end" symbol="gtk_cell_area_box_pack_end">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_button" type="GtkCheckButton*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="box" type="GtkCellAreaBox*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="expand" type="gboolean"/>
+                                       <parameter name="align" type="gboolean"/>
+                                       <parameter name="fixed" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkCheckMenuItem" parent="GtkMenuItem" type-name="GtkCheckMenuItem" get-type="gtk_check_menu_item_get_type">
-                       <implements>
-                               <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"/>
+                       </method>
+                       <method name="pack_start" symbol="gtk_cell_area_box_pack_start">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="box" type="GtkCellAreaBox*"/>
+                                       <parameter name="renderer" type="GtkCellRenderer*"/>
+                                       <parameter name="expand" type="gboolean"/>
+                                       <parameter name="align" type="gboolean"/>
+                                       <parameter name="fixed" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_draw_as_radio" symbol="gtk_check_menu_item_get_draw_as_radio">
-                               <return-type type="gboolean"/>
+                       <method name="set_spacing" symbol="gtk_cell_area_box_set_spacing">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="box" type="GtkCellAreaBox*"/>
+                                       <parameter name="spacing" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_inconsistent" symbol="gtk_check_menu_item_get_inconsistent">
-                               <return-type type="gboolean"/>
+                       <property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkCellAreaContext" parent="GObject" type-name="GtkCellAreaContext" get-type="gtk_cell_area_context_get_type">
+                       <method name="allocate" symbol="gtk_cell_area_context_allocate">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_check_menu_item_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_label" symbol="gtk_check_menu_item_new_with_label">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_allocation" symbol="gtk_cell_area_context_get_allocation">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="width" type="gint*"/>
+                                       <parameter name="height" type="gint*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_check_menu_item_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="get_area" symbol="gtk_cell_area_context_get_area">
+                               <return-type type="GtkCellArea*"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_active" symbol="gtk_check_menu_item_set_active">
+                       </method>
+                       <method name="get_preferred_height" symbol="gtk_cell_area_context_get_preferred_height">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
-                                       <parameter name="is_active" type="gboolean"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="minimum_height" type="gint*"/>
+                                       <parameter name="natural_height" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_draw_as_radio" symbol="gtk_check_menu_item_set_draw_as_radio">
+                       <method name="get_preferred_height_for_width" symbol="gtk_cell_area_context_get_preferred_height_for_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
-                                       <parameter name="draw_as_radio" type="gboolean"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="minimum_height" type="gint*"/>
+                                       <parameter name="natural_height" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_inconsistent" symbol="gtk_check_menu_item_set_inconsistent">
+                       <method name="get_preferred_width" symbol="gtk_cell_area_context_get_preferred_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="minimum_width" type="gint*"/>
+                                       <parameter name="natural_width" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="toggled" symbol="gtk_check_menu_item_toggled">
+                       <method name="get_preferred_width_for_height" symbol="gtk_cell_area_context_get_preferred_width_for_height">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="height" type="gint"/>
+                                       <parameter name="minimum_width" type="gint*"/>
+                                       <parameter name="natural_width" type="gint*"/>
                                </parameters>
                        </method>
-                       <property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="draw-as-radio" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="inconsistent" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="toggled" when="FIRST">
+                       <method name="push_preferred_height" symbol="gtk_cell_area_context_push_preferred_height">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="minimum_height" type="gint"/>
+                                       <parameter name="natural_height" type="gint"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="draw_indicator">
+                       </method>
+                       <method name="push_preferred_width" symbol="gtk_cell_area_context_push_preferred_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="minimum_width" type="gint"/>
+                                       <parameter name="natural_width" type="gint"/>
                                </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkClipboard" parent="GObject" type-name="GtkClipboard" get-type="gtk_clipboard_get_type">
-                       <method name="clear" symbol="gtk_clipboard_clear">
+                       </method>
+                       <method name="reset" symbol="gtk_cell_area_context_reset">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                </parameters>
                        </method>
-                       <method name="get" symbol="gtk_clipboard_get">
-                               <return-type type="GtkClipboard*"/>
+                       <property name="area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="minimum-height" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="minimum-width" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="natural-height" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="natural-width" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <vfunc name="allocate">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="selection" type="GdkAtom"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="get_display" symbol="gtk_clipboard_get_display">
-                               <return-type type="GdkDisplay*"/>
+                       </vfunc>
+                       <vfunc name="get_preferred_height_for_width">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="minimum_height" type="gint*"/>
+                                       <parameter name="natural_height" type="gint*"/>
                                </parameters>
-                       </method>
-                       <method name="get_for_display" symbol="gtk_clipboard_get_for_display">
-                               <return-type type="GtkClipboard*"/>
+                       </vfunc>
+                       <vfunc name="get_preferred_width_for_height">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="selection" type="GdkAtom"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                                       <parameter name="height" type="gint"/>
+                                       <parameter name="minimum_width" type="gint*"/>
+                                       <parameter name="natural_width" type="gint*"/>
                                </parameters>
-                       </method>
-                       <method name="get_owner" symbol="gtk_clipboard_get_owner">
-                               <return-type type="GObject*"/>
+                       </vfunc>
+                       <vfunc name="reset">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
+                               </parameters>
+                       </vfunc>
+               </object>
+               <object name="GtkCellRenderer" parent="GInitiallyUnowned" type-name="GtkCellRenderer" get-type="gtk_cell_renderer_get_type">
+                       <method name="activate" symbol="gtk_cell_renderer_activate">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
                                </parameters>
                        </method>
-                       <method name="request_contents" symbol="gtk_clipboard_request_contents">
+                       <method name="get_aligned_area" symbol="gtk_cell_renderer_get_aligned_area">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="target" type="GdkAtom"/>
-                                       <parameter name="callback" type="GtkClipboardReceivedFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="aligned_area" type="GdkRectangle*"/>
                                </parameters>
                        </method>
-                       <method name="request_image" symbol="gtk_clipboard_request_image">
+                       <method name="get_alignment" symbol="gtk_cell_renderer_get_alignment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="callback" type="GtkClipboardImageReceivedFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="xalign" type="gfloat*"/>
+                                       <parameter name="yalign" type="gfloat*"/>
                                </parameters>
                        </method>
-                       <method name="request_rich_text" symbol="gtk_clipboard_request_rich_text">
+                       <method name="get_fixed_size" symbol="gtk_cell_renderer_get_fixed_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="buffer" type="GtkTextBuffer*"/>
-                                       <parameter name="callback" type="GtkClipboardRichTextReceivedFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="width" type="gint*"/>
+                                       <parameter name="height" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="request_targets" symbol="gtk_clipboard_request_targets">
+                       <method name="get_padding" symbol="gtk_cell_renderer_get_padding">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="callback" type="GtkClipboardTargetsReceivedFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="xpad" type="gint*"/>
+                                       <parameter name="ypad" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="request_text" symbol="gtk_clipboard_request_text">
+                       <method name="get_preferred_height" symbol="gtk_cell_renderer_get_preferred_height">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="callback" type="GtkClipboardTextReceivedFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="minimum_size" type="gint*"/>
+                                       <parameter name="natural_size" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="request_uris" symbol="gtk_clipboard_request_uris">
+                       <method name="get_preferred_height_for_width" symbol="gtk_cell_renderer_get_preferred_height_for_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="callback" type="GtkClipboardURIReceivedFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="minimum_height" type="gint*"/>
+                                       <parameter name="natural_height" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_can_store" symbol="gtk_clipboard_set_can_store">
+                       <method name="get_preferred_size" symbol="gtk_cell_renderer_get_preferred_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="targets" type="GtkTargetEntry*"/>
-                                       <parameter name="n_targets" type="gint"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="minimum_size" type="GtkRequisition*"/>
+                                       <parameter name="natural_size" type="GtkRequisition*"/>
                                </parameters>
                        </method>
-                       <method name="set_image" symbol="gtk_clipboard_set_image">
+                       <method name="get_preferred_width" symbol="gtk_cell_renderer_get_preferred_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="minimum_size" type="gint*"/>
+                                       <parameter name="natural_size" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_text" symbol="gtk_clipboard_set_text">
+                       <method name="get_preferred_width_for_height" symbol="gtk_cell_renderer_get_preferred_width_for_height">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="text" type="gchar*"/>
-                                       <parameter name="len" type="gint"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="height" type="gint"/>
+                                       <parameter name="minimum_width" type="gint*"/>
+                                       <parameter name="natural_width" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_with_data" symbol="gtk_clipboard_set_with_data">
-                               <return-type type="gboolean"/>
+                       <method name="get_request_mode" symbol="gtk_cell_renderer_get_request_mode">
+                               <return-type type="GtkSizeRequestMode"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="targets" type="GtkTargetEntry*"/>
-                                       <parameter name="n_targets" type="guint"/>
-                                       <parameter name="get_func" type="GtkClipboardGetFunc"/>
-                                       <parameter name="clear_func" type="GtkClipboardClearFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
                                </parameters>
                        </method>
-                       <method name="set_with_owner" symbol="gtk_clipboard_set_with_owner">
+                       <method name="get_sensitive" symbol="gtk_cell_renderer_get_sensitive">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="targets" type="GtkTargetEntry*"/>
-                                       <parameter name="n_targets" type="guint"/>
-                                       <parameter name="get_func" type="GtkClipboardGetFunc"/>
-                                       <parameter name="clear_func" type="GtkClipboardClearFunc"/>
-                                       <parameter name="owner" type="GObject*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
                                </parameters>
                        </method>
-                       <method name="store" symbol="gtk_clipboard_store">
-                               <return-type type="void"/>
+                       <method name="get_visible" symbol="gtk_cell_renderer_get_visible">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
                                </parameters>
                        </method>
-                       <method name="wait_for_contents" symbol="gtk_clipboard_wait_for_contents">
-                               <return-type type="GtkSelectionData*"/>
+                       <method name="is_activatable" symbol="gtk_cell_renderer_is_activatable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="target" type="GdkAtom"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
                                </parameters>
                        </method>
-                       <method name="wait_for_image" symbol="gtk_clipboard_wait_for_image">
-                               <return-type type="GdkPixbuf*"/>
+                       <method name="render" symbol="gtk_cell_renderer_render">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
                                </parameters>
                        </method>
-                       <method name="wait_for_rich_text" symbol="gtk_clipboard_wait_for_rich_text">
-                               <return-type type="guint8*"/>
-                               <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="buffer" type="GtkTextBuffer*"/>
-                                       <parameter name="format" type="GdkAtom*"/>
-                                       <parameter name="length" type="gsize*"/>
-                               </parameters>
-                       </method>
-                       <method name="wait_for_targets" symbol="gtk_clipboard_wait_for_targets">
-                               <return-type type="gboolean"/>
+                       <method name="set_alignment" symbol="gtk_cell_renderer_set_alignment">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="targets" type="GdkAtom**"/>
-                                       <parameter name="n_targets" type="gint*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="yalign" type="gfloat"/>
                                </parameters>
                        </method>
-                       <method name="wait_for_text" symbol="gtk_clipboard_wait_for_text">
-                               <return-type type="gchar*"/>
+                       <method name="set_fixed_size" symbol="gtk_cell_renderer_set_fixed_size">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="wait_for_uris" symbol="gtk_clipboard_wait_for_uris">
-                               <return-type type="gchar**"/>
+                       <method name="set_padding" symbol="gtk_cell_renderer_set_padding">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="xpad" type="gint"/>
+                                       <parameter name="ypad" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="wait_is_image_available" symbol="gtk_clipboard_wait_is_image_available">
-                               <return-type type="gboolean"/>
+                       <method name="set_sensitive" symbol="gtk_cell_renderer_set_sensitive">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="sensitive" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="wait_is_rich_text_available" symbol="gtk_clipboard_wait_is_rich_text_available">
-                               <return-type type="gboolean"/>
+                       <method name="set_visible" symbol="gtk_cell_renderer_set_visible">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="buffer" type="GtkTextBuffer*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="visible" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="wait_is_target_available" symbol="gtk_clipboard_wait_is_target_available">
-                               <return-type type="gboolean"/>
+                       <method name="start_editing" symbol="gtk_cell_renderer_start_editing">
+                               <return-type type="GtkCellEditable*"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="target" type="GdkAtom"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
                                </parameters>
                        </method>
-                       <method name="wait_is_text_available" symbol="gtk_clipboard_wait_is_text_available">
-                               <return-type type="gboolean"/>
+                       <method name="stop_editing" symbol="gtk_cell_renderer_stop_editing">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="canceled" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="wait_is_uris_available" symbol="gtk_clipboard_wait_is_uris_available">
-                               <return-type type="gboolean"/>
+                       <property name="cell-background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <property name="cell-background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="cell-background-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="cell-background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="editing" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="height" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="is-expanded" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="is-expander" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="mode" type="GtkCellRendererMode" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="visible" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="xpad" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="ypad" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="editing-canceled" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
                                </parameters>
-                       </method>
-                       <signal name="owner-change" when="FIRST">
+                       </signal>
+                       <signal name="editing-started" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkClipboard*"/>
-                                       <parameter name="p0" type="GdkEvent*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="editable" type="GtkCellEditable*"/>
+                                       <parameter name="path" type="char*"/>
                                </parameters>
                        </signal>
-               </object>
-               <object name="GtkColorButton" parent="GtkButton" type-name="GtkColorButton" get-type="gtk_color_button_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkActivatable"/>
-                       </implements>
-                       <method name="get_alpha" symbol="gtk_color_button_get_alpha">
-                               <return-type type="guint16"/>
+                       <vfunc name="activate">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
                                </parameters>
-                       </method>
-                       <method name="get_color" symbol="gtk_color_button_get_color">
+                       </vfunc>
+                       <vfunc name="get_aligned_area">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="aligned_area" type="GdkRectangle*"/>
                                </parameters>
-                       </method>
-                       <method name="get_rgba" symbol="gtk_color_button_get_rgba">
+                       </vfunc>
+                       <vfunc name="get_preferred_height">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="rgba" type="GdkRGBA*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="minimum_size" type="gint*"/>
+                                       <parameter name="natural_size" type="gint*"/>
                                </parameters>
-                       </method>
-                       <method name="get_title" symbol="gtk_color_button_get_title">
-                               <return-type type="gchar*"/>
+                       </vfunc>
+                       <vfunc name="get_preferred_height_for_width">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="minimum_height" type="gint*"/>
+                                       <parameter name="natural_height" type="gint*"/>
                                </parameters>
-                       </method>
-                       <method name="get_use_alpha" symbol="gtk_color_button_get_use_alpha">
-                               <return-type type="gboolean"/>
+                       </vfunc>
+                       <vfunc name="get_preferred_width">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="minimum_size" type="gint*"/>
+                                       <parameter name="natural_size" type="gint*"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_color_button_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_color" symbol="gtk_color_button_new_with_color">
-                               <return-type type="GtkWidget*"/>
+                       </vfunc>
+                       <vfunc name="get_preferred_width_for_height">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="height" type="gint"/>
+                                       <parameter name="minimum_width" type="gint*"/>
+                                       <parameter name="natural_width" type="gint*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_rgba" symbol="gtk_color_button_new_with_rgba">
-                               <return-type type="GtkWidget*"/>
+                       </vfunc>
+                       <vfunc name="get_request_mode">
+                               <return-type type="GtkSizeRequestMode"/>
                                <parameters>
-                                       <parameter name="rgba" type="GdkRGBA*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_alpha" symbol="gtk_color_button_set_alpha">
+                       </vfunc>
+                       <vfunc name="get_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="alpha" type="guint16"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="x_offset" type="gint*"/>
+                                       <parameter name="y_offset" type="gint*"/>
+                                       <parameter name="width" type="gint*"/>
+                                       <parameter name="height" type="gint*"/>
                                </parameters>
-                       </method>
-                       <method name="set_color" symbol="gtk_color_button_set_color">
+                       </vfunc>
+                       <vfunc name="render">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
                                </parameters>
-                       </method>
-                       <method name="set_rgba" symbol="gtk_color_button_set_rgba">
-                               <return-type type="void"/>
+                       </vfunc>
+                       <vfunc name="start_editing">
+                               <return-type type="GtkCellEditable*"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="rgba" type="GdkRGBA*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
                                </parameters>
-                       </method>
-                       <method name="set_title" symbol="gtk_color_button_set_title">
+                       </vfunc>
+               </object>
+               <object name="GtkCellRendererAccel" parent="GtkCellRendererText" type-name="GtkCellRendererAccel" get-type="gtk_cell_renderer_accel_get_type">
+                       <constructor name="new" symbol="gtk_cell_renderer_accel_new">
+                               <return-type type="GtkCellRenderer*"/>
+                       </constructor>
+                       <property name="accel-key" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="accel-mode" type="GtkCellRendererAccelMode" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="accel-mods" type="GdkModifierType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="keycode" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="accel-cleared" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="accel" type="GtkCellRendererAccel*"/>
+                                       <parameter name="path_string" type="char*"/>
                                </parameters>
-                       </method>
-                       <method name="set_use_alpha" symbol="gtk_color_button_set_use_alpha">
+                       </signal>
+                       <signal name="accel-edited" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="use_alpha" type="gboolean"/>
+                                       <parameter name="accel" type="GtkCellRendererAccel*"/>
+                                       <parameter name="path_string" type="char*"/>
+                                       <parameter name="accel_key" type="guint"/>
+                                       <parameter name="accel_mods" type="GdkModifierType"/>
+                                       <parameter name="hardware_keycode" type="guint"/>
                                </parameters>
-                       </method>
-                       <property name="alpha" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="color" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="use-alpha" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="color-set" when="FIRST">
+                       </signal>
+               </object>
+               <object name="GtkCellRendererCombo" parent="GtkCellRendererText" type-name="GtkCellRendererCombo" get-type="gtk_cell_renderer_combo_get_type">
+                       <constructor name="new" symbol="gtk_cell_renderer_combo_new">
+                               <return-type type="GtkCellRenderer*"/>
+                       </constructor>
+                       <property name="has-entry" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cp" type="GtkColorButton*"/>
+                                       <parameter name="object" type="GtkCellRendererCombo*"/>
+                                       <parameter name="p0" type="char*"/>
+                                       <parameter name="p1" type="GtkTreeIter*"/>
                                </parameters>
                        </signal>
                </object>
-               <object name="GtkColorSelection" parent="GtkVBox" type-name="GtkColorSelection" get-type="gtk_color_selection_get_type">
+               <object name="GtkCellRendererPixbuf" parent="GtkCellRenderer" type-name="GtkCellRendererPixbuf" get-type="gtk_cell_renderer_pixbuf_get_type">
+                       <constructor name="new" symbol="gtk_cell_renderer_pixbuf_new">
+                               <return-type type="GtkCellRenderer*"/>
+                       </constructor>
+                       <property name="follow-state" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pixbuf" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pixbuf-expander-closed" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pixbuf-expander-open" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="stock-detail" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="stock-id" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="stock-size" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkCellRendererProgress" parent="GtkCellRenderer" type-name="GtkCellRendererProgress" get-type="gtk_cell_renderer_progress_get_type">
                        <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
                                <interface name="GtkOrientable"/>
                        </implements>
-                       <method name="get_current_alpha" symbol="gtk_color_selection_get_current_alpha">
-                               <return-type type="guint16"/>
+                       <constructor name="new" symbol="gtk_cell_renderer_progress_new">
+                               <return-type type="GtkCellRenderer*"/>
+                       </constructor>
+                       <property name="inverted" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pulse" 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"/>
+                       <property name="text-xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="text-yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="value" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkCellRendererSpin" parent="GtkCellRendererText" type-name="GtkCellRendererSpin" get-type="gtk_cell_renderer_spin_get_type">
+                       <constructor name="new" symbol="gtk_cell_renderer_spin_new">
+                               <return-type type="GtkCellRenderer*"/>
+                       </constructor>
+                       <property name="adjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="climb-rate" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="digits" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkCellRendererSpinner" parent="GtkCellRenderer" type-name="GtkCellRendererSpinner" get-type="gtk_cell_renderer_spinner_get_type">
+                       <constructor name="new" symbol="gtk_cell_renderer_spinner_new">
+                               <return-type type="GtkCellRenderer*"/>
+                       </constructor>
+                       <property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pulse" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="size" type="GtkIconSize" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkCellRendererText" parent="GtkCellRenderer" type-name="GtkCellRendererText" get-type="gtk_cell_renderer_text_get_type">
+                       <constructor name="new" symbol="gtk_cell_renderer_text_new">
+                               <return-type type="GtkCellRenderer*"/>
+                       </constructor>
+                       <method name="set_fixed_height_from_font" symbol="gtk_cell_renderer_text_set_fixed_height_from_font">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="renderer" type="GtkCellRendererText*"/>
+                                       <parameter name="number_of_rows" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_current_color" symbol="gtk_color_selection_get_current_color">
+                       <property name="align-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="alignment" type="PangoAlignment" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="attributes" type="PangoAttrList*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <property name="background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="background-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="editable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="editable-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="ellipsize" type="PangoEllipsizeMode" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="ellipsize-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="family" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="family-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="font" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="font-desc" type="PangoFontDescription*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="foreground" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <property name="foreground-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="foreground-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="foreground-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="language" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="language-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="markup" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <property name="max-width-chars" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="rise" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="rise-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="scale" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="scale-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="single-paragraph-mode" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="size-points" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="size-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="stretch" type="PangoStretch" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="stretch-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="strikethrough" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="strikethrough-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="style" type="PangoStyle" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="style-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="underline" type="PangoUnderline" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="underline-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="variant" type="PangoVariant" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="variant-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="weight" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="weight-set" 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-mode" type="PangoWrapMode" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="wrap-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="edited" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="cell_renderer_text" type="GtkCellRendererText*"/>
+                                       <parameter name="path" type="char*"/>
+                                       <parameter name="new_text" type="char*"/>
                                </parameters>
-                       </method>
-                       <method name="get_current_rgba" symbol="gtk_color_selection_get_current_rgba">
-                               <return-type type="void"/>
+                       </signal>
+               </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="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="rgba" type="GdkRGBA*"/>
+                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
                                </parameters>
                        </method>
-                       <method name="get_has_opacity_control" symbol="gtk_color_selection_get_has_opacity_control">
+                       <method name="get_active" symbol="gtk_cell_renderer_toggle_get_active">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
                                </parameters>
                        </method>
-                       <method name="get_has_palette" symbol="gtk_color_selection_get_has_palette">
+                       <method name="get_radio" symbol="gtk_cell_renderer_toggle_get_radio">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
                                </parameters>
                        </method>
-                       <method name="get_previous_alpha" symbol="gtk_color_selection_get_previous_alpha">
-                               <return-type type="guint16"/>
+                       <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="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_previous_color" symbol="gtk_color_selection_get_previous_color">
+                       <method name="set_active" symbol="gtk_cell_renderer_toggle_set_active">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_previous_rgba" symbol="gtk_color_selection_get_previous_rgba">
+                       <method name="set_radio" symbol="gtk_cell_renderer_toggle_set_radio">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="rgba" type="GdkRGBA*"/>
+                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="radio" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="is_adjusting" symbol="gtk_color_selection_is_adjusting">
-                               <return-type type="gboolean"/>
+                       <property name="activatable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="inconsistent" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="indicator-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="radio" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="toggled" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="cell_renderer_toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="path" type="char*"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GtkCellView" parent="GtkWidget" type-name="GtkCellView" get-type="gtk_cell_view_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkCellLayout"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <method name="get_displayed_row" symbol="gtk_cell_view_get_displayed_row">
+                               <return-type type="GtkTreePath*"/>
+                               <parameters>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_color_selection_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="palette_from_string" symbol="gtk_color_selection_palette_from_string">
+                       <method name="get_draw_sensitive" symbol="gtk_cell_view_get_draw_sensitive">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="str" type="gchar*"/>
-                                       <parameter name="colors" type="GdkColor**"/>
-                                       <parameter name="n_colors" type="gint*"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
                                </parameters>
                        </method>
-                       <method name="palette_to_string" symbol="gtk_color_selection_palette_to_string">
-                               <return-type type="gchar*"/>
+                       <method name="get_fit_model" symbol="gtk_cell_view_get_fit_model">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="colors" type="GdkColor*"/>
-                                       <parameter name="n_colors" type="gint"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
                                </parameters>
                        </method>
-                       <method name="set_change_palette_with_screen_hook" symbol="gtk_color_selection_set_change_palette_with_screen_hook">
-                               <return-type type="GtkColorSelectionChangePaletteWithScreenFunc"/>
+                       <method name="get_model" symbol="gtk_cell_view_get_model">
+                               <return-type type="GtkTreeModel*"/>
                                <parameters>
-                                       <parameter name="func" type="GtkColorSelectionChangePaletteWithScreenFunc"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
                                </parameters>
                        </method>
-                       <method name="set_current_alpha" symbol="gtk_color_selection_set_current_alpha">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_cell_view_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_context" symbol="gtk_cell_view_new_with_context">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="alpha" type="guint16"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                                       <parameter name="context" type="GtkCellAreaContext*"/>
                                </parameters>
-                       </method>
-                       <method name="set_current_color" symbol="gtk_color_selection_set_current_color">
+                       </constructor>
+                       <constructor name="new_with_markup" symbol="gtk_cell_view_new_with_markup">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="markup" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_with_pixbuf" symbol="gtk_cell_view_new_with_pixbuf">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_with_text" symbol="gtk_cell_view_new_with_text">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="text" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_background_color" symbol="gtk_cell_view_set_background_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
                                        <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="set_current_rgba" symbol="gtk_color_selection_set_current_rgba">
+                       <method name="set_background_rgba" symbol="gtk_cell_view_set_background_rgba">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
                                        <parameter name="rgba" type="GdkRGBA*"/>
                                </parameters>
                        </method>
-                       <method name="set_has_opacity_control" symbol="gtk_color_selection_set_has_opacity_control">
+                       <method name="set_displayed_row" symbol="gtk_cell_view_set_displayed_row">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="has_opacity" type="gboolean"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="set_has_palette" symbol="gtk_color_selection_set_has_palette">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="has_palette" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_previous_alpha" symbol="gtk_color_selection_set_previous_alpha">
+                       <method name="set_draw_sensitive" symbol="gtk_cell_view_set_draw_sensitive">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="alpha" type="guint16"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="draw_sensitive" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_previous_color" symbol="gtk_color_selection_set_previous_color">
+                       <method name="set_fit_model" symbol="gtk_cell_view_set_fit_model">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="fit_model" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_previous_rgba" symbol="gtk_color_selection_set_previous_rgba">
+                       <method name="set_model" symbol="gtk_cell_view_set_model">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="rgba" type="GdkRGBA*"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </parameters>
                        </method>
-                       <property name="current-alpha" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="current-color" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="current-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="has-opacity-control" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="has-palette" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="color-changed" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="color_selection" type="GtkColorSelection*"/>
-                               </parameters>
-                       </signal>
+                       <property name="background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <property name="background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="background-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="cell-area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="cell-area-context" type="GtkCellAreaContext*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="draw-sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="fit-model" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
-               <object name="GtkColorSelectionDialog" parent="GtkDialog" type-name="GtkColorSelectionDialog" get-type="gtk_color_selection_dialog_get_type">
+               <object name="GtkCheckButton" parent="GtkToggleButton" type-name="GtkCheckButton" get-type="gtk_check_button_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
+                               <interface name="GtkActivatable"/>
                        </implements>
-                       <method name="get_color_selection" symbol="gtk_color_selection_dialog_get_color_selection">
+                       <constructor name="new" symbol="gtk_check_button_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_label" symbol="gtk_check_button_new_with_label">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelectionDialog*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_color_selection_dialog_new">
+                       </constructor>
+                       <constructor name="new_with_mnemonic" symbol="gtk_check_button_new_with_mnemonic">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <property name="cancel-button" type="GtkWidget*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="color-selection" type="GtkWidget*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="help-button" type="GtkWidget*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="ok-button" type="GtkWidget*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <vfunc name="draw_indicator">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="check_button" type="GtkCheckButton*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                               </parameters>
+                       </vfunc>
                </object>
-               <object name="GtkComboBox" parent="GtkBin" type-name="GtkComboBox" get-type="gtk_combo_box_get_type">
+               <object name="GtkCheckMenuItem" parent="GtkMenuItem" type-name="GtkCheckMenuItem" get-type="gtk_check_menu_item_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkCellLayout"/>
-                               <interface name="GtkCellEditable"/>
+                               <interface name="GtkActivatable"/>
                        </implements>
-                       <method name="get_active" symbol="gtk_combo_box_get_active">
-                               <return-type type="gint"/>
+                       <method name="get_active" symbol="gtk_check_menu_item_get_active">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="get_active_iter" symbol="gtk_combo_box_get_active_iter">
+                       <method name="get_draw_as_radio" symbol="gtk_check_menu_item_get_draw_as_radio">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="get_add_tearoffs" symbol="gtk_combo_box_get_add_tearoffs">
+                       <method name="get_inconsistent" symbol="gtk_check_menu_item_get_inconsistent">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="get_button_sensitivity" symbol="gtk_combo_box_get_button_sensitivity">
-                               <return-type type="GtkSensitivityType"/>
+                       <constructor name="new" symbol="gtk_check_menu_item_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_label" symbol="gtk_check_menu_item_new_with_label">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="get_column_span_column" symbol="gtk_combo_box_get_column_span_column">
-                               <return-type type="gint"/>
+                       </constructor>
+                       <constructor name="new_with_mnemonic" symbol="gtk_check_menu_item_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="get_entry_text_column" symbol="gtk_combo_box_get_entry_text_column">
-                               <return-type type="gint"/>
+                       </constructor>
+                       <method name="set_active" symbol="gtk_check_menu_item_set_active">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="is_active" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_focus_on_click" symbol="gtk_combo_box_get_focus_on_click">
-                               <return-type type="gboolean"/>
+                       <method name="set_draw_as_radio" symbol="gtk_check_menu_item_set_draw_as_radio">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo" type="GtkComboBox*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="draw_as_radio" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_has_entry" symbol="gtk_combo_box_get_has_entry">
-                               <return-type type="gboolean"/>
+                       <method name="set_inconsistent" symbol="gtk_check_menu_item_set_inconsistent">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_model" symbol="gtk_combo_box_get_model">
-                               <return-type type="GtkTreeModel*"/>
+                       <method name="toggled" symbol="gtk_check_menu_item_toggled">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="get_popup_accessible" symbol="gtk_combo_box_get_popup_accessible">
-                               <return-type type="AtkObject*"/>
+                       <property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="draw-as-radio" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="inconsistent" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="toggled" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
                                </parameters>
-                       </method>
-                       <method name="get_popup_fixed_width" symbol="gtk_combo_box_get_popup_fixed_width">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <vfunc name="draw_indicator">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
                                </parameters>
-                       </method>
-                       <method name="get_row_separator_func" symbol="gtk_combo_box_get_row_separator_func">
-                               <return-type type="GtkTreeViewRowSeparatorFunc"/>
+                       </vfunc>
+               </object>
+               <object name="GtkClipboard" parent="GObject" type-name="GtkClipboard" get-type="gtk_clipboard_get_type">
+                       <method name="clear" symbol="gtk_clipboard_clear">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="get_row_span_column" symbol="gtk_combo_box_get_row_span_column">
-                               <return-type type="gint"/>
+                       <method name="get" symbol="gtk_clipboard_get">
+                               <return-type type="GtkClipboard*"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="selection" type="GdkAtom"/>
                                </parameters>
                        </method>
-                       <method name="get_title" symbol="gtk_combo_box_get_title">
-                               <return-type type="gchar*"/>
+                       <method name="get_display" symbol="gtk_clipboard_get_display">
+                               <return-type type="GdkDisplay*"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="get_wrap_width" symbol="gtk_combo_box_get_wrap_width">
-                               <return-type type="gint"/>
+                       <method name="get_for_display" symbol="gtk_clipboard_get_for_display">
+                               <return-type type="GtkClipboard*"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="selection" type="GdkAtom"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_combo_box_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_entry" symbol="gtk_combo_box_new_with_entry">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_model" symbol="gtk_combo_box_new_with_model">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="model" type="GtkTreeModel*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_with_model_and_entry" symbol="gtk_combo_box_new_with_model_and_entry">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_owner" symbol="gtk_clipboard_get_owner">
+                               <return-type type="GObject*"/>
                                <parameters>
-                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
-                       </constructor>
-                       <method name="popdown" symbol="gtk_combo_box_popdown">
+                       </method>
+                       <method name="request_contents" symbol="gtk_clipboard_request_contents">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="target" type="GdkAtom"/>
+                                       <parameter name="callback" type="GtkClipboardReceivedFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="popup" symbol="gtk_combo_box_popup">
+                       <method name="request_image" symbol="gtk_clipboard_request_image">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="callback" type="GtkClipboardImageReceivedFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="popup_for_device" symbol="gtk_combo_box_popup_for_device">
+                       <method name="request_rich_text" symbol="gtk_clipboard_request_rich_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="device" type="GdkDevice*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="buffer" type="GtkTextBuffer*"/>
+                                       <parameter name="callback" type="GtkClipboardRichTextReceivedFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_active" symbol="gtk_combo_box_set_active">
+                       <method name="request_targets" symbol="gtk_clipboard_request_targets">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="index_" type="gint"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="callback" type="GtkClipboardTargetsReceivedFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_active_iter" symbol="gtk_combo_box_set_active_iter">
+                       <method name="request_text" symbol="gtk_clipboard_request_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="callback" type="GtkClipboardTextReceivedFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_add_tearoffs" symbol="gtk_combo_box_set_add_tearoffs">
+                       <method name="request_uris" symbol="gtk_clipboard_request_uris">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="add_tearoffs" type="gboolean"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="callback" type="GtkClipboardURIReceivedFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_button_sensitivity" symbol="gtk_combo_box_set_button_sensitivity">
+                       <method name="set_can_store" symbol="gtk_clipboard_set_can_store">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="sensitivity" type="GtkSensitivityType"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="targets" type="GtkTargetEntry*"/>
+                                       <parameter name="n_targets" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_column_span_column" symbol="gtk_combo_box_set_column_span_column">
+                       <method name="set_image" symbol="gtk_clipboard_set_image">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="column_span" type="gint"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
                        </method>
-                       <method name="set_entry_text_column" symbol="gtk_combo_box_set_entry_text_column">
+                       <method name="set_text" symbol="gtk_clipboard_set_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="text_column" type="gint"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="len" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_focus_on_click" symbol="gtk_combo_box_set_focus_on_click">
-                               <return-type type="void"/>
+                       <method name="set_with_data" symbol="gtk_clipboard_set_with_data">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo" type="GtkComboBox*"/>
-                                       <parameter name="focus_on_click" type="gboolean"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="targets" type="GtkTargetEntry*"/>
+                                       <parameter name="n_targets" type="guint"/>
+                                       <parameter name="get_func" type="GtkClipboardGetFunc"/>
+                                       <parameter name="clear_func" type="GtkClipboardClearFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_model" symbol="gtk_combo_box_set_model">
-                               <return-type type="void"/>
+                       <method name="set_with_owner" symbol="gtk_clipboard_set_with_owner">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="targets" type="GtkTargetEntry*"/>
+                                       <parameter name="n_targets" type="guint"/>
+                                       <parameter name="get_func" type="GtkClipboardGetFunc"/>
+                                       <parameter name="clear_func" type="GtkClipboardClearFunc"/>
+                                       <parameter name="owner" type="GObject*"/>
                                </parameters>
                        </method>
-                       <method name="set_popup_fixed_width" symbol="gtk_combo_box_set_popup_fixed_width">
+                       <method name="store" symbol="gtk_clipboard_store">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="fixed" type="gboolean"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="set_row_separator_func" symbol="gtk_combo_box_set_row_separator_func">
-                               <return-type type="void"/>
+                       <method name="wait_for_contents" symbol="gtk_clipboard_wait_for_contents">
+                               <return-type type="GtkSelectionData*"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="func" type="GtkTreeViewRowSeparatorFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GDestroyNotify"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="target" type="GdkAtom"/>
                                </parameters>
                        </method>
-                       <method name="set_row_span_column" symbol="gtk_combo_box_set_row_span_column">
-                               <return-type type="void"/>
+                       <method name="wait_for_image" symbol="gtk_clipboard_wait_for_image">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="row_span" type="gint"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="set_title" symbol="gtk_combo_box_set_title">
-                               <return-type type="void"/>
+                       <method name="wait_for_rich_text" symbol="gtk_clipboard_wait_for_rich_text">
+                               <return-type type="guint8*"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="buffer" type="GtkTextBuffer*"/>
+                                       <parameter name="format" type="GdkAtom*"/>
+                                       <parameter name="length" type="gsize*"/>
                                </parameters>
                        </method>
-                       <method name="set_wrap_width" symbol="gtk_combo_box_set_wrap_width">
-                               <return-type type="void"/>
+                       <method name="wait_for_targets" symbol="gtk_clipboard_wait_for_targets">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="width" type="gint"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="targets" type="GdkAtom**"/>
+                                       <parameter name="n_targets" type="gint*"/>
                                </parameters>
                        </method>
-                       <property name="active" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="add-tearoffs" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="button-sensitivity" type="GtkSensitivityType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="column-span-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="entry-text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="focus-on-click" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="has-entry" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="has-frame" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="popup-fixed-width" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="popup-shown" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="row-span-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="tearoff-title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="wrap-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="changed" when="LAST">
-                               <return-type type="void"/>
+                       <method name="wait_for_text" symbol="gtk_clipboard_wait_for_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
-                       </signal>
-                       <signal name="move-active" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="wait_for_uris" symbol="gtk_clipboard_wait_for_uris">
+                               <return-type type="gchar**"/>
                                <parameters>
-                                       <parameter name="object" type="GtkComboBox*"/>
-                                       <parameter name="p0" type="GtkScrollType"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
-                       </signal>
-                       <signal name="popdown" when="LAST">
+                       </method>
+                       <method name="wait_is_image_available" symbol="gtk_clipboard_wait_is_image_available">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="object" type="GtkComboBox*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="popup" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="object" type="GtkComboBox*"/>
-                               </parameters>
-                       </signal>
-               </object>
-               <object name="GtkComboBoxText" parent="GtkComboBox" type-name="GtkComboBoxText" get-type="gtk_combo_box_text_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkCellLayout"/>
-                               <interface name="GtkCellEditable"/>
-                       </implements>
-                       <method name="append_text" symbol="gtk_combo_box_text_append_text">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="get_active_text" symbol="gtk_combo_box_text_get_active_text">
-                               <return-type type="gchar*"/>
+                       <method name="wait_is_rich_text_available" symbol="gtk_clipboard_wait_is_rich_text_available">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="buffer" type="GtkTextBuffer*"/>
                                </parameters>
                        </method>
-                       <method name="insert_text" symbol="gtk_combo_box_text_insert_text">
-                               <return-type type="void"/>
+                       <method name="wait_is_target_available" symbol="gtk_clipboard_wait_is_target_available">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
-                                       <parameter name="position" type="gint"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="target" type="GdkAtom"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_combo_box_text_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_entry" symbol="gtk_combo_box_text_new_with_entry">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="prepend_text" symbol="gtk_combo_box_text_prepend_text">
-                               <return-type type="void"/>
+                       <method name="wait_is_text_available" symbol="gtk_clipboard_wait_is_text_available">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="remove" symbol="gtk_combo_box_text_remove">
-                               <return-type type="void"/>
+                       <method name="wait_is_uris_available" symbol="gtk_clipboard_wait_is_uris_available">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="remove_all" symbol="gtk_combo_box_text_remove_all">
+                       <signal name="owner-change" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
+                                       <parameter name="object" type="GtkClipboard*"/>
+                                       <parameter name="p0" type="GdkEvent*"/>
                                </parameters>
-                       </method>
+                       </signal>
                </object>
-               <object name="GtkContainer" parent="GtkWidget" type-name="GtkContainer" get-type="gtk_container_get_type">
+               <object name="GtkColorButton" parent="GtkButton" type-name="GtkColorButton" get-type="gtk_color_button_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
+                               <interface name="GtkActivatable"/>
                        </implements>
-                       <method name="add" symbol="gtk_container_add">
-                               <return-type type="void"/>
+                       <method name="get_alpha" symbol="gtk_color_button_get_alpha">
+                               <return-type type="guint16"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
                                </parameters>
                        </method>
-                       <method name="add_with_properties" symbol="gtk_container_add_with_properties">
+                       <method name="get_color" symbol="gtk_color_button_get_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="first_prop_name" type="gchar*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="check_resize" symbol="gtk_container_check_resize">
+                       <method name="get_rgba" symbol="gtk_color_button_get_rgba">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="rgba" type="GdkRGBA*"/>
                                </parameters>
                        </method>
-                       <method name="child_get" symbol="gtk_container_child_get">
-                               <return-type type="void"/>
+                       <method name="get_title" symbol="gtk_color_button_get_title">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="first_prop_name" type="gchar*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
                                </parameters>
                        </method>
-                       <method name="child_get_property" symbol="gtk_container_child_get_property">
-                               <return-type type="void"/>
+                       <method name="get_use_alpha" symbol="gtk_color_button_get_use_alpha">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="property_name" type="gchar*"/>
-                                       <parameter name="value" type="GValue*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
                                </parameters>
                        </method>
-                       <method name="child_get_valist" symbol="gtk_container_child_get_valist">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_color_button_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_color" symbol="gtk_color_button_new_with_color">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="first_property_name" type="gchar*"/>
-                                       <parameter name="var_args" type="va_list"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
-                       </method>
-                       <method name="child_set" symbol="gtk_container_child_set">
+                       </constructor>
+                       <constructor name="new_with_rgba" symbol="gtk_color_button_new_with_rgba">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="rgba" type="GdkRGBA*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_alpha" symbol="gtk_color_button_set_alpha">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="first_prop_name" type="gchar*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="alpha" type="guint16"/>
                                </parameters>
                        </method>
-                       <method name="child_set_property" symbol="gtk_container_child_set_property">
+                       <method name="set_color" symbol="gtk_color_button_set_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="property_name" type="gchar*"/>
-                                       <parameter name="value" type="GValue*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="child_set_valist" symbol="gtk_container_child_set_valist">
+                       <method name="set_rgba" symbol="gtk_color_button_set_rgba">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="first_property_name" type="gchar*"/>
-                                       <parameter name="var_args" type="va_list"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="rgba" type="GdkRGBA*"/>
                                </parameters>
                        </method>
-                       <method name="child_type" symbol="gtk_container_child_type">
-                               <return-type type="GType"/>
+                       <method name="set_title" symbol="gtk_color_button_set_title">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="class_find_child_property" symbol="gtk_container_class_find_child_property">
-                               <return-type type="GParamSpec*"/>
-                               <parameters>
-                                       <parameter name="cclass" type="GObjectClass*"/>
-                                       <parameter name="property_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="class_handle_border_width" symbol="gtk_container_class_handle_border_width">
+                       <method name="set_use_alpha" symbol="gtk_color_button_set_use_alpha">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="klass" type="GtkContainerClass*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="use_alpha" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="class_install_child_property" symbol="gtk_container_class_install_child_property">
+                       <property name="alpha" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="color" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="use-alpha" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="color-set" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cclass" type="GtkContainerClass*"/>
-                                       <parameter name="property_id" type="guint"/>
-                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="cp" type="GtkColorButton*"/>
                                </parameters>
-                       </method>
-                       <method name="class_list_child_properties" symbol="gtk_container_class_list_child_properties">
-                               <return-type type="GParamSpec**"/>
+                       </signal>
+               </object>
+               <object name="GtkColorSelection" parent="GtkVBox" type-name="GtkColorSelection" get-type="gtk_color_selection_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <method name="get_current_alpha" symbol="gtk_color_selection_get_current_alpha">
+                               <return-type type="guint16"/>
                                <parameters>
-                                       <parameter name="cclass" type="GObjectClass*"/>
-                                       <parameter name="n_properties" type="guint*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
                                </parameters>
                        </method>
-                       <method name="forall" symbol="gtk_container_forall">
+                       <method name="get_current_color" symbol="gtk_color_selection_get_current_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="callback" type="GtkCallback"/>
-                                       <parameter name="callback_data" type="gpointer"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="foreach" symbol="gtk_container_foreach">
+                       <method name="get_current_rgba" symbol="gtk_color_selection_get_current_rgba">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="callback" type="GtkCallback"/>
-                                       <parameter name="callback_data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="get_border_width" symbol="gtk_container_get_border_width">
-                               <return-type type="guint"/>
-                               <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="rgba" type="GdkRGBA*"/>
                                </parameters>
                        </method>
-                       <method name="get_children" symbol="gtk_container_get_children">
-                               <return-type type="GList*"/>
+                       <method name="get_has_opacity_control" symbol="gtk_color_selection_get_has_opacity_control">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
                                </parameters>
                        </method>
-                       <method name="get_focus_chain" symbol="gtk_container_get_focus_chain">
+                       <method name="get_has_palette" symbol="gtk_color_selection_get_has_palette">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="focusable_widgets" type="GList**"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
                                </parameters>
                        </method>
-                       <method name="get_focus_child" symbol="gtk_container_get_focus_child">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_previous_alpha" symbol="gtk_color_selection_get_previous_alpha">
+                               <return-type type="guint16"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
                                </parameters>
                        </method>
-                       <method name="get_focus_hadjustment" symbol="gtk_container_get_focus_hadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       <method name="get_previous_color" symbol="gtk_color_selection_get_previous_color">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="get_focus_vadjustment" symbol="gtk_container_get_focus_vadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       <method name="get_previous_rgba" symbol="gtk_color_selection_get_previous_rgba">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="rgba" type="GdkRGBA*"/>
                                </parameters>
                        </method>
-                       <method name="get_resize_mode" symbol="gtk_container_get_resize_mode">
-                               <return-type type="GtkResizeMode"/>
+                       <method name="is_adjusting" symbol="gtk_color_selection_is_adjusting">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
                                </parameters>
                        </method>
-                       <method name="propagate_draw" symbol="gtk_container_propagate_draw">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_color_selection_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="palette_from_string" symbol="gtk_color_selection_palette_from_string">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="colors" type="GdkColor**"/>
+                                       <parameter name="n_colors" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="remove" symbol="gtk_container_remove">
-                               <return-type type="void"/>
+                       <method name="palette_to_string" symbol="gtk_color_selection_palette_to_string">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="colors" type="GdkColor*"/>
+                                       <parameter name="n_colors" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="resize_children" symbol="gtk_container_resize_children">
-                               <return-type type="void"/>
+                       <method name="set_change_palette_with_screen_hook" symbol="gtk_color_selection_set_change_palette_with_screen_hook">
+                               <return-type type="GtkColorSelectionChangePaletteWithScreenFunc"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="func" type="GtkColorSelectionChangePaletteWithScreenFunc"/>
                                </parameters>
                        </method>
-                       <method name="set_border_width" symbol="gtk_container_set_border_width">
+                       <method name="set_current_alpha" symbol="gtk_color_selection_set_current_alpha">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="border_width" type="guint"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="alpha" type="guint16"/>
                                </parameters>
                        </method>
-                       <method name="set_focus_chain" symbol="gtk_container_set_focus_chain">
+                       <method name="set_current_color" symbol="gtk_color_selection_set_current_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="focusable_widgets" type="GList*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="set_focus_child" symbol="gtk_container_set_focus_child">
+                       <method name="set_current_rgba" symbol="gtk_color_selection_set_current_rgba">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="rgba" type="GdkRGBA*"/>
                                </parameters>
                        </method>
-                       <method name="set_focus_hadjustment" symbol="gtk_container_set_focus_hadjustment">
+                       <method name="set_has_opacity_control" symbol="gtk_color_selection_set_has_opacity_control">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="has_opacity" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_focus_vadjustment" symbol="gtk_container_set_focus_vadjustment">
+                       <method name="set_has_palette" symbol="gtk_color_selection_set_has_palette">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="has_palette" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_reallocate_redraws" symbol="gtk_container_set_reallocate_redraws">
+                       <method name="set_previous_alpha" symbol="gtk_color_selection_set_previous_alpha">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="needs_redraws" type="gboolean"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="alpha" type="guint16"/>
                                </parameters>
                        </method>
-                       <method name="set_resize_mode" symbol="gtk_container_set_resize_mode">
+                       <method name="set_previous_color" symbol="gtk_color_selection_set_previous_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="resize_mode" type="GtkResizeMode"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="unset_focus_chain" symbol="gtk_container_unset_focus_chain">
+                       <method name="set_previous_rgba" symbol="gtk_color_selection_set_previous_rgba">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="rgba" type="GdkRGBA*"/>
                                </parameters>
                        </method>
-                       <property name="border-width" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="child" type="GtkWidget*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="resize-mode" type="GtkResizeMode" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="add" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="check-resize" when="LAST">
+                       <property name="current-alpha" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="current-color" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="current-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="has-opacity-control" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="has-palette" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="color-changed" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="color_selection" type="GtkColorSelection*"/>
                                </parameters>
                        </signal>
-                       <signal name="remove" when="FIRST">
-                               <return-type type="void"/>
+               </object>
+               <object name="GtkColorSelectionDialog" parent="GtkDialog" type-name="GtkColorSelectionDialog" get-type="gtk_color_selection_dialog_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_color_selection" symbol="gtk_color_selection_dialog_get_color_selection">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="colorsel" type="GtkColorSelectionDialog*"/>
                                </parameters>
-                       </signal>
-                       <signal name="set-focus-child" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <constructor name="new" symbol="gtk_color_selection_dialog_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="child_type">
-                               <return-type type="GType"/>
+                       </constructor>
+                       <property name="cancel-button" type="GtkWidget*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="color-selection" type="GtkWidget*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="help-button" type="GtkWidget*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="ok-button" type="GtkWidget*" readable="1" writable="0" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkComboBox" parent="GtkBin" type-name="GtkComboBox" get-type="gtk_combo_box_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkCellLayout"/>
+                               <interface name="GtkCellEditable"/>
+                       </implements>
+                       <method name="get_active" symbol="gtk_combo_box_get_active">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="composite_name">
+                       </method>
+                       <method name="get_active_id" symbol="gtk_combo_box_get_active_id">
                                <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="forall">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_active_iter" symbol="gtk_combo_box_get_active_iter">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="include_internals" type="gboolean"/>
-                                       <parameter name="callback" type="GtkCallback"/>
-                                       <parameter name="callback_data" type="gpointer"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_child_property">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_add_tearoffs" symbol="gtk_combo_box_get_add_tearoffs">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="property_id" type="guint"/>
-                                       <parameter name="value" type="GValue*"/>
-                                       <parameter name="pspec" type="GParamSpec*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="set_child_property">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="property_id" type="guint"/>
-                                       <parameter name="value" type="GValue*"/>
-                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkDialog" parent="GtkWindow" type-name="GtkDialog" get-type="gtk_dialog_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="add_action_widget" symbol="gtk_dialog_add_action_widget">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_button_sensitivity" symbol="gtk_combo_box_get_button_sensitivity">
+                               <return-type type="GtkSensitivityType"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="add_button" symbol="gtk_dialog_add_button">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_column_span_column" symbol="gtk_combo_box_get_column_span_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="button_text" type="gchar*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="add_buttons" symbol="gtk_dialog_add_buttons">
-                               <return-type type="void"/>
+                       <method name="get_entry_text_column" symbol="gtk_combo_box_get_entry_text_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="first_button_text" type="gchar*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_action_area" symbol="gtk_dialog_get_action_area">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_focus_on_click" symbol="gtk_combo_box_get_focus_on_click">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="combo" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_content_area" symbol="gtk_dialog_get_content_area">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_has_entry" symbol="gtk_combo_box_get_has_entry">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_response_for_widget" symbol="gtk_dialog_get_response_for_widget">
+                       <method name="get_id_column" symbol="gtk_combo_box_get_id_column">
                                <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_widget_for_response" symbol="gtk_dialog_get_widget_for_response">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_model" symbol="gtk_combo_box_get_model">
+                               <return-type type="GtkTreeModel*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_dialog_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_buttons" symbol="gtk_dialog_new_with_buttons">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="parent" type="GtkWindow*"/>
-                                       <parameter name="flags" type="GtkDialogFlags"/>
-                                       <parameter name="first_button_text" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="response" symbol="gtk_dialog_response">
-                               <return-type type="void"/>
+                       <method name="get_popup_accessible" symbol="gtk_combo_box_get_popup_accessible">
+                               <return-type type="AtkObject*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="run" symbol="gtk_dialog_run">
-                               <return-type type="gint"/>
+                       <method name="get_popup_fixed_width" symbol="gtk_combo_box_get_popup_fixed_width">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="set_alternative_button_order" symbol="gtk_dialog_set_alternative_button_order">
-                               <return-type type="void"/>
+                       <method name="get_row_separator_func" symbol="gtk_combo_box_get_row_separator_func">
+                               <return-type type="GtkTreeViewRowSeparatorFunc"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="first_response_id" type="gint"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="set_alternative_button_order_from_array" symbol="gtk_dialog_set_alternative_button_order_from_array">
-                               <return-type type="void"/>
+                       <method name="get_row_span_column" symbol="gtk_combo_box_get_row_span_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="n_params" type="gint"/>
-                                       <parameter name="new_order" type="gint*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="set_default_response" symbol="gtk_dialog_set_default_response">
-                               <return-type type="void"/>
+                       <method name="get_title" symbol="gtk_combo_box_get_title">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="set_response_sensitive" symbol="gtk_dialog_set_response_sensitive">
-                               <return-type type="void"/>
+                       <method name="get_wrap_width" symbol="gtk_combo_box_get_wrap_width">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="response_id" type="gint"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <signal name="close" when="LAST">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_combo_box_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_area" symbol="gtk_combo_box_new_with_area">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
                                </parameters>
-                       </signal>
-                       <signal name="response" when="LAST">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_with_area_and_entry" symbol="gtk_combo_box_new_with_area_and_entry">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkDrawingArea" parent="GtkWidget" type-name="GtkDrawingArea" get-type="gtk_drawing_area_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_drawing_area_new">
+                       </constructor>
+                       <constructor name="new_with_entry" symbol="gtk_combo_box_new_with_entry">
                                <return-type type="GtkWidget*"/>
                        </constructor>
-               </object>
-               <object name="GtkEntry" parent="GtkWidget" type-name="GtkEntry" get-type="gtk_entry_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkEditable"/>
-                               <interface name="GtkCellEditable"/>
-                       </implements>
-                       <method name="get_activates_default" symbol="gtk_entry_get_activates_default">
-                               <return-type type="gboolean"/>
+                       <constructor name="new_with_model" symbol="gtk_combo_box_new_with_model">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </parameters>
-                       </method>
-                       <method name="get_alignment" symbol="gtk_entry_get_alignment">
-                               <return-type type="gfloat"/>
+                       </constructor>
+                       <constructor name="new_with_model_and_entry" symbol="gtk_combo_box_new_with_model_and_entry">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </parameters>
-                       </method>
-                       <method name="get_buffer" symbol="gtk_entry_get_buffer">
-                               <return-type type="GtkEntryBuffer*"/>
+                       </constructor>
+                       <method name="popdown" symbol="gtk_combo_box_popdown">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_completion" symbol="gtk_entry_get_completion">
-                               <return-type type="GtkEntryCompletion*"/>
+                       <method name="popup" symbol="gtk_combo_box_popup">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_current_icon_drag_source" symbol="gtk_entry_get_current_icon_drag_source">
-                               <return-type type="gint"/>
+                       <method name="popup_for_device" symbol="gtk_combo_box_popup_for_device">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="device" type="GdkDevice*"/>
                                </parameters>
                        </method>
-                       <method name="get_cursor_hadjustment" symbol="gtk_entry_get_cursor_hadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       <method name="set_active" symbol="gtk_combo_box_set_active">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="index_" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_has_frame" symbol="gtk_entry_get_has_frame">
-                               <return-type type="gboolean"/>
+                       <method name="set_active_id" symbol="gtk_combo_box_set_active_id">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="active_id" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_activatable" symbol="gtk_entry_get_icon_activatable">
-                               <return-type type="gboolean"/>
+                       <method name="set_active_iter" symbol="gtk_combo_box_set_active_iter">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_area" symbol="gtk_entry_get_icon_area">
+                       <method name="set_add_tearoffs" symbol="gtk_combo_box_set_add_tearoffs">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
-                                       <parameter name="icon_area" type="GdkRectangle*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="add_tearoffs" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_at_pos" symbol="gtk_entry_get_icon_at_pos">
-                               <return-type type="gint"/>
+                       <method name="set_button_sensitivity" symbol="gtk_combo_box_set_button_sensitivity">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="sensitivity" type="GtkSensitivityType"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_gicon" symbol="gtk_entry_get_icon_gicon">
-                               <return-type type="GIcon*"/>
+                       <method name="set_column_span_column" symbol="gtk_combo_box_set_column_span_column">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="column_span" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_name" symbol="gtk_entry_get_icon_name">
-                               <return-type type="gchar*"/>
+                       <method name="set_entry_text_column" symbol="gtk_combo_box_set_entry_text_column">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="text_column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_pixbuf" symbol="gtk_entry_get_icon_pixbuf">
-                               <return-type type="GdkPixbuf*"/>
+                       <method name="set_focus_on_click" symbol="gtk_combo_box_set_focus_on_click">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="combo" type="GtkComboBox*"/>
+                                       <parameter name="focus_on_click" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_sensitive" symbol="gtk_entry_get_icon_sensitive">
-                               <return-type type="gboolean"/>
+                       <method name="set_id_column" symbol="gtk_combo_box_set_id_column">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
-                               </parameters>
-                       </method>
-                       <method name="get_icon_stock" symbol="gtk_entry_get_icon_stock">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="id_column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_storage_type" symbol="gtk_entry_get_icon_storage_type">
-                               <return-type type="GtkImageType"/>
+                       <method name="set_model" symbol="gtk_combo_box_set_model">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_tooltip_markup" symbol="gtk_entry_get_icon_tooltip_markup">
-                               <return-type type="gchar*"/>
+                       <method name="set_popup_fixed_width" symbol="gtk_combo_box_set_popup_fixed_width">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="fixed" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_tooltip_text" symbol="gtk_entry_get_icon_tooltip_text">
-                               <return-type type="gchar*"/>
+                       <method name="set_row_separator_func" symbol="gtk_combo_box_set_row_separator_func">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="func" type="GtkTreeViewRowSeparatorFunc"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </parameters>
                        </method>
-                       <method name="get_inner_border" symbol="gtk_entry_get_inner_border">
-                               <return-type type="GtkBorder*"/>
+                       <method name="set_row_span_column" symbol="gtk_combo_box_set_row_span_column">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="row_span" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_invisible_char" symbol="gtk_entry_get_invisible_char">
-                               <return-type type="gunichar"/>
+                       <method name="set_title" symbol="gtk_combo_box_set_title">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_layout" symbol="gtk_entry_get_layout">
-                               <return-type type="PangoLayout*"/>
+                       <method name="set_wrap_width" symbol="gtk_combo_box_set_wrap_width">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="width" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_layout_offsets" symbol="gtk_entry_get_layout_offsets">
+                       <property name="active" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="active-id" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="add-tearoffs" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="button-sensitivity" type="GtkSensitivityType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="cell-area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="column-span-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="entry-text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="focus-on-click" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="has-entry" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="has-frame" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="id-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="popup-fixed-width" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="popup-shown" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="row-span-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="tearoff-title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="wrap-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="x" type="gint*"/>
-                                       <parameter name="y" type="gint*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
-                       </method>
-                       <method name="get_max_length" symbol="gtk_entry_get_max_length">
-                               <return-type type="gint"/>
+                       </signal>
+                       <signal name="move-active" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="object" type="GtkComboBox*"/>
+                                       <parameter name="p0" type="GtkScrollType"/>
                                </parameters>
-                       </method>
-                       <method name="get_overwrite_mode" symbol="gtk_entry_get_overwrite_mode">
+                       </signal>
+                       <signal name="popdown" when="LAST">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_progress_fraction" symbol="gtk_entry_get_progress_fraction">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_progress_pulse_step" symbol="gtk_entry_get_progress_pulse_step">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_text" symbol="gtk_entry_get_text">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="object" type="GtkComboBox*"/>
                                </parameters>
-                       </method>
-                       <method name="get_text_area" symbol="gtk_entry_get_text_area">
+                       </signal>
+                       <signal name="popup" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="text_area" type="GdkRectangle*"/>
+                                       <parameter name="object" type="GtkComboBox*"/>
                                </parameters>
-                       </method>
-                       <method name="get_text_length" symbol="gtk_entry_get_text_length">
-                               <return-type type="guint16"/>
+                       </signal>
+               </object>
+               <object name="GtkComboBoxText" parent="GtkComboBox" type-name="GtkComboBoxText" get-type="gtk_combo_box_text_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkCellLayout"/>
+                               <interface name="GtkCellEditable"/>
+                       </implements>
+                       <method name="append" symbol="gtk_combo_box_text_append">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
+                                       <parameter name="id" type="gchar*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_visibility" symbol="gtk_entry_get_visibility">
-                               <return-type type="gboolean"/>
+                       <method name="append_text" symbol="gtk_combo_box_text_append_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_width_chars" symbol="gtk_entry_get_width_chars">
-                               <return-type type="gint"/>
+                       <method name="get_active_text" symbol="gtk_combo_box_text_get_active_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
                                </parameters>
                        </method>
-                       <method name="im_context_filter_keypress" symbol="gtk_entry_im_context_filter_keypress">
-                               <return-type type="gboolean"/>
+                       <method name="insert" symbol="gtk_combo_box_text_insert">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="event" type="GdkEventKey*"/>
+                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
+                                       <parameter name="position" type="gint"/>
+                                       <parameter name="id" type="gchar*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="layout_index_to_text_index" symbol="gtk_entry_layout_index_to_text_index">
-                               <return-type type="gint"/>
+                       <method name="insert_text" symbol="gtk_combo_box_text_insert_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="layout_index" type="gint"/>
+                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
+                                       <parameter name="position" type="gint"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_entry_new">
+                       <constructor name="new" symbol="gtk_combo_box_text_new">
                                <return-type type="GtkWidget*"/>
                        </constructor>
-                       <constructor name="new_with_buffer" symbol="gtk_entry_new_with_buffer">
+                       <constructor name="new_with_entry" symbol="gtk_combo_box_text_new_with_entry">
                                <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
-                               </parameters>
                        </constructor>
-                       <method name="progress_pulse" symbol="gtk_entry_progress_pulse">
+                       <method name="prepend" symbol="gtk_combo_box_text_prepend">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
+                                       <parameter name="id" type="gchar*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="reset_im_context" symbol="gtk_entry_reset_im_context">
+                       <method name="prepend_text" symbol="gtk_combo_box_text_prepend_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_activates_default" symbol="gtk_entry_set_activates_default">
+                       <method name="remove" symbol="gtk_combo_box_text_remove">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_alignment" symbol="gtk_entry_set_alignment">
+                       <method name="remove_all" symbol="gtk_combo_box_text_remove_all">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="combo_box" type="GtkComboBoxText*"/>
                                </parameters>
                        </method>
-                       <method name="set_buffer" symbol="gtk_entry_set_buffer">
+               </object>
+               <object name="GtkContainer" parent="GtkWidget" type-name="GtkContainer" get-type="gtk_container_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="add" symbol="gtk_container_add">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_completion" symbol="gtk_entry_set_completion">
+                       <method name="add_with_properties" symbol="gtk_container_add_with_properties">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="first_prop_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_cursor_hadjustment" symbol="gtk_entry_set_cursor_hadjustment">
+                       <method name="check_resize" symbol="gtk_container_check_resize">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </method>
-                       <method name="set_has_frame" symbol="gtk_entry_set_has_frame">
+                       <method name="child_get" symbol="gtk_container_child_get">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="first_prop_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_icon_activatable" symbol="gtk_entry_set_icon_activatable">
+                       <method name="child_get_property" symbol="gtk_container_child_get_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
-                                       <parameter name="activatable" type="gboolean"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="property_name" type="gchar*"/>
+                                       <parameter name="value" type="GValue*"/>
                                </parameters>
                        </method>
-                       <method name="set_icon_drag_source" symbol="gtk_entry_set_icon_drag_source">
+                       <method name="child_get_valist" symbol="gtk_container_child_get_valist">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
-                                       <parameter name="target_list" type="GtkTargetList*"/>
-                                       <parameter name="actions" type="GdkDragAction"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="first_property_name" type="gchar*"/>
+                                       <parameter name="var_args" type="va_list"/>
                                </parameters>
                        </method>
-                       <method name="set_icon_from_gicon" symbol="gtk_entry_set_icon_from_gicon">
+                       <method name="child_set" symbol="gtk_container_child_set">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
-                                       <parameter name="icon" type="GIcon*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="first_prop_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_icon_from_icon_name" symbol="gtk_entry_set_icon_from_icon_name">
+                       <method name="child_set_property" symbol="gtk_container_child_set_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
-                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="property_name" type="gchar*"/>
+                                       <parameter name="value" type="GValue*"/>
                                </parameters>
                        </method>
-                       <method name="set_icon_from_pixbuf" symbol="gtk_entry_set_icon_from_pixbuf">
+                       <method name="child_set_valist" symbol="gtk_container_child_set_valist">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="first_property_name" type="gchar*"/>
+                                       <parameter name="var_args" type="va_list"/>
                                </parameters>
                        </method>
-                       <method name="set_icon_from_stock" symbol="gtk_entry_set_icon_from_stock">
-                               <return-type type="void"/>
+                       <method name="child_type" symbol="gtk_container_child_type">
+                               <return-type type="GType"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </method>
-                       <method name="set_icon_sensitive" symbol="gtk_entry_set_icon_sensitive">
-                               <return-type type="void"/>
+                       <method name="class_find_child_property" symbol="gtk_container_class_find_child_property">
+                               <return-type type="GParamSpec*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
-                                       <parameter name="sensitive" type="gboolean"/>
+                                       <parameter name="cclass" type="GObjectClass*"/>
+                                       <parameter name="property_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_icon_tooltip_markup" symbol="gtk_entry_set_icon_tooltip_markup">
+                       <method name="class_handle_border_width" symbol="gtk_container_class_handle_border_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
-                                       <parameter name="tooltip" type="gchar*"/>
+                                       <parameter name="klass" type="GtkContainerClass*"/>
                                </parameters>
                        </method>
-                       <method name="set_icon_tooltip_text" symbol="gtk_entry_set_icon_tooltip_text">
+                       <method name="class_install_child_property" symbol="gtk_container_class_install_child_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
-                                       <parameter name="tooltip" type="gchar*"/>
+                                       <parameter name="cclass" type="GtkContainerClass*"/>
+                                       <parameter name="property_id" type="guint"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
                                </parameters>
                        </method>
-                       <method name="set_inner_border" symbol="gtk_entry_set_inner_border">
-                               <return-type type="void"/>
+                       <method name="class_list_child_properties" symbol="gtk_container_class_list_child_properties">
+                               <return-type type="GParamSpec**"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="border" type="GtkBorder*"/>
+                                       <parameter name="cclass" type="GObjectClass*"/>
+                                       <parameter name="n_properties" type="guint*"/>
                                </parameters>
                        </method>
-                       <method name="set_invisible_char" symbol="gtk_entry_set_invisible_char">
+                       <method name="forall" symbol="gtk_container_forall">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="ch" type="gunichar"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="callback" type="GtkCallback"/>
+                                       <parameter name="callback_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_max_length" symbol="gtk_entry_set_max_length">
+                       <method name="foreach" symbol="gtk_container_foreach">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="max" type="gint"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="callback" type="GtkCallback"/>
+                                       <parameter name="callback_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_overwrite_mode" symbol="gtk_entry_set_overwrite_mode">
-                               <return-type type="void"/>
+                       <method name="get_border_width" symbol="gtk_container_get_border_width">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="overwrite" type="gboolean"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </method>
-                       <method name="set_progress_fraction" symbol="gtk_entry_set_progress_fraction">
-                               <return-type type="void"/>
+                       <method name="get_children" symbol="gtk_container_get_children">
+                               <return-type type="GList*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="fraction" type="gdouble"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </method>
-                       <method name="set_progress_pulse_step" symbol="gtk_entry_set_progress_pulse_step">
-                               <return-type type="void"/>
+                       <method name="get_focus_chain" symbol="gtk_container_get_focus_chain">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="fraction" type="gdouble"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="focusable_widgets" type="GList**"/>
                                </parameters>
                        </method>
-                       <method name="set_text" symbol="gtk_entry_set_text">
-                               <return-type type="void"/>
+                       <method name="get_focus_child" symbol="gtk_container_get_focus_child">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </method>
-                       <method name="set_visibility" symbol="gtk_entry_set_visibility">
-                               <return-type type="void"/>
+                       <method name="get_focus_hadjustment" symbol="gtk_container_get_focus_hadjustment">
+                               <return-type type="GtkAdjustment*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="visible" type="gboolean"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </method>
-                       <method name="set_width_chars" symbol="gtk_entry_set_width_chars">
-                               <return-type type="void"/>
+                       <method name="get_focus_vadjustment" symbol="gtk_container_get_focus_vadjustment">
+                               <return-type type="GtkAdjustment*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="n_chars" type="gint"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </method>
-                       <method name="text_index_to_layout_index" symbol="gtk_entry_text_index_to_layout_index">
-                               <return-type type="gint"/>
+                       <method name="get_path_for_child" symbol="gtk_container_get_path_for_child">
+                               <return-type type="GtkWidgetPath*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="text_index" type="gint"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="unset_invisible_char" symbol="gtk_entry_unset_invisible_char">
-                               <return-type type="void"/>
+                       <method name="get_resize_mode" symbol="gtk_container_get_resize_mode">
+                               <return-type type="GtkResizeMode"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </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"/>
-                       <property name="has-frame" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="im-module" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="inner-border" type="GtkBorder*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="invisible-char" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="invisible-char-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="max-length" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="overwrite-mode" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="primary-icon-activatable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="primary-icon-gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="primary-icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="primary-icon-pixbuf" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="primary-icon-sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="primary-icon-stock" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="primary-icon-storage-type" type="GtkImageType" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="primary-icon-tooltip-markup" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="primary-icon-tooltip-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="progress-fraction" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="progress-pulse-step" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="scroll-offset" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="secondary-icon-activatable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="secondary-icon-gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="secondary-icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="secondary-icon-pixbuf" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="secondary-icon-sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="secondary-icon-stock" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="secondary-icon-storage-type" type="GtkImageType" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="secondary-icon-tooltip-markup" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="secondary-icon-tooltip-text" type="char*" 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="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="text-length" type="guint" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="truncate-multiline" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="visibility" 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="xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="activate" when="LAST">
+                       <method name="propagate_draw" symbol="gtk_container_propagate_draw">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
                                </parameters>
-                       </signal>
-                       <signal name="backspace" when="LAST">
+                       </method>
+                       <method name="remove" symbol="gtk_container_remove">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
-                       <signal name="copy-clipboard" when="LAST">
+                       </method>
+                       <method name="resize_children" symbol="gtk_container_resize_children">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
-                       </signal>
-                       <signal name="cut-clipboard" when="LAST">
+                       </method>
+                       <method name="set_border_width" symbol="gtk_container_set_border_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="border_width" type="guint"/>
                                </parameters>
-                       </signal>
-                       <signal name="delete-from-cursor" when="LAST">
+                       </method>
+                       <method name="set_focus_chain" symbol="gtk_container_set_focus_chain">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="type" type="GtkDeleteType"/>
-                                       <parameter name="count" type="gint"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="focusable_widgets" type="GList*"/>
                                </parameters>
-                       </signal>
-                       <signal name="icon-press" when="LAST">
+                       </method>
+                       <method name="set_focus_child" symbol="gtk_container_set_focus_child">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkEntry*"/>
-                                       <parameter name="p0" type="GtkEntryIconPosition"/>
-                                       <parameter name="p1" type="GdkEvent*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
-                       <signal name="icon-release" when="LAST">
+                       </method>
+                       <method name="set_focus_hadjustment" symbol="gtk_container_set_focus_hadjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkEntry*"/>
-                                       <parameter name="p0" type="GtkEntryIconPosition"/>
-                                       <parameter name="p1" type="GdkEvent*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </signal>
-                       <signal name="insert-at-cursor" when="LAST">
+                       </method>
+                       <method name="set_focus_vadjustment" symbol="gtk_container_set_focus_vadjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="str" type="char*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </signal>
-                       <signal name="move-cursor" when="LAST">
+                       </method>
+                       <method name="set_reallocate_redraws" symbol="gtk_container_set_reallocate_redraws">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="step" type="GtkMovementStep"/>
-                                       <parameter name="count" type="gint"/>
-                                       <parameter name="extend_selection" type="gboolean"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="needs_redraws" type="gboolean"/>
                                </parameters>
-                       </signal>
-                       <signal name="paste-clipboard" when="LAST">
+                       </method>
+                       <method name="set_resize_mode" symbol="gtk_container_set_resize_mode">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="resize_mode" type="GtkResizeMode"/>
                                </parameters>
-                       </signal>
-                       <signal name="populate-popup" when="LAST">
+                       </method>
+                       <method name="unset_focus_chain" symbol="gtk_container_unset_focus_chain">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
-                       </signal>
-                       <signal name="preedit-changed" when="LAST">
+                       </method>
+                       <property name="border-width" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="child" type="GtkWidget*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <property name="resize-mode" type="GtkResizeMode" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="add" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkEntry*"/>
-                                       <parameter name="p0" type="char*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </signal>
-                       <signal name="toggle-overwrite" when="LAST">
+                       <signal name="check-resize" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </signal>
-                       <vfunc name="get_text_area_size">
+                       <signal name="remove" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="x" type="gint*"/>
-                                       <parameter name="y" type="gint*"/>
-                                       <parameter name="width" type="gint*"/>
-                                       <parameter name="height" type="gint*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="set-focus-child" when="FIRST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                               </parameters>
+                       </signal>
+                       <vfunc name="child_type">
+                               <return-type type="GType"/>
+                               <parameters>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </vfunc>
-               </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"/>
+                       <vfunc name="composite_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
-                                       <parameter name="position" type="guint"/>
-                                       <parameter name="n_chars" type="gint"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
-                       </method>
-                       <method name="emit_deleted_text" symbol="gtk_entry_buffer_emit_deleted_text">
+                       </vfunc>
+                       <vfunc name="forall">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
-                                       <parameter name="position" type="guint"/>
-                                       <parameter name="n_chars" type="guint"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="include_internals" type="gboolean"/>
+                                       <parameter name="callback" type="GtkCallback"/>
+                                       <parameter name="callback_data" type="gpointer"/>
                                </parameters>
-                       </method>
-                       <method name="emit_inserted_text" symbol="gtk_entry_buffer_emit_inserted_text">
+                       </vfunc>
+                       <vfunc name="get_child_property">
                                <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"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="property_id" type="guint"/>
+                                       <parameter name="value" type="GValue*"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
                                </parameters>
-                       </method>
-                       <method name="get_bytes" symbol="gtk_entry_buffer_get_bytes">
-                               <return-type type="gsize"/>
+                       </vfunc>
+                       <vfunc name="get_path_for_child">
+                               <return-type type="GtkWidgetPath*"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
-                       </method>
-                       <method name="get_length" symbol="gtk_entry_buffer_get_length">
-                               <return-type type="guint"/>
+                       </vfunc>
+                       <vfunc name="set_child_property">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="property_id" type="guint"/>
+                                       <parameter name="value" type="GValue*"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
                                </parameters>
+                       </vfunc>
+               </object>
+               <object name="GtkCssProvider" parent="GObject" type-name="GtkCssProvider" get-type="gtk_css_provider_get_type">
+                       <implements>
+                               <interface name="GtkStyleProvider"/>
+                       </implements>
+                       <method name="error_quark" symbol="gtk_css_provider_error_quark">
+                               <return-type type="GQuark"/>
                        </method>
-                       <method name="get_max_length" symbol="gtk_entry_buffer_get_max_length">
-                               <return-type type="gint"/>
+                       <method name="get_default" symbol="gtk_css_provider_get_default">
+                               <return-type type="GtkCssProvider*"/>
+                       </method>
+                       <method name="get_named" symbol="gtk_css_provider_get_named">
+                               <return-type type="GtkCssProvider*"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="variant" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_text" symbol="gtk_entry_buffer_get_text">
-                               <return-type type="gchar*"/>
+                       <method name="load_from_data" symbol="gtk_css_provider_load_from_data">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="css_provider" type="GtkCssProvider*"/>
+                                       <parameter name="data" type="gchar*"/>
+                                       <parameter name="length" type="gssize"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="insert_text" symbol="gtk_entry_buffer_insert_text">
-                               <return-type type="guint"/>
+                       <method name="load_from_file" symbol="gtk_css_provider_load_from_file">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
-                                       <parameter name="position" type="guint"/>
-                                       <parameter name="chars" type="gchar*"/>
-                                       <parameter name="n_chars" type="gint"/>
+                                       <parameter name="css_provider" type="GtkCssProvider*"/>
+                                       <parameter name="file" type="GFile*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_entry_buffer_new">
-                               <return-type type="GtkEntryBuffer*"/>
+                       <method name="load_from_path" symbol="gtk_css_provider_load_from_path">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="initial_chars" type="gchar*"/>
-                                       <parameter name="n_initial_chars" type="gint"/>
+                                       <parameter name="css_provider" type="GtkCssProvider*"/>
+                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_css_provider_new">
+                               <return-type type="GtkCssProvider*"/>
                        </constructor>
-                       <method name="set_max_length" symbol="gtk_entry_buffer_set_max_length">
+               </object>
+               <object name="GtkDialog" parent="GtkWindow" type-name="GtkDialog" get-type="gtk_dialog_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="add_action_widget" symbol="gtk_dialog_add_action_widget">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
-                                       <parameter name="max_length" type="gint"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_text" symbol="gtk_entry_buffer_set_text">
-                               <return-type type="void"/>
+                       <method name="add_button" symbol="gtk_dialog_add_button">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
-                                       <parameter name="chars" type="gchar*"/>
-                                       <parameter name="n_chars" type="gint"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="button_text" type="gchar*"/>
+                                       <parameter name="response_id" 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">
+                       <method name="add_buttons" symbol="gtk_dialog_add_buttons">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
-                                       <parameter name="position" type="guint"/>
-                                       <parameter name="n_chars" type="guint"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="first_button_text" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="inserted-text" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_action_area" symbol="gtk_dialog_get_action_area">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
-                                       <parameter name="position" type="guint"/>
-                                       <parameter name="chars" type="char*"/>
-                                       <parameter name="n_chars" type="guint"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="delete_text">
-                               <return-type type="guint"/>
+                       </method>
+                       <method name="get_content_area" symbol="gtk_dialog_get_content_area">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
-                                       <parameter name="position" type="guint"/>
-                                       <parameter name="n_chars" type="guint"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_length">
-                               <return-type type="guint"/>
+                       </method>
+                       <method name="get_response_for_widget" symbol="gtk_dialog_get_response_for_widget">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_text">
-                               <return-type type="gchar*"/>
+                       </method>
+                       <method name="get_widget_for_response" symbol="gtk_dialog_get_widget_for_response">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
-                                       <parameter name="n_bytes" type="gsize*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="insert_text">
-                               <return-type type="guint"/>
+                       </method>
+                       <constructor name="new" symbol="gtk_dialog_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_buttons" symbol="gtk_dialog_new_with_buttons">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
-                                       <parameter name="position" type="guint"/>
-                                       <parameter name="chars" type="gchar*"/>
-                                       <parameter name="n_chars" type="guint"/>
+                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="flags" type="GtkDialogFlags"/>
+                                       <parameter name="first_button_text" type="gchar*"/>
                                </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkEntryCompletion" parent="GObject" type-name="GtkEntryCompletion" get-type="gtk_entry_completion_get_type">
-                       <implements>
-                               <interface name="GtkCellLayout"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="complete" symbol="gtk_entry_completion_complete">
+                       </constructor>
+                       <method name="response" symbol="gtk_dialog_response">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="delete_action" symbol="gtk_entry_completion_delete_action">
-                               <return-type type="void"/>
+                       <method name="run" symbol="gtk_dialog_run">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="index_" type="gint"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
                                </parameters>
                        </method>
-                       <method name="get_completion_prefix" symbol="gtk_entry_completion_get_completion_prefix">
-                               <return-type type="gchar*"/>
+                       <method name="set_alternative_button_order" symbol="gtk_dialog_set_alternative_button_order">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="first_response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_entry" symbol="gtk_entry_completion_get_entry">
-                               <return-type type="GtkWidget*"/>
+                       <method name="set_alternative_button_order_from_array" symbol="gtk_dialog_set_alternative_button_order_from_array">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="n_params" type="gint"/>
+                                       <parameter name="new_order" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="get_inline_completion" symbol="gtk_entry_completion_get_inline_completion">
-                               <return-type type="gboolean"/>
+                       <method name="set_default_response" symbol="gtk_dialog_set_default_response">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_inline_selection" symbol="gtk_entry_completion_get_inline_selection">
-                               <return-type type="gboolean"/>
+                       <method name="set_response_sensitive" symbol="gtk_dialog_set_response_sensitive">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_minimum_key_length" symbol="gtk_entry_completion_get_minimum_key_length">
-                               <return-type type="gint"/>
+                       <signal name="close" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
                                </parameters>
-                       </method>
-                       <method name="get_model" symbol="gtk_entry_completion_get_model">
-                               <return-type type="GtkTreeModel*"/>
+                       </signal>
+                       <signal name="response" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="get_popup_completion" symbol="gtk_entry_completion_get_popup_completion">
+                       </signal>
+               </object>
+               <object name="GtkDrawingArea" parent="GtkWidget" type-name="GtkDrawingArea" get-type="gtk_drawing_area_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_drawing_area_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <field name="dummy" type="gpointer"/>
+               </object>
+               <object name="GtkEntry" parent="GtkWidget" type-name="GtkEntry" get-type="gtk_entry_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkEditable"/>
+                               <interface name="GtkCellEditable"/>
+                       </implements>
+                       <method name="get_activates_default" symbol="gtk_entry_get_activates_default">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_popup_set_width" symbol="gtk_entry_completion_get_popup_set_width">
-                               <return-type type="gboolean"/>
+                       <method name="get_alignment" symbol="gtk_entry_get_alignment">
+                               <return-type type="gfloat"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_popup_single_match" symbol="gtk_entry_completion_get_popup_single_match">
-                               <return-type type="gboolean"/>
+                       <method name="get_buffer" symbol="gtk_entry_get_buffer">
+                               <return-type type="GtkEntryBuffer*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_text_column" symbol="gtk_entry_completion_get_text_column">
-                               <return-type type="gint"/>
+                       <method name="get_completion" symbol="gtk_entry_get_completion">
+                               <return-type type="GtkEntryCompletion*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="insert_action_markup" symbol="gtk_entry_completion_insert_action_markup">
-                               <return-type type="void"/>
+                       <method name="get_current_icon_drag_source" symbol="gtk_entry_get_current_icon_drag_source">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="index_" type="gint"/>
-                                       <parameter name="markup" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="insert_action_text" symbol="gtk_entry_completion_insert_action_text">
-                               <return-type type="void"/>
+                       <method name="get_cursor_hadjustment" symbol="gtk_entry_get_cursor_hadjustment">
+                               <return-type type="GtkAdjustment*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="index_" type="gint"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="insert_prefix" symbol="gtk_entry_completion_insert_prefix">
-                               <return-type type="void"/>
+                       <method name="get_has_frame" symbol="gtk_entry_get_has_frame">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_entry_completion_new">
-                               <return-type type="GtkEntryCompletion*"/>
-                       </constructor>
-                       <method name="set_inline_completion" symbol="gtk_entry_completion_set_inline_completion">
-                               <return-type type="void"/>
+                       <method name="get_icon_activatable" symbol="gtk_entry_get_icon_activatable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="inline_completion" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
                                </parameters>
                        </method>
-                       <method name="set_inline_selection" symbol="gtk_entry_completion_set_inline_selection">
+                       <method name="get_icon_area" symbol="gtk_entry_get_icon_area">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="inline_selection" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="icon_area" type="GdkRectangle*"/>
                                </parameters>
                        </method>
-                       <method name="set_match_func" symbol="gtk_entry_completion_set_match_func">
-                               <return-type type="void"/>
+                       <method name="get_icon_at_pos" symbol="gtk_entry_get_icon_at_pos">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="func" type="GtkEntryCompletionMatchFunc"/>
-                                       <parameter name="func_data" type="gpointer"/>
-                                       <parameter name="func_notify" type="GDestroyNotify"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_minimum_key_length" symbol="gtk_entry_completion_set_minimum_key_length">
-                               <return-type type="void"/>
+                       <method name="get_icon_gicon" symbol="gtk_entry_get_icon_gicon">
+                               <return-type type="GIcon*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="length" type="gint"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
                                </parameters>
                        </method>
-                       <method name="set_model" symbol="gtk_entry_completion_set_model">
-                               <return-type type="void"/>
+                       <method name="get_icon_name" symbol="gtk_entry_get_icon_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
                                </parameters>
                        </method>
-                       <method name="set_popup_completion" symbol="gtk_entry_completion_set_popup_completion">
-                               <return-type type="void"/>
+                       <method name="get_icon_pixbuf" symbol="gtk_entry_get_icon_pixbuf">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="popup_completion" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
                                </parameters>
                        </method>
-                       <method name="set_popup_set_width" symbol="gtk_entry_completion_set_popup_set_width">
-                               <return-type type="void"/>
+                       <method name="get_icon_sensitive" symbol="gtk_entry_get_icon_sensitive">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="popup_set_width" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
                                </parameters>
                        </method>
-                       <method name="set_popup_single_match" symbol="gtk_entry_completion_set_popup_single_match">
-                               <return-type type="void"/>
+                       <method name="get_icon_stock" symbol="gtk_entry_get_icon_stock">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="popup_single_match" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
                                </parameters>
                        </method>
-                       <method name="set_text_column" symbol="gtk_entry_completion_set_text_column">
-                               <return-type type="void"/>
+                       <method name="get_icon_storage_type" symbol="gtk_entry_get_icon_storage_type">
+                               <return-type type="GtkImageType"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
                                </parameters>
                        </method>
-                       <property name="inline-completion" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="inline-selection" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="minimum-key-length" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="popup-completion" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="popup-set-width" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="popup-single-match" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="action-activated" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="index_" type="gint"/>
-                               </parameters>
-                       </signal>
-                       <signal name="cursor-on-match" when="LAST">
-                               <return-type type="gboolean"/>
+                       <method name="get_icon_tooltip_markup" symbol="gtk_entry_get_icon_tooltip_markup">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
                                </parameters>
-                       </signal>
-                       <signal name="insert-prefix" when="LAST">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <method name="get_icon_tooltip_text" symbol="gtk_entry_get_icon_tooltip_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="prefix" type="char*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
                                </parameters>
-                       </signal>
-                       <signal name="match-selected" when="LAST">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <method name="get_inner_border" symbol="gtk_entry_get_inner_border">
+                               <return-type type="GtkBorder*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkEventBox" parent="GtkBin" type-name="GtkEventBox" get-type="gtk_event_box_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_above_child" symbol="gtk_event_box_get_above_child">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <method name="get_invisible_char" symbol="gtk_entry_get_invisible_char">
+                               <return-type type="gunichar"/>
                                <parameters>
-                                       <parameter name="event_box" type="GtkEventBox*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_visible_window" symbol="gtk_event_box_get_visible_window">
-                               <return-type type="gboolean"/>
+                       <method name="get_layout" symbol="gtk_entry_get_layout">
+                               <return-type type="PangoLayout*"/>
                                <parameters>
-                                       <parameter name="event_box" type="GtkEventBox*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_event_box_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="set_above_child" symbol="gtk_event_box_set_above_child">
+                       <method name="get_layout_offsets" symbol="gtk_entry_get_layout_offsets">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="event_box" type="GtkEventBox*"/>
-                                       <parameter name="above_child" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="x" type="gint*"/>
+                                       <parameter name="y" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_visible_window" symbol="gtk_event_box_set_visible_window">
-                               <return-type type="void"/>
+                       <method name="get_max_length" symbol="gtk_entry_get_max_length">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="event_box" type="GtkEventBox*"/>
-                                       <parameter name="visible_window" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <property name="above-child" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="visible-window" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkExpander" parent="GtkBin" type-name="GtkExpander" get-type="gtk_expander_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_expanded" symbol="gtk_expander_get_expanded">
+                       <method name="get_overwrite_mode" symbol="gtk_entry_get_overwrite_mode">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_label" symbol="gtk_expander_get_label">
-                               <return-type type="gchar*"/>
+                       <method name="get_progress_fraction" symbol="gtk_entry_get_progress_fraction">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_label_fill" symbol="gtk_expander_get_label_fill">
-                               <return-type type="gboolean"/>
+                       <method name="get_progress_pulse_step" symbol="gtk_entry_get_progress_pulse_step">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_label_widget" symbol="gtk_expander_get_label_widget">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_text" symbol="gtk_entry_get_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_spacing" symbol="gtk_expander_get_spacing">
-                               <return-type type="gint"/>
+                       <method name="get_text_area" symbol="gtk_entry_get_text_area">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="text_area" type="GdkRectangle*"/>
                                </parameters>
                        </method>
-                       <method name="get_use_markup" symbol="gtk_expander_get_use_markup">
+                       <method name="get_text_length" symbol="gtk_entry_get_text_length">
+                               <return-type type="guint16"/>
+                               <parameters>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_visibility" symbol="gtk_entry_get_visibility">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_use_underline" symbol="gtk_expander_get_use_underline">
+                       <method name="get_width_chars" symbol="gtk_entry_get_width_chars">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                               </parameters>
+                       </method>
+                       <method name="im_context_filter_keypress" symbol="gtk_entry_im_context_filter_keypress">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="event" type="GdkEventKey*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_expander_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="layout_index_to_text_index" symbol="gtk_entry_layout_index_to_text_index">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="layout_index" type="gint"/>
                                </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_entry_new">
+                               <return-type type="GtkWidget*"/>
                        </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_expander_new_with_mnemonic">
+                       <constructor name="new_with_buffer" symbol="gtk_entry_new_with_buffer">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
                                </parameters>
                        </constructor>
-                       <method name="set_expanded" symbol="gtk_expander_set_expanded">
+                       <method name="progress_pulse" symbol="gtk_entry_progress_pulse">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="expanded" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="set_label" symbol="gtk_expander_set_label">
+                       <method name="reset_im_context" symbol="gtk_entry_reset_im_context">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="set_label_fill" symbol="gtk_expander_set_label_fill">
+                       <method name="set_activates_default" symbol="gtk_entry_set_activates_default">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="label_fill" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_label_widget" symbol="gtk_expander_set_label_widget">
+                       <method name="set_alignment" symbol="gtk_entry_set_alignment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="label_widget" type="GtkWidget*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="xalign" type="gfloat"/>
                                </parameters>
                        </method>
-                       <method name="set_spacing" symbol="gtk_expander_set_spacing">
+                       <method name="set_buffer" symbol="gtk_entry_set_buffer">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="spacing" type="gint"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_markup" symbol="gtk_expander_set_use_markup">
+                       <method name="set_completion" symbol="gtk_entry_set_completion">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="use_markup" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_underline" symbol="gtk_expander_set_use_underline">
+                       <method name="set_cursor_hadjustment" symbol="gtk_entry_set_cursor_hadjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="use_underline" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <property name="expanded" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="label" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="label-fill" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="label-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="use-markup" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="use-underline" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <signal name="activate" when="LAST">
+                       <method name="set_has_frame" symbol="gtk_entry_set_has_frame">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkFileChooserButton" parent="GtkHBox" type-name="GtkFileChooserButton" get-type="gtk_file_chooser_button_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                               <interface name="GtkFileChooser"/>
-                       </implements>
-                       <method name="get_focus_on_click" symbol="gtk_file_chooser_button_get_focus_on_click">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <method name="set_icon_activatable" symbol="gtk_entry_set_icon_activatable">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="activatable" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_title" symbol="gtk_file_chooser_button_get_title">
-                               <return-type type="gchar*"/>
+                       <method name="set_icon_drag_source" symbol="gtk_entry_set_icon_drag_source">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="target_list" type="GtkTargetList*"/>
+                                       <parameter name="actions" type="GdkDragAction"/>
                                </parameters>
                        </method>
-                       <method name="get_width_chars" symbol="gtk_file_chooser_button_get_width_chars">
-                               <return-type type="gint"/>
+                       <method name="set_icon_from_gicon" symbol="gtk_entry_set_icon_from_gicon">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="icon" type="GIcon*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_file_chooser_button_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="set_icon_from_icon_name" symbol="gtk_entry_set_icon_from_icon_name">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="action" type="GtkFileChooserAction"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="icon_name" type="gchar*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_dialog" symbol="gtk_file_chooser_button_new_with_dialog">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_icon_from_pixbuf" symbol="gtk_entry_set_icon_from_pixbuf">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkWidget*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_focus_on_click" symbol="gtk_file_chooser_button_set_focus_on_click">
+                       </method>
+                       <method name="set_icon_from_stock" symbol="gtk_entry_set_icon_from_stock">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
-                                       <parameter name="focus_on_click" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="stock_id" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_title" symbol="gtk_file_chooser_button_set_title">
+                       <method name="set_icon_sensitive" symbol="gtk_entry_set_icon_sensitive">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="sensitive" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_width_chars" symbol="gtk_file_chooser_button_set_width_chars">
+                       <method name="set_icon_tooltip_markup" symbol="gtk_entry_set_icon_tooltip_markup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
-                                       <parameter name="n_chars" type="gint"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="tooltip" type="gchar*"/>
                                </parameters>
                        </method>
-                       <property name="dialog" type="GtkFileChooser*" readable="0" writable="1" construct="0" construct-only="1"/>
-                       <property name="focus-on-click" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="width-chars" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="file-set" when="FIRST">
+                       <method name="set_icon_tooltip_text" symbol="gtk_entry_set_icon_tooltip_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="fc" type="GtkFileChooserButton*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="icon_pos" type="GtkEntryIconPosition"/>
+                                       <parameter name="tooltip" type="gchar*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkFileChooserDialog" parent="GtkDialog" type-name="GtkFileChooserDialog" get-type="gtk_file_chooser_dialog_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkFileChooser"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_file_chooser_dialog_new">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_inner_border" symbol="gtk_entry_set_inner_border">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="parent" type="GtkWindow*"/>
-                                       <parameter name="action" type="GtkFileChooserAction"/>
-                                       <parameter name="first_button_text" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="border" type="GtkBorder*"/>
                                </parameters>
-                       </constructor>
-               </object>
-               <object name="GtkFileChooserWidget" parent="GtkVBox" type-name="GtkFileChooserWidget" get-type="gtk_file_chooser_widget_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                               <interface name="GtkFileChooser"/>
-                               <interface name="GtkFileChooserEmbed"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_file_chooser_widget_new">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_invisible_char" symbol="gtk_entry_set_invisible_char">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="action" type="GtkFileChooserAction"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="ch" type="gunichar"/>
                                </parameters>
-                       </constructor>
-               </object>
-               <object name="GtkFileFilter" parent="GInitiallyUnowned" type-name="GtkFileFilter" get-type="gtk_file_filter_get_type">
-                       <method name="add_custom" symbol="gtk_file_filter_add_custom">
+                       </method>
+                       <method name="set_max_length" symbol="gtk_entry_set_max_length">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
-                                       <parameter name="needed" type="GtkFileFilterFlags"/>
-                                       <parameter name="func" type="GtkFileFilterFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="notify" type="GDestroyNotify"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="max" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="add_mime_type" symbol="gtk_file_filter_add_mime_type">
+                       <method name="set_overwrite_mode" symbol="gtk_entry_set_overwrite_mode">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
-                                       <parameter name="mime_type" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="overwrite" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="add_pattern" symbol="gtk_file_filter_add_pattern">
+                       <method name="set_progress_fraction" symbol="gtk_entry_set_progress_fraction">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
-                                       <parameter name="pattern" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="fraction" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="add_pixbuf_formats" symbol="gtk_file_filter_add_pixbuf_formats">
+                       <method name="set_progress_pulse_step" symbol="gtk_entry_set_progress_pulse_step">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="fraction" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="filter" symbol="gtk_file_filter_filter">
-                               <return-type type="gboolean"/>
+                       <method name="set_text" symbol="gtk_entry_set_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
-                                       <parameter name="filter_info" type="GtkFileFilterInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_name" symbol="gtk_file_filter_get_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_needed" symbol="gtk_file_filter_get_needed">
-                               <return-type type="GtkFileFilterFlags"/>
+                       <method name="set_visibility" symbol="gtk_entry_set_visibility">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="visible" type="gboolean"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_file_filter_new">
-                               <return-type type="GtkFileFilter*"/>
-                       </constructor>
-                       <method name="set_name" symbol="gtk_file_filter_set_name">
+                       <method name="set_width_chars" symbol="gtk_entry_set_width_chars">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
-                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-               </object>
-               <object name="GtkFixed" parent="GtkContainer" type-name="GtkFixed" get-type="gtk_fixed_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="move" symbol="gtk_fixed_move">
-                               <return-type type="void"/>
+                       <method name="text_index_to_layout_index" symbol="gtk_entry_text_index_to_layout_index">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="fixed" type="GtkFixed*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="text_index" type="gint"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_fixed_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="put" symbol="gtk_fixed_put">
+                       <method name="unset_invisible_char" symbol="gtk_entry_unset_invisible_char">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="fixed" type="GtkFixed*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-               </object>
-               <object name="GtkFontButton" parent="GtkButton" type-name="GtkFontButton" get-type="gtk_font_button_get_type">
-                       <implements>
-                               <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*"/>
+                       <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"/>
+                       <property name="has-frame" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="im-module" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="inner-border" type="GtkBorder*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="invisible-char" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="invisible-char-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="max-length" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="overwrite-mode" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="primary-icon-activatable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="primary-icon-gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="primary-icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="primary-icon-pixbuf" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="primary-icon-sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="primary-icon-stock" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="primary-icon-storage-type" type="GtkImageType" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="primary-icon-tooltip-markup" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="primary-icon-tooltip-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="progress-fraction" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="progress-pulse-step" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="scroll-offset" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="secondary-icon-activatable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="secondary-icon-gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="secondary-icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="secondary-icon-pixbuf" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="secondary-icon-sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="secondary-icon-stock" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="secondary-icon-storage-type" type="GtkImageType" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="secondary-icon-tooltip-markup" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="secondary-icon-tooltip-text" type="char*" 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="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="text-length" type="guint" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="truncate-multiline" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="visibility" 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="xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="activate" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </method>
-                       <method name="get_show_size" symbol="gtk_font_button_get_show_size">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="backspace" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </method>
-                       <method name="get_show_style" symbol="gtk_font_button_get_show_style">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="copy-clipboard" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </method>
-                       <method name="get_title" symbol="gtk_font_button_get_title">
-                               <return-type type="gchar*"/>
+                       </signal>
+                       <signal name="cut-clipboard" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </method>
-                       <method name="get_use_font" symbol="gtk_font_button_get_use_font">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="delete-from-cursor" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="type" type="GtkDeleteType"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="get_use_size" symbol="gtk_font_button_get_use_size">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="icon-press" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="object" type="GtkEntry*"/>
+                                       <parameter name="p0" type="GtkEntryIconPosition"/>
+                                       <parameter name="p1" type="GdkEvent*"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_font_button_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_font" symbol="gtk_font_button_new_with_font">
-                               <return-type type="GtkWidget*"/>
+                       </signal>
+                       <signal name="icon-release" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="fontname" type="gchar*"/>
+                                       <parameter name="object" type="GtkEntry*"/>
+                                       <parameter name="p0" type="GtkEntryIconPosition"/>
+                                       <parameter name="p1" type="GdkEvent*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_font_name" symbol="gtk_font_button_set_font_name">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="insert-at-cursor" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="fontname" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="str" type="char*"/>
                                </parameters>
-                       </method>
-                       <method name="set_show_size" symbol="gtk_font_button_set_show_size">
+                       </signal>
+                       <signal name="move-cursor" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="show_size" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="step" type="GtkMovementStep"/>
+                                       <parameter name="count" type="gint"/>
+                                       <parameter name="extend_selection" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <method name="set_show_style" symbol="gtk_font_button_set_show_style">
+                       </signal>
+                       <signal name="paste-clipboard" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="show_style" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </method>
-                       <method name="set_title" symbol="gtk_font_button_set_title">
+                       </signal>
+                       <signal name="populate-popup" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
-                       </method>
-                       <method name="set_use_font" symbol="gtk_font_button_set_use_font">
+                       </signal>
+                       <signal name="preedit-changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="use_font" type="gboolean"/>
+                                       <parameter name="object" type="GtkEntry*"/>
+                                       <parameter name="p0" type="char*"/>
                                </parameters>
-                       </method>
-                       <method name="set_use_size" symbol="gtk_font_button_set_use_size">
+                       </signal>
+                       <signal name="toggle-overwrite" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="use_size" type="gboolean"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </method>
-                       <property name="font-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-size" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-style" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="use-font" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="use-size" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="font-set" when="FIRST">
+                       </signal>
+                       <vfunc name="get_text_area_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="gfp" type="GtkFontButton*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="x" type="gint*"/>
+                                       <parameter name="y" type="gint*"/>
+                                       <parameter name="width" type="gint*"/>
+                                       <parameter name="height" type="gint*"/>
                                </parameters>
-                       </signal>
+                       </vfunc>
                </object>
-               <object name="GtkFontSelection" parent="GtkVBox" type-name="GtkFontSelection" get-type="gtk_font_selection_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <method name="get_face" symbol="gtk_font_selection_get_face">
-                               <return-type type="PangoFontFace*"/>
+               <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="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="position" type="guint"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_face_list" symbol="gtk_font_selection_get_face_list">
-                               <return-type type="GtkWidget*"/>
+                       <method name="emit_deleted_text" symbol="gtk_entry_buffer_emit_deleted_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="position" type="guint"/>
+                                       <parameter name="n_chars" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="get_family" symbol="gtk_font_selection_get_family">
-                               <return-type type="PangoFontFamily*"/>
+                       <method name="emit_inserted_text" symbol="gtk_entry_buffer_emit_inserted_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <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_family_list" symbol="gtk_font_selection_get_family_list">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_bytes" symbol="gtk_entry_buffer_get_bytes">
+                               <return-type type="gsize"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
                                </parameters>
                        </method>
-                       <method name="get_font_name" symbol="gtk_font_selection_get_font_name">
-                               <return-type type="gchar*"/>
+                       <method name="get_length" symbol="gtk_entry_buffer_get_length">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
                                </parameters>
                        </method>
-                       <method name="get_preview_entry" symbol="gtk_font_selection_get_preview_entry">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_max_length" symbol="gtk_entry_buffer_get_max_length">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
                                </parameters>
                        </method>
-                       <method name="get_preview_text" symbol="gtk_font_selection_get_preview_text">
+                       <method name="get_text" symbol="gtk_entry_buffer_get_text">
                                <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
                                </parameters>
                        </method>
-                       <method name="get_size" symbol="gtk_font_selection_get_size">
-                               <return-type type="gint"/>
+                       <method name="insert_text" symbol="gtk_entry_buffer_insert_text">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="position" type="guint"/>
+                                       <parameter name="chars" type="gchar*"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_size_entry" symbol="gtk_font_selection_get_size_entry">
-                               <return-type type="GtkWidget*"/>
+                       <constructor name="new" symbol="gtk_entry_buffer_new">
+                               <return-type type="GtkEntryBuffer*"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="initial_chars" type="gchar*"/>
+                                       <parameter name="n_initial_chars" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="get_size_list" symbol="gtk_font_selection_get_size_list">
-                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="set_max_length" symbol="gtk_entry_buffer_set_max_length">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="max_length" type="gint"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_font_selection_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="set_font_name" symbol="gtk_font_selection_set_font_name">
-                               <return-type type="gboolean"/>
+                       <method name="set_text" symbol="gtk_entry_buffer_set_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
-                                       <parameter name="fontname" type="gchar*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="chars" type="gchar*"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_preview_text" symbol="gtk_font_selection_set_preview_text">
+                       <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="fontsel" type="GtkFontSelection*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="buffer" type="GtkEntryBuffer*"/>
+                                       <parameter name="position" type="guint"/>
+                                       <parameter name="n_chars" type="guint"/>
                                </parameters>
-                       </method>
-                       <property name="font-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="preview-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       </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="GtkFontSelectionDialog" parent="GtkDialog" type-name="GtkFontSelectionDialog" get-type="gtk_font_selection_dialog_get_type">
+               <object name="GtkEntryCompletion" parent="GObject" type-name="GtkEntryCompletion" get-type="gtk_entry_completion_get_type">
                        <implements>
-                               <interface name="AtkImplementor"/>
+                               <interface name="GtkCellLayout"/>
                                <interface name="GtkBuildable"/>
                        </implements>
-                       <method name="get_cancel_button" symbol="gtk_font_selection_dialog_get_cancel_button">
-                               <return-type type="GtkWidget*"/>
+                       <method name="complete" symbol="gtk_entry_completion_complete">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="get_font_name" symbol="gtk_font_selection_dialog_get_font_name">
+                       <method name="delete_action" symbol="gtk_entry_completion_delete_action">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="index_" type="gint"/>
+                               </parameters>
+                       </method>
+                       <method name="get_completion_prefix" symbol="gtk_entry_completion_get_completion_prefix">
                                <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="get_font_selection" symbol="gtk_font_selection_dialog_get_font_selection">
+                       <method name="get_entry" symbol="gtk_entry_completion_get_entry">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="get_ok_button" symbol="gtk_font_selection_dialog_get_ok_button">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_inline_completion" symbol="gtk_entry_completion_get_inline_completion">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="get_preview_text" symbol="gtk_font_selection_dialog_get_preview_text">
-                               <return-type type="gchar*"/>
+                       <method name="get_inline_selection" symbol="gtk_entry_completion_get_inline_selection">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_font_selection_dialog_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_minimum_key_length" symbol="gtk_entry_completion_get_minimum_key_length">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_font_name" symbol="gtk_font_selection_dialog_set_font_name">
+                       </method>
+                       <method name="get_model" symbol="gtk_entry_completion_get_model">
+                               <return-type type="GtkTreeModel*"/>
+                               <parameters>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_popup_completion" symbol="gtk_entry_completion_get_popup_completion">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
-                                       <parameter name="fontname" type="gchar*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="set_preview_text" symbol="gtk_font_selection_dialog_set_preview_text">
-                               <return-type type="void"/>
+                       <method name="get_popup_set_width" symbol="gtk_entry_completion_get_popup_set_width">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-               </object>
-               <object name="GtkFrame" parent="GtkBin" type-name="GtkFrame" get-type="gtk_frame_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_label" symbol="gtk_frame_get_label">
-                               <return-type type="gchar*"/>
+                       <method name="get_popup_single_match" symbol="gtk_entry_completion_get_popup_single_match">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="get_label_align" symbol="gtk_frame_get_label_align">
+                       <method name="get_text_column" symbol="gtk_entry_completion_get_text_column">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                               </parameters>
+                       </method>
+                       <method name="insert_action_markup" symbol="gtk_entry_completion_insert_action_markup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="xalign" type="gfloat*"/>
-                                       <parameter name="yalign" type="gfloat*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="index_" type="gint"/>
+                                       <parameter name="markup" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_label_widget" symbol="gtk_frame_get_label_widget">
-                               <return-type type="GtkWidget*"/>
+                       <method name="insert_action_text" symbol="gtk_entry_completion_insert_action_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="index_" type="gint"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_shadow_type" symbol="gtk_frame_get_shadow_type">
-                               <return-type type="GtkShadowType"/>
+                       <method name="insert_prefix" symbol="gtk_entry_completion_insert_prefix">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_frame_new">
-                               <return-type type="GtkWidget*"/>
+                       <constructor name="new" symbol="gtk_entry_completion_new">
+                               <return-type type="GtkEntryCompletion*"/>
+                       </constructor>
+                       <constructor name="new_with_area" symbol="gtk_entry_completion_new_with_area">
+                               <return-type type="GtkEntryCompletion*"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
                                </parameters>
                        </constructor>
-                       <method name="set_label" symbol="gtk_frame_set_label">
+                       <method name="set_inline_completion" symbol="gtk_entry_completion_set_inline_completion">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="inline_completion" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_label_align" symbol="gtk_frame_set_label_align">
+                       <method name="set_inline_selection" symbol="gtk_entry_completion_set_inline_selection">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="xalign" type="gfloat"/>
-                                       <parameter name="yalign" type="gfloat"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="inline_selection" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_label_widget" symbol="gtk_frame_set_label_widget">
+                       <method name="set_match_func" symbol="gtk_entry_completion_set_match_func">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="label_widget" type="GtkWidget*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="func" type="GtkEntryCompletionMatchFunc"/>
+                                       <parameter name="func_data" type="gpointer"/>
+                                       <parameter name="func_notify" type="GDestroyNotify"/>
                                </parameters>
                        </method>
-                       <method name="set_shadow_type" symbol="gtk_frame_set_shadow_type">
+                       <method name="set_minimum_key_length" symbol="gtk_entry_completion_set_minimum_key_length">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="type" type="GtkShadowType"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="length" type="gint"/>
                                </parameters>
                        </method>
-                       <property name="label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="label-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="label-xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="label-yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <vfunc name="compute_child_allocation">
+                       <method name="set_model" symbol="gtk_entry_completion_set_model">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="allocation" type="GtkAllocation*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkGrid" parent="GtkContainer" type-name="GtkGrid" get-type="gtk_grid_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <method name="attach" symbol="gtk_grid_attach">
+                       </method>
+                       <method name="set_popup_completion" symbol="gtk_entry_completion_set_popup_completion">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="grid" type="GtkGrid*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="left" type="gint"/>
-                                       <parameter name="top" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="popup_completion" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="attach_next_to" symbol="gtk_grid_attach_next_to">
+                       <method name="set_popup_set_width" symbol="gtk_entry_completion_set_popup_set_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="grid" type="GtkGrid*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="sibling" type="GtkWidget*"/>
-                                       <parameter name="side" type="GtkPositionType"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="popup_set_width" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_column_homogeneous" symbol="gtk_grid_get_column_homogeneous">
-                               <return-type type="gboolean"/>
+                       <method name="set_popup_single_match" symbol="gtk_entry_completion_set_popup_single_match">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="grid" type="GtkGrid*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="popup_single_match" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_column_spacing" symbol="gtk_grid_get_column_spacing">
-                               <return-type type="guint"/>
+                       <method name="set_text_column" symbol="gtk_entry_completion_set_text_column">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="grid" type="GtkGrid*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_row_homogeneous" symbol="gtk_grid_get_row_homogeneous">
+                       <property name="cell-area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="inline-completion" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="inline-selection" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="minimum-key-length" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="popup-completion" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="popup-set-width" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="popup-single-match" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="action-activated" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="index_" type="gint"/>
+                               </parameters>
+                       </signal>
+                       <signal name="cursor-on-match" when="LAST">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="grid" type="GtkGrid*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
-                       </method>
-                       <method name="get_row_spacing" symbol="gtk_grid_get_row_spacing">
-                               <return-type type="guint"/>
+                       </signal>
+                       <signal name="insert-prefix" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="grid" type="GtkGrid*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="prefix" type="char*"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_grid_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="set_column_homogeneous" symbol="gtk_grid_set_column_homogeneous">
-                               <return-type type="void"/>
+                       </signal>
+                       <signal name="match-selected" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="grid" type="GtkGrid*"/>
-                                       <parameter name="homogeneous" type="gboolean"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GtkEventBox" parent="GtkBin" type-name="GtkEventBox" get-type="gtk_event_box_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_above_child" symbol="gtk_event_box_get_above_child">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="event_box" type="GtkEventBox*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_spacing" symbol="gtk_grid_set_column_spacing">
-                               <return-type type="void"/>
+                       <method name="get_visible_window" symbol="gtk_event_box_get_visible_window">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="grid" type="GtkGrid*"/>
-                                       <parameter name="spacing" type="guint"/>
+                                       <parameter name="event_box" type="GtkEventBox*"/>
                                </parameters>
                        </method>
-                       <method name="set_row_homogeneous" symbol="gtk_grid_set_row_homogeneous">
+                       <constructor name="new" symbol="gtk_event_box_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="set_above_child" symbol="gtk_event_box_set_above_child">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="grid" type="GtkGrid*"/>
-                                       <parameter name="homogeneous" type="gboolean"/>
+                                       <parameter name="event_box" type="GtkEventBox*"/>
+                                       <parameter name="above_child" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_row_spacing" symbol="gtk_grid_set_row_spacing">
+                       <method name="set_visible_window" symbol="gtk_event_box_set_visible_window">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="grid" type="GtkGrid*"/>
-                                       <parameter name="spacing" type="guint"/>
+                                       <parameter name="event_box" type="GtkEventBox*"/>
+                                       <parameter name="visible_window" type="gboolean"/>
                                </parameters>
                        </method>
-                       <property name="column-homogeneous" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="column-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="row-homogeneous" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="row-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="above-child" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="visible-window" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
-               <object name="GtkHBox" parent="GtkBox" type-name="GtkHBox" get-type="gtk_hbox_get_type">
+               <object name="GtkExpander" parent="GtkBin" type-name="GtkExpander" get-type="gtk_expander_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
                        </implements>
-                       <constructor name="new" symbol="gtk_hbox_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_expanded" symbol="gtk_expander_get_expanded">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="homogeneous" type="gboolean"/>
-                                       <parameter name="spacing" type="gint"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
                                </parameters>
-                       </constructor>
-               </object>
-               <object name="GtkHButtonBox" parent="GtkButtonBox" type-name="GtkHButtonBox" get-type="gtk_hbutton_box_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_hbutton_box_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-               </object>
-               <object name="GtkHPaned" parent="GtkPaned" type-name="GtkHPaned" get-type="gtk_hpaned_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_hpaned_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-               </object>
-               <object name="GtkHRuler" parent="GtkRuler" type-name="GtkHRuler" get-type="gtk_hruler_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_hruler_new">
+                       </method>
+                       <method name="get_label" symbol="gtk_expander_get_label">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_label_fill" symbol="gtk_expander_get_label_fill">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_label_widget" symbol="gtk_expander_get_label_widget">
                                <return-type type="GtkWidget*"/>
-                       </constructor>
-               </object>
-               <object name="GtkHSV" parent="GtkWidget" type-name="GtkHSV" get-type="gtk_hsv_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_color" symbol="gtk_hsv_get_color">
-                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="hsv" type="GtkHSV*"/>
-                                       <parameter name="h" type="gdouble*"/>
-                                       <parameter name="s" type="gdouble*"/>
-                                       <parameter name="v" type="gdouble*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
                                </parameters>
                        </method>
-                       <method name="get_metrics" symbol="gtk_hsv_get_metrics">
-                               <return-type type="void"/>
+                       <method name="get_spacing" symbol="gtk_expander_get_spacing">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="hsv" type="GtkHSV*"/>
-                                       <parameter name="size" type="gint*"/>
-                                       <parameter name="ring_width" type="gint*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
                                </parameters>
                        </method>
-                       <method name="is_adjusting" symbol="gtk_hsv_is_adjusting">
+                       <method name="get_use_markup" symbol="gtk_expander_get_use_markup">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="hsv" type="GtkHSV*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_hsv_new">
+                       <method name="get_use_underline" symbol="gtk_expander_get_use_underline">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_expander_new">
                                <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="label" type="gchar*"/>
+                               </parameters>
                        </constructor>
-                       <method name="set_color" symbol="gtk_hsv_set_color">
-                               <return-type type="void"/>
+                       <constructor name="new_with_mnemonic" symbol="gtk_expander_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="hsv" type="GtkHSV*"/>
-                                       <parameter name="h" type="double"/>
-                                       <parameter name="s" type="double"/>
-                                       <parameter name="v" type="double"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_metrics" symbol="gtk_hsv_set_metrics">
+                       </constructor>
+                       <method name="set_expanded" symbol="gtk_expander_set_expanded">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="hsv" type="GtkHSV*"/>
-                                       <parameter name="size" type="gint"/>
-                                       <parameter name="ring_width" type="gint"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="expanded" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="to_rgb" symbol="gtk_hsv_to_rgb">
+                       <method name="set_label" symbol="gtk_expander_set_label">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="h" type="gdouble"/>
-                                       <parameter name="s" type="gdouble"/>
-                                       <parameter name="v" type="gdouble"/>
-                                       <parameter name="r" type="gdouble*"/>
-                                       <parameter name="g" type="gdouble*"/>
-                                       <parameter name="b" type="gdouble*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
                        </method>
-                       <signal name="changed" when="FIRST">
+                       <method name="set_label_fill" symbol="gtk_expander_set_label_fill">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="hsv" type="GtkHSV*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="label_fill" type="gboolean"/>
                                </parameters>
-                       </signal>
-                       <signal name="move" when="LAST">
+                       </method>
+                       <method name="set_label_widget" symbol="gtk_expander_set_label_widget">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="hsv" type="GtkHSV*"/>
-                                       <parameter name="type" type="GtkDirectionType"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="label_widget" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkHScale" parent="GtkScale" type-name="GtkHScale" get-type="gtk_hscale_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_hscale_new">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_spacing" symbol="gtk_expander_set_spacing">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="spacing" type="gint"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_range" symbol="gtk_hscale_new_with_range">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_use_markup" symbol="gtk_expander_set_use_markup">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="min" type="gdouble"/>
-                                       <parameter name="max" type="gdouble"/>
-                                       <parameter name="step" type="gdouble"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="use_markup" type="gboolean"/>
                                </parameters>
-                       </constructor>
-               </object>
-               <object name="GtkHScrollbar" parent="GtkScrollbar" type-name="GtkHScrollbar" get-type="gtk_hscrollbar_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_hscrollbar_new">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_use_underline" symbol="gtk_expander_set_use_underline">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="use_underline" type="gboolean"/>
                                </parameters>
-                       </constructor>
+                       </method>
+                       <property name="expanded" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="label" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="label-fill" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="label-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="use-markup" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="use-underline" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <signal name="activate" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                               </parameters>
+                       </signal>
                </object>
-               <object name="GtkHSeparator" parent="GtkSeparator" type-name="GtkHSeparator" get-type="gtk_hseparator_get_type">
+               <object name="GtkFileChooserButton" parent="GtkHBox" type-name="GtkFileChooserButton" get-type="gtk_file_chooser_button_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
                                <interface name="GtkOrientable"/>
+                               <interface name="GtkFileChooser"/>
                        </implements>
-                       <constructor name="new" symbol="gtk_hseparator_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-               </object>
-               <object name="GtkHandleBox" parent="GtkBin" type-name="GtkHandleBox" get-type="gtk_handle_box_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_child_detached" symbol="gtk_handle_box_get_child_detached">
+                       <method name="get_focus_on_click" symbol="gtk_file_chooser_button_get_focus_on_click">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="button" type="GtkFileChooserButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_handle_position" symbol="gtk_handle_box_get_handle_position">
-                               <return-type type="GtkPositionType"/>
+                       <method name="get_title" symbol="gtk_file_chooser_button_get_title">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="button" type="GtkFileChooserButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_shadow_type" symbol="gtk_handle_box_get_shadow_type">
-                               <return-type type="GtkShadowType"/>
+                       <method name="get_width_chars" symbol="gtk_file_chooser_button_get_width_chars">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="button" type="GtkFileChooserButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_snap_edge" symbol="gtk_handle_box_get_snap_edge">
-                               <return-type type="GtkPositionType"/>
+                       <constructor name="new" symbol="gtk_file_chooser_button_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="action" type="GtkFileChooserAction"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_handle_box_new">
+                       </constructor>
+                       <constructor name="new_with_dialog" symbol="gtk_file_chooser_button_new_with_dialog">
                                <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="dialog" type="GtkWidget*"/>
+                               </parameters>
                        </constructor>
-                       <method name="set_handle_position" symbol="gtk_handle_box_set_handle_position">
+                       <method name="set_focus_on_click" symbol="gtk_file_chooser_button_set_focus_on_click">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
-                                       <parameter name="position" type="GtkPositionType"/>
+                                       <parameter name="button" type="GtkFileChooserButton*"/>
+                                       <parameter name="focus_on_click" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_shadow_type" symbol="gtk_handle_box_set_shadow_type">
+                       <method name="set_title" symbol="gtk_file_chooser_button_set_title">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
-                                       <parameter name="type" type="GtkShadowType"/>
+                                       <parameter name="button" type="GtkFileChooserButton*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_snap_edge" symbol="gtk_handle_box_set_snap_edge">
+                       <method name="set_width_chars" symbol="gtk_file_chooser_button_set_width_chars">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
-                                       <parameter name="edge" type="GtkPositionType"/>
+                                       <parameter name="button" type="GtkFileChooserButton*"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-                       <property name="child-detached" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="handle-position" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="snap-edge" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="snap-edge-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="child-attached" when="FIRST">
+                       <property name="dialog" type="GtkFileChooser*" readable="0" writable="1" construct="0" construct-only="1"/>
+                       <property name="focus-on-click" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="width-chars" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="file-set" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="fc" type="GtkFileChooserButton*"/>
                                </parameters>
                        </signal>
-                       <signal name="child-detached" when="FIRST">
-                               <return-type type="void"/>
+               </object>
+               <object name="GtkFileChooserDialog" parent="GtkDialog" type-name="GtkFileChooserDialog" get-type="gtk_file_chooser_dialog_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkFileChooser"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_file_chooser_dialog_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="action" type="GtkFileChooserAction"/>
+                                       <parameter name="first_button_text" type="gchar*"/>
                                </parameters>
-                       </signal>
+                       </constructor>
                </object>
-               <object name="GtkIMContext" parent="GObject" type-name="GtkIMContext" get-type="gtk_im_context_get_type">
-                       <method name="delete_surrounding" symbol="gtk_im_context_delete_surrounding">
-                               <return-type type="gboolean"/>
+               <object name="GtkFileChooserWidget" parent="GtkVBox" type-name="GtkFileChooserWidget" get-type="gtk_file_chooser_widget_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                               <interface name="GtkFileChooser"/>
+                               <interface name="GtkFileChooserEmbed"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_file_chooser_widget_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="offset" type="gint"/>
-                                       <parameter name="n_chars" type="gint"/>
+                                       <parameter name="action" type="GtkFileChooserAction"/>
                                </parameters>
-                       </method>
-                       <method name="filter_keypress" symbol="gtk_im_context_filter_keypress">
-                               <return-type type="gboolean"/>
+                       </constructor>
+               </object>
+               <object name="GtkFileFilter" parent="GInitiallyUnowned" type-name="GtkFileFilter" get-type="gtk_file_filter_get_type">
+                       <method name="add_custom" symbol="gtk_file_filter_add_custom">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="event" type="GdkEventKey*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="needed" type="GtkFileFilterFlags"/>
+                                       <parameter name="func" type="GtkFileFilterFunc"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="notify" type="GDestroyNotify"/>
                                </parameters>
                        </method>
-                       <method name="focus_in" symbol="gtk_im_context_focus_in">
+                       <method name="add_mime_type" symbol="gtk_file_filter_add_mime_type">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="mime_type" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="focus_out" symbol="gtk_im_context_focus_out">
+                       <method name="add_pattern" symbol="gtk_file_filter_add_pattern">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="pattern" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_preedit_string" symbol="gtk_im_context_get_preedit_string">
+                       <method name="add_pixbuf_formats" symbol="gtk_file_filter_add_pixbuf_formats">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="str" type="gchar**"/>
-                                       <parameter name="attrs" type="PangoAttrList**"/>
-                                       <parameter name="cursor_pos" type="gint*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
                                </parameters>
                        </method>
-                       <method name="get_surrounding" symbol="gtk_im_context_get_surrounding">
+                       <method name="filter" symbol="gtk_file_filter_filter">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="text" type="gchar**"/>
-                                       <parameter name="cursor_index" type="gint*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="filter_info" type="GtkFileFilterInfo*"/>
                                </parameters>
                        </method>
-                       <method name="reset" symbol="gtk_im_context_reset">
-                               <return-type type="void"/>
+                       <method name="get_name" symbol="gtk_file_filter_get_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
                                </parameters>
                        </method>
-                       <method name="set_client_window" symbol="gtk_im_context_set_client_window">
-                               <return-type type="void"/>
+                       <method name="get_needed" symbol="gtk_file_filter_get_needed">
+                               <return-type type="GtkFileFilterFlags"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
                                </parameters>
                        </method>
-                       <method name="set_cursor_location" symbol="gtk_im_context_set_cursor_location">
+                       <constructor name="new" symbol="gtk_file_filter_new">
+                               <return-type type="GtkFileFilter*"/>
+                       </constructor>
+                       <method name="set_name" symbol="gtk_file_filter_set_name">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="area" type="GdkRectangle*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_surrounding" symbol="gtk_im_context_set_surrounding">
+               </object>
+               <object name="GtkFixed" parent="GtkContainer" type-name="GtkFixed" get-type="gtk_fixed_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="move" symbol="gtk_fixed_move">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="text" type="gchar*"/>
-                                       <parameter name="len" type="gint"/>
-                                       <parameter name="cursor_index" type="gint"/>
+                                       <parameter name="fixed" type="GtkFixed*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_use_preedit" symbol="gtk_im_context_set_use_preedit">
+                       <constructor name="new" symbol="gtk_fixed_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="put" symbol="gtk_fixed_put">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="use_preedit" type="gboolean"/>
+                                       <parameter name="fixed" type="GtkFixed*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
                        </method>
-                       <signal name="commit" when="LAST">
-                               <return-type type="void"/>
+               </object>
+               <object name="GtkFontButton" parent="GtkButton" type-name="GtkFontButton" get-type="gtk_font_button_get_type">
+                       <implements>
+                               <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*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="str" type="char*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
                                </parameters>
-                       </signal>
-                       <signal name="delete-surrounding" when="LAST">
+                       </method>
+                       <method name="get_show_size" symbol="gtk_font_button_get_show_size">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="offset" type="gint"/>
-                                       <parameter name="n_chars" type="gint"/>
-                               </parameters>
-                       </signal>
-                       <signal name="preedit-changed" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
                                </parameters>
-                       </signal>
-                       <signal name="preedit-end" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_show_style" symbol="gtk_font_button_get_show_style">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
                                </parameters>
-                       </signal>
-                       <signal name="preedit-start" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_title" symbol="gtk_font_button_get_title">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
                                </parameters>
-                       </signal>
-                       <signal name="retrieve-surrounding" when="LAST">
+                       </method>
+                       <method name="get_use_font" symbol="gtk_font_button_get_use_font">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="filter_keypress">
+                       </method>
+                       <method name="get_use_size" symbol="gtk_font_button_get_use_size">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="event" type="GdkEventKey*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="focus_in">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="focus_out">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_preedit_string">
-                               <return-type type="void"/>
+                       </method>
+                       <constructor name="new" symbol="gtk_font_button_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_font" symbol="gtk_font_button_new_with_font">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="str" type="gchar**"/>
-                                       <parameter name="attrs" type="PangoAttrList**"/>
-                                       <parameter name="cursor_pos" type="gint*"/>
+                                       <parameter name="fontname" type="gchar*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_surrounding">
+                       </constructor>
+                       <method name="set_font_name" symbol="gtk_font_button_set_font_name">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="text" type="gchar**"/>
-                                       <parameter name="cursor_index" type="gint*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="fontname" type="gchar*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="reset">
+                       </method>
+                       <method name="set_show_size" symbol="gtk_font_button_set_show_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="show_size" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_client_window">
+                       </method>
+                       <method name="set_show_style" symbol="gtk_font_button_set_show_style">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="show_style" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_cursor_location">
+                       </method>
+                       <method name="set_title" symbol="gtk_font_button_set_title">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="area" type="GdkRectangle*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_surrounding">
+                       </method>
+                       <method name="set_use_font" symbol="gtk_font_button_set_use_font">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="text" type="gchar*"/>
-                                       <parameter name="len" type="gint"/>
-                                       <parameter name="cursor_index" type="gint"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="use_font" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_use_preedit">
+                       </method>
+                       <method name="set_use_size" symbol="gtk_font_button_set_use_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="use_preedit" type="gboolean"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="use_size" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkIMContextSimple" parent="GtkIMContext" type-name="GtkIMContextSimple" get-type="gtk_im_context_simple_get_type">
-                       <method name="add_table" symbol="gtk_im_context_simple_add_table">
+                       </method>
+                       <property name="font-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="show-size" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="show-style" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="use-font" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="use-size" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="font-set" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context_simple" type="GtkIMContextSimple*"/>
-                                       <parameter name="data" type="guint16*"/>
-                                       <parameter name="max_seq_len" type="gint"/>
-                                       <parameter name="n_seqs" type="gint"/>
+                                       <parameter name="gfp" type="GtkFontButton*"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_im_context_simple_new">
-                               <return-type type="GtkIMContext*"/>
-                       </constructor>
+                       </signal>
                </object>
-               <object name="GtkIMMulticontext" parent="GtkIMContext" type-name="GtkIMMulticontext" get-type="gtk_im_multicontext_get_type">
-                       <method name="append_menuitems" symbol="gtk_im_multicontext_append_menuitems">
-                               <return-type type="void"/>
+               <object name="GtkFontSelection" parent="GtkVBox" type-name="GtkFontSelection" get-type="gtk_font_selection_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <method name="get_face" symbol="gtk_font_selection_get_face">
+                               <return-type type="PangoFontFace*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMMulticontext*"/>
-                                       <parameter name="menushell" type="GtkMenuShell*"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-                       <method name="get_context_id" symbol="gtk_im_multicontext_get_context_id">
-                               <return-type type="char*"/>
+                       <method name="get_face_list" symbol="gtk_font_selection_get_face_list">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMMulticontext*"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_im_multicontext_new">
-                               <return-type type="GtkIMContext*"/>
-                       </constructor>
-                       <method name="set_context_id" symbol="gtk_im_multicontext_set_context_id">
-                               <return-type type="void"/>
+                       <method name="get_family" symbol="gtk_font_selection_get_family">
+                               <return-type type="PangoFontFamily*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMMulticontext*"/>
-                                       <parameter name="context_id" type="char*"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-               </object>
-               <object name="GtkIconFactory" parent="GObject" type-name="GtkIconFactory" get-type="gtk_icon_factory_get_type">
-                       <implements>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="add" symbol="gtk_icon_factory_add">
-                               <return-type type="void"/>
+                       <method name="get_family_list" symbol="gtk_font_selection_get_family_list">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="factory" type="GtkIconFactory*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-                       <method name="add_default" symbol="gtk_icon_factory_add_default">
-                               <return-type type="void"/>
+                       <method name="get_font_name" symbol="gtk_font_selection_get_font_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="factory" type="GtkIconFactory*"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-                       <method name="lookup" symbol="gtk_icon_factory_lookup">
-                               <return-type type="GtkIconSet*"/>
+                       <method name="get_preview_entry" symbol="gtk_font_selection_get_preview_entry">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="factory" type="GtkIconFactory*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-                       <method name="lookup_default" symbol="gtk_icon_factory_lookup_default">
-                               <return-type type="GtkIconSet*"/>
+                       <method name="get_preview_text" symbol="gtk_font_selection_get_preview_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_icon_factory_new">
-                               <return-type type="GtkIconFactory*"/>
-                       </constructor>
-                       <method name="remove_default" symbol="gtk_icon_factory_remove_default">
-                               <return-type type="void"/>
+                       <method name="get_size" symbol="gtk_font_selection_get_size">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="factory" type="GtkIconFactory*"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-               </object>
-               <object name="GtkIconTheme" parent="GObject" type-name="GtkIconTheme" get-type="gtk_icon_theme_get_type">
-                       <method name="add_builtin_icon" symbol="gtk_icon_theme_add_builtin_icon">
-                               <return-type type="void"/>
+                       <method name="get_size_entry" symbol="gtk_font_selection_get_size_entry">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_name" type="gchar*"/>
-                                       <parameter name="size" type="gint"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-                       <method name="append_search_path" symbol="gtk_icon_theme_append_search_path">
-                               <return-type type="void"/>
+                       <method name="get_size_list" symbol="gtk_font_selection_get_size_list">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-                       <method name="choose_icon" symbol="gtk_icon_theme_choose_icon">
-                               <return-type type="GtkIconInfo*"/>
+                       <constructor name="new" symbol="gtk_font_selection_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="set_font_name" symbol="gtk_font_selection_set_font_name">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="icon_names" type="gchar*[]"/>
-                                       <parameter name="size" type="gint"/>
-                                       <parameter name="flags" type="GtkIconLookupFlags"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="fontname" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="error_quark" symbol="gtk_icon_theme_error_quark">
-                               <return-type type="GQuark"/>
+                       <method name="set_preview_text" symbol="gtk_font_selection_set_preview_text">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="text" type="gchar*"/>
+                               </parameters>
                        </method>
-                       <method name="get_default" symbol="gtk_icon_theme_get_default">
-                               <return-type type="GtkIconTheme*"/>
+                       <property name="font-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="preview-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkFontSelectionDialog" parent="GtkDialog" type-name="GtkFontSelectionDialog" get-type="gtk_font_selection_dialog_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_cancel_button" symbol="gtk_font_selection_dialog_get_cancel_button">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                               </parameters>
                        </method>
-                       <method name="get_example_icon_name" symbol="gtk_icon_theme_get_example_icon_name">
-                               <return-type type="char*"/>
+                       <method name="get_font_name" symbol="gtk_font_selection_dialog_get_font_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
                                </parameters>
                        </method>
-                       <method name="get_for_screen" symbol="gtk_icon_theme_get_for_screen">
-                               <return-type type="GtkIconTheme*"/>
+                       <method name="get_font_selection" symbol="gtk_font_selection_dialog_get_font_selection">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_sizes" symbol="gtk_icon_theme_get_icon_sizes">
-                               <return-type type="gint*"/>
+                       <method name="get_ok_button" symbol="gtk_font_selection_dialog_get_ok_button">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
                                </parameters>
                        </method>
-                       <method name="get_search_path" symbol="gtk_icon_theme_get_search_path">
-                               <return-type type="void"/>
+                       <method name="get_preview_text" symbol="gtk_font_selection_dialog_get_preview_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="path" type="gchar**[]"/>
-                                       <parameter name="n_elements" type="gint*"/>
+                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
                                </parameters>
                        </method>
-                       <method name="has_icon" symbol="gtk_icon_theme_has_icon">
+                       <constructor name="new" symbol="gtk_font_selection_dialog_new">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="title" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_font_name" symbol="gtk_font_selection_dialog_set_font_name">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="fontname" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="list_contexts" symbol="gtk_icon_theme_list_contexts">
-                               <return-type type="GList*"/>
+                       <method name="set_preview_text" symbol="gtk_font_selection_dialog_set_preview_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="list_icons" symbol="gtk_icon_theme_list_icons">
-                               <return-type type="GList*"/>
+               </object>
+               <object name="GtkFrame" parent="GtkBin" type-name="GtkFrame" get-type="gtk_frame_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_label" symbol="gtk_frame_get_label">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="context" type="gchar*"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
                                </parameters>
                        </method>
-                       <method name="load_icon" symbol="gtk_icon_theme_load_icon">
-                               <return-type type="GdkPixbuf*"/>
+                       <method name="get_label_align" symbol="gtk_frame_get_label_align">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
-                                       <parameter name="size" type="gint"/>
-                                       <parameter name="flags" type="GtkIconLookupFlags"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="xalign" type="gfloat*"/>
+                                       <parameter name="yalign" type="gfloat*"/>
                                </parameters>
                        </method>
-                       <method name="lookup_by_gicon" symbol="gtk_icon_theme_lookup_by_gicon">
-                               <return-type type="GtkIconInfo*"/>
+                       <method name="get_label_widget" symbol="gtk_frame_get_label_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="icon" type="GIcon*"/>
-                                       <parameter name="size" type="gint"/>
-                                       <parameter name="flags" type="GtkIconLookupFlags"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
                                </parameters>
                        </method>
-                       <method name="lookup_icon" symbol="gtk_icon_theme_lookup_icon">
-                               <return-type type="GtkIconInfo*"/>
+                       <method name="get_shadow_type" symbol="gtk_frame_get_shadow_type">
+                               <return-type type="GtkShadowType"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
-                                       <parameter name="size" type="gint"/>
-                                       <parameter name="flags" type="GtkIconLookupFlags"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_icon_theme_new">
-                               <return-type type="GtkIconTheme*"/>
-                       </constructor>
-                       <method name="prepend_search_path" symbol="gtk_icon_theme_prepend_search_path">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_frame_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="rescan_if_needed" symbol="gtk_icon_theme_rescan_if_needed">
-                               <return-type type="gboolean"/>
+                       </constructor>
+                       <method name="set_label" symbol="gtk_frame_set_label">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_custom_theme" symbol="gtk_icon_theme_set_custom_theme">
+                       <method name="set_label_align" symbol="gtk_frame_set_label_align">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="theme_name" type="gchar*"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="yalign" type="gfloat"/>
                                </parameters>
                        </method>
-                       <method name="set_screen" symbol="gtk_icon_theme_set_screen">
+                       <method name="set_label_widget" symbol="gtk_frame_set_label_widget">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="label_widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_search_path" symbol="gtk_icon_theme_set_search_path">
+                       <method name="set_shadow_type" symbol="gtk_frame_set_shadow_type">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="path" type="gchar*[]"/>
-                                       <parameter name="n_elements" type="gint"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="type" type="GtkShadowType"/>
                                </parameters>
                        </method>
-                       <signal name="changed" when="LAST">
+                       <property name="label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="label-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="label-xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="label-yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <vfunc name="compute_child_allocation">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="allocation" type="GtkAllocation*"/>
                                </parameters>
-                       </signal>
+                       </vfunc>
                </object>
-               <object name="GtkIconView" parent="GtkContainer" type-name="GtkIconView" get-type="gtk_icon_view_get_type">
+               <object name="GtkGrid" parent="GtkContainer" type-name="GtkGrid" get-type="gtk_grid_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkCellLayout"/>
-                               <interface name="GtkScrollable"/>
+                               <interface name="GtkOrientable"/>
                        </implements>
-                       <method name="convert_widget_to_bin_window_coords" symbol="gtk_icon_view_convert_widget_to_bin_window_coords">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="wx" type="gint"/>
-                                       <parameter name="wy" type="gint"/>
-                                       <parameter name="bx" type="gint*"/>
-                                       <parameter name="by" type="gint*"/>
-                               </parameters>
-                       </method>
-                       <method name="create_drag_icon" symbol="gtk_icon_view_create_drag_icon">
-                               <return-type type="cairo_surface_t*"/>
-                               <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="enable_model_drag_dest" symbol="gtk_icon_view_enable_model_drag_dest">
+                       <method name="attach" symbol="gtk_grid_attach">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="targets" type="GtkTargetEntry*"/>
-                                       <parameter name="n_targets" type="gint"/>
-                                       <parameter name="actions" type="GdkDragAction"/>
+                                       <parameter name="grid" type="GtkGrid*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="left" type="gint"/>
+                                       <parameter name="top" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="enable_model_drag_source" symbol="gtk_icon_view_enable_model_drag_source">
+                       <method name="attach_next_to" symbol="gtk_grid_attach_next_to">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="start_button_mask" type="GdkModifierType"/>
-                                       <parameter name="targets" type="GtkTargetEntry*"/>
-                                       <parameter name="n_targets" type="gint"/>
-                                       <parameter name="actions" type="GdkDragAction"/>
+                                       <parameter name="grid" type="GtkGrid*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="sibling" type="GtkWidget*"/>
+                                       <parameter name="side" type="GtkPositionType"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_column_spacing" symbol="gtk_icon_view_get_column_spacing">
-                               <return-type type="gint"/>
+                       <method name="get_column_homogeneous" symbol="gtk_grid_get_column_homogeneous">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="grid" type="GtkGrid*"/>
                                </parameters>
                        </method>
-                       <method name="get_columns" symbol="gtk_icon_view_get_columns">
-                               <return-type type="gint"/>
+                       <method name="get_column_spacing" symbol="gtk_grid_get_column_spacing">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="grid" type="GtkGrid*"/>
                                </parameters>
                        </method>
-                       <method name="get_cursor" symbol="gtk_icon_view_get_cursor">
+                       <method name="get_row_homogeneous" symbol="gtk_grid_get_row_homogeneous">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath**"/>
-                                       <parameter name="cell" type="GtkCellRenderer**"/>
+                                       <parameter name="grid" type="GtkGrid*"/>
                                </parameters>
                        </method>
-                       <method name="get_dest_item_at_pos" symbol="gtk_icon_view_get_dest_item_at_pos">
-                               <return-type type="gboolean"/>
+                       <method name="get_row_spacing" symbol="gtk_grid_get_row_spacing">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="drag_x" type="gint"/>
-                                       <parameter name="drag_y" type="gint"/>
-                                       <parameter name="path" type="GtkTreePath**"/>
-                                       <parameter name="pos" type="GtkIconViewDropPosition*"/>
+                                       <parameter name="grid" type="GtkGrid*"/>
                                </parameters>
                        </method>
-                       <method name="get_drag_dest_item" symbol="gtk_icon_view_get_drag_dest_item">
+                       <constructor name="new" symbol="gtk_grid_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="set_column_homogeneous" symbol="gtk_grid_set_column_homogeneous">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath**"/>
-                                       <parameter name="pos" type="GtkIconViewDropPosition*"/>
+                                       <parameter name="grid" type="GtkGrid*"/>
+                                       <parameter name="homogeneous" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_item_at_pos" symbol="gtk_icon_view_get_item_at_pos">
-                               <return-type type="gboolean"/>
+                       <method name="set_column_spacing" symbol="gtk_grid_set_column_spacing">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="path" type="GtkTreePath**"/>
-                                       <parameter name="cell" type="GtkCellRenderer**"/>
+                                       <parameter name="grid" type="GtkGrid*"/>
+                                       <parameter name="spacing" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="get_item_column" symbol="gtk_icon_view_get_item_column">
-                               <return-type type="gint"/>
+                       <method name="set_row_homogeneous" symbol="gtk_grid_set_row_homogeneous">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="grid" type="GtkGrid*"/>
+                                       <parameter name="homogeneous" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_item_orientation" symbol="gtk_icon_view_get_item_orientation">
-                               <return-type type="GtkOrientation"/>
+                       <method name="set_row_spacing" symbol="gtk_grid_set_row_spacing">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="grid" type="GtkGrid*"/>
+                                       <parameter name="spacing" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="get_item_padding" symbol="gtk_icon_view_get_item_padding">
-                               <return-type type="gint"/>
+                       <property name="column-homogeneous" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="column-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="row-homogeneous" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="row-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkHBox" parent="GtkBox" type-name="GtkHBox" get-type="gtk_hbox_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_hbox_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="homogeneous" type="gboolean"/>
+                                       <parameter name="spacing" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="get_item_row" symbol="gtk_icon_view_get_item_row">
-                               <return-type type="gint"/>
+                       </constructor>
+               </object>
+               <object name="GtkHButtonBox" parent="GtkButtonBox" type-name="GtkHButtonBox" get-type="gtk_hbutton_box_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_hbutton_box_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+               </object>
+               <object name="GtkHPaned" parent="GtkPaned" type-name="GtkHPaned" get-type="gtk_hpaned_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_hpaned_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+               </object>
+               <object name="GtkHSV" parent="GtkWidget" type-name="GtkHSV" get-type="gtk_hsv_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_color" symbol="gtk_hsv_get_color">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="hsv" type="GtkHSV*"/>
+                                       <parameter name="h" type="gdouble*"/>
+                                       <parameter name="s" type="gdouble*"/>
+                                       <parameter name="v" type="gdouble*"/>
                                </parameters>
                        </method>
-                       <method name="get_item_width" symbol="gtk_icon_view_get_item_width">
-                               <return-type type="gint"/>
+                       <method name="get_metrics" symbol="gtk_hsv_get_metrics">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="hsv" type="GtkHSV*"/>
+                                       <parameter name="size" type="gint*"/>
+                                       <parameter name="ring_width" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="get_margin" symbol="gtk_icon_view_get_margin">
-                               <return-type type="gint"/>
+                       <method name="is_adjusting" symbol="gtk_hsv_is_adjusting">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="hsv" type="GtkHSV*"/>
                                </parameters>
                        </method>
-                       <method name="get_markup_column" symbol="gtk_icon_view_get_markup_column">
-                               <return-type type="gint"/>
+                       <constructor name="new" symbol="gtk_hsv_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="set_color" symbol="gtk_hsv_set_color">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="hsv" type="GtkHSV*"/>
+                                       <parameter name="h" type="double"/>
+                                       <parameter name="s" type="double"/>
+                                       <parameter name="v" type="double"/>
                                </parameters>
                        </method>
-                       <method name="get_model" symbol="gtk_icon_view_get_model">
-                               <return-type type="GtkTreeModel*"/>
+                       <method name="set_metrics" symbol="gtk_hsv_set_metrics">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="hsv" type="GtkHSV*"/>
+                                       <parameter name="size" type="gint"/>
+                                       <parameter name="ring_width" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_path_at_pos" symbol="gtk_icon_view_get_path_at_pos">
-                               <return-type type="GtkTreePath*"/>
+                       <method name="to_rgb" symbol="gtk_hsv_to_rgb">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="h" type="gdouble"/>
+                                       <parameter name="s" type="gdouble"/>
+                                       <parameter name="v" type="gdouble"/>
+                                       <parameter name="r" type="gdouble*"/>
+                                       <parameter name="g" type="gdouble*"/>
+                                       <parameter name="b" type="gdouble*"/>
                                </parameters>
                        </method>
-                       <method name="get_pixbuf_column" symbol="gtk_icon_view_get_pixbuf_column">
-                               <return-type type="gint"/>
+                       <signal name="changed" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="hsv" type="GtkHSV*"/>
                                </parameters>
-                       </method>
-                       <method name="get_reorderable" symbol="gtk_icon_view_get_reorderable">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="move" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="hsv" type="GtkHSV*"/>
+                                       <parameter name="type" type="GtkDirectionType"/>
                                </parameters>
-                       </method>
-                       <method name="get_row_spacing" symbol="gtk_icon_view_get_row_spacing">
-                               <return-type type="gint"/>
+                       </signal>
+               </object>
+               <object name="GtkHScale" parent="GtkScale" type-name="GtkHScale" get-type="gtk_hscale_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_hscale_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </method>
-                       <method name="get_selected_items" symbol="gtk_icon_view_get_selected_items">
-                               <return-type type="GList*"/>
+                       </constructor>
+                       <constructor name="new_with_range" symbol="gtk_hscale_new_with_range">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="min" type="gdouble"/>
+                                       <parameter name="max" type="gdouble"/>
+                                       <parameter name="step" type="gdouble"/>
                                </parameters>
-                       </method>
-                       <method name="get_selection_mode" symbol="gtk_icon_view_get_selection_mode">
-                               <return-type type="GtkSelectionMode"/>
+                       </constructor>
+               </object>
+               <object name="GtkHScrollbar" parent="GtkScrollbar" type-name="GtkHScrollbar" get-type="gtk_hscrollbar_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_hscrollbar_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </method>
-                       <method name="get_spacing" symbol="gtk_icon_view_get_spacing">
-                               <return-type type="gint"/>
+                       </constructor>
+               </object>
+               <object name="GtkHSeparator" parent="GtkSeparator" type-name="GtkHSeparator" get-type="gtk_hseparator_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_hseparator_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+               </object>
+               <object name="GtkHandleBox" parent="GtkBin" type-name="GtkHandleBox" get-type="gtk_handle_box_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_child_detached" symbol="gtk_handle_box_get_child_detached">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="handle_box" type="GtkHandleBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_text_column" symbol="gtk_icon_view_get_text_column">
-                               <return-type type="gint"/>
+                       <method name="get_handle_position" symbol="gtk_handle_box_get_handle_position">
+                               <return-type type="GtkPositionType"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="handle_box" type="GtkHandleBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_tooltip_column" symbol="gtk_icon_view_get_tooltip_column">
-                               <return-type type="gint"/>
+                       <method name="get_shadow_type" symbol="gtk_handle_box_get_shadow_type">
+                               <return-type type="GtkShadowType"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="handle_box" type="GtkHandleBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_tooltip_context" symbol="gtk_icon_view_get_tooltip_context">
-                               <return-type type="gboolean"/>
+                       <method name="get_snap_edge" symbol="gtk_handle_box_get_snap_edge">
+                               <return-type type="GtkPositionType"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="x" type="gint*"/>
-                                       <parameter name="y" type="gint*"/>
-                                       <parameter name="keyboard_tip" type="gboolean"/>
-                                       <parameter name="model" type="GtkTreeModel**"/>
-                                       <parameter name="path" type="GtkTreePath**"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="handle_box" type="GtkHandleBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_visible_range" symbol="gtk_icon_view_get_visible_range">
-                               <return-type type="gboolean"/>
+                       <constructor name="new" symbol="gtk_handle_box_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="set_handle_position" symbol="gtk_handle_box_set_handle_position">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="start_path" type="GtkTreePath**"/>
-                                       <parameter name="end_path" type="GtkTreePath**"/>
+                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="position" type="GtkPositionType"/>
                                </parameters>
                        </method>
-                       <method name="item_activated" symbol="gtk_icon_view_item_activated">
+                       <method name="set_shadow_type" symbol="gtk_handle_box_set_shadow_type">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="type" type="GtkShadowType"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_icon_view_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_model" symbol="gtk_icon_view_new_with_model">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="model" type="GtkTreeModel*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="path_is_selected" symbol="gtk_icon_view_path_is_selected">
-                               <return-type type="gboolean"/>
+                       <method name="set_snap_edge" symbol="gtk_handle_box_set_snap_edge">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="edge" type="GtkPositionType"/>
                                </parameters>
                        </method>
-                       <method name="scroll_to_path" symbol="gtk_icon_view_scroll_to_path">
+                       <property name="child-detached" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="handle-position" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="snap-edge" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="snap-edge-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="child-attached" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="use_align" type="gboolean"/>
-                                       <parameter name="row_align" type="gfloat"/>
-                                       <parameter name="col_align" type="gfloat"/>
+                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
-                       </method>
-                       <method name="select_all" symbol="gtk_icon_view_select_all">
+                       </signal>
+                       <signal name="child-detached" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
-                       </method>
-                       <method name="select_path" symbol="gtk_icon_view_select_path">
-                               <return-type type="void"/>
+                       </signal>
+               </object>
+               <object name="GtkIMContext" parent="GObject" type-name="GtkIMContext" get-type="gtk_im_context_get_type">
+                       <method name="delete_surrounding" symbol="gtk_im_context_delete_surrounding">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="offset" type="gint"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="selected_foreach" symbol="gtk_icon_view_selected_foreach">
-                               <return-type type="void"/>
+                       <method name="filter_keypress" symbol="gtk_im_context_filter_keypress">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="func" type="GtkIconViewForeachFunc"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="event" type="GdkEventKey*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_spacing" symbol="gtk_icon_view_set_column_spacing">
+                       <method name="focus_in" symbol="gtk_im_context_focus_in">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="column_spacing" type="gint"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
                        </method>
-                       <method name="set_columns" symbol="gtk_icon_view_set_columns">
+                       <method name="focus_out" symbol="gtk_im_context_focus_out">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="columns" type="gint"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
                        </method>
-                       <method name="set_cursor" symbol="gtk_icon_view_set_cursor">
+                       <method name="get_preedit_string" symbol="gtk_im_context_get_preedit_string">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="start_editing" type="gboolean"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="str" type="gchar**"/>
+                                       <parameter name="attrs" type="PangoAttrList**"/>
+                                       <parameter name="cursor_pos" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_drag_dest_item" symbol="gtk_icon_view_set_drag_dest_item">
-                               <return-type type="void"/>
+                       <method name="get_surrounding" symbol="gtk_im_context_get_surrounding">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="pos" type="GtkIconViewDropPosition"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="text" type="gchar**"/>
+                                       <parameter name="cursor_index" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_item_orientation" symbol="gtk_icon_view_set_item_orientation">
+                       <method name="reset" symbol="gtk_im_context_reset">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
                        </method>
-                       <method name="set_item_padding" symbol="gtk_icon_view_set_item_padding">
+                       <method name="set_client_window" symbol="gtk_im_context_set_client_window">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="item_padding" type="gint"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
                                </parameters>
                        </method>
-                       <method name="set_item_width" symbol="gtk_icon_view_set_item_width">
+                       <method name="set_cursor_location" symbol="gtk_im_context_set_cursor_location">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="item_width" type="gint"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="area" type="GdkRectangle*"/>
                                </parameters>
                        </method>
-                       <method name="set_margin" symbol="gtk_icon_view_set_margin">
+                       <method name="set_surrounding" symbol="gtk_im_context_set_surrounding">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="margin" type="gint"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="len" type="gint"/>
+                                       <parameter name="cursor_index" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_markup_column" symbol="gtk_icon_view_set_markup_column">
+                       <method name="set_use_preedit" symbol="gtk_im_context_set_use_preedit">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="use_preedit" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_model" symbol="gtk_icon_view_set_model">
+                       <signal name="commit" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="str" type="char*"/>
                                </parameters>
-                       </method>
-                       <method name="set_pixbuf_column" symbol="gtk_icon_view_set_pixbuf_column">
-                               <return-type type="void"/>
+                       </signal>
+                       <signal name="delete-surrounding" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="offset" type="gint"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="set_reorderable" symbol="gtk_icon_view_set_reorderable">
+                       </signal>
+                       <signal name="preedit-changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="reorderable" type="gboolean"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </method>
-                       <method name="set_row_spacing" symbol="gtk_icon_view_set_row_spacing">
+                       </signal>
+                       <signal name="preedit-end" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="row_spacing" type="gint"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </method>
-                       <method name="set_selection_mode" symbol="gtk_icon_view_set_selection_mode">
+                       </signal>
+                       <signal name="preedit-start" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="mode" type="GtkSelectionMode"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </method>
-                       <method name="set_spacing" symbol="gtk_icon_view_set_spacing">
+                       </signal>
+                       <signal name="retrieve-surrounding" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                               </parameters>
+                       </signal>
+                       <vfunc name="filter_keypress">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="event" type="GdkEventKey*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="focus_in">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="spacing" type="gint"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </method>
-                       <method name="set_text_column" symbol="gtk_icon_view_set_text_column">
+                       </vfunc>
+                       <vfunc name="focus_out">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </method>
-                       <method name="set_tooltip_cell" symbol="gtk_icon_view_set_tooltip_cell">
+                       </vfunc>
+                       <vfunc name="get_preedit_string">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="tooltip" type="GtkTooltip*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="str" type="gchar**"/>
+                                       <parameter name="attrs" type="PangoAttrList**"/>
+                                       <parameter name="cursor_pos" type="gint*"/>
                                </parameters>
-                       </method>
-                       <method name="set_tooltip_column" symbol="gtk_icon_view_set_tooltip_column">
+                       </vfunc>
+                       <vfunc name="get_surrounding">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="text" type="gchar**"/>
+                                       <parameter name="cursor_index" type="gint*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="reset">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </method>
-                       <method name="set_tooltip_item" symbol="gtk_icon_view_set_tooltip_item">
+                       </vfunc>
+                       <vfunc name="set_client_window">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="tooltip" type="GtkTooltip*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
                                </parameters>
-                       </method>
-                       <method name="unselect_all" symbol="gtk_icon_view_unselect_all">
+                       </vfunc>
+                       <vfunc name="set_cursor_location">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="area" type="GdkRectangle*"/>
                                </parameters>
-                       </method>
-                       <method name="unselect_path" symbol="gtk_icon_view_unselect_path">
+                       </vfunc>
+                       <vfunc name="set_surrounding">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="len" type="gint"/>
+                                       <parameter name="cursor_index" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="unset_model_drag_dest" symbol="gtk_icon_view_unset_model_drag_dest">
+                       </vfunc>
+                       <vfunc name="set_use_preedit">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="use_preedit" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <method name="unset_model_drag_source" symbol="gtk_icon_view_unset_model_drag_source">
+                       </vfunc>
+               </object>
+               <object name="GtkIMContextSimple" parent="GtkIMContext" type-name="GtkIMContextSimple" get-type="gtk_im_context_simple_get_type">
+                       <method name="add_table" symbol="gtk_im_context_simple_add_table">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="context_simple" type="GtkIMContextSimple*"/>
+                                       <parameter name="data" type="guint16*"/>
+                                       <parameter name="max_seq_len" type="gint"/>
+                                       <parameter name="n_seqs" type="gint"/>
                                </parameters>
                        </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-orientation" type="GtkOrientation" 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"/>
-                       <property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pixbuf-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="reorderable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="row-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="selection-mode" type="GtkSelectionMode" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="tooltip-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="activate-cursor-item" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="item-activated" when="LAST">
+                       <constructor name="new" symbol="gtk_im_context_simple_new">
+                               <return-type type="GtkIMContext*"/>
+                       </constructor>
+               </object>
+               <object name="GtkIMMulticontext" parent="GtkIMContext" type-name="GtkIMMulticontext" get-type="gtk_im_multicontext_get_type">
+                       <method name="append_menuitems" symbol="gtk_im_multicontext_append_menuitems">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="context" type="GtkIMMulticontext*"/>
+                                       <parameter name="menushell" type="GtkMenuShell*"/>
                                </parameters>
-                       </signal>
-                       <signal name="move-cursor" when="LAST">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <method name="get_context_id" symbol="gtk_im_multicontext_get_context_id">
+                               <return-type type="char*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="step" type="GtkMovementStep"/>
-                                       <parameter name="count" type="gint"/>
+                                       <parameter name="context" type="GtkIMMulticontext*"/>
                                </parameters>
-                       </signal>
-                       <signal name="select-all" when="LAST">
+                       </method>
+                       <constructor name="new" symbol="gtk_im_multicontext_new">
+                               <return-type type="GtkIMContext*"/>
+                       </constructor>
+                       <method name="set_context_id" symbol="gtk_im_multicontext_set_context_id">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="context" type="GtkIMMulticontext*"/>
+                                       <parameter name="context_id" type="char*"/>
                                </parameters>
-                       </signal>
-                       <signal name="select-cursor-item" when="LAST">
+                       </method>
+               </object>
+               <object name="GtkIconFactory" parent="GObject" type-name="GtkIconFactory" get-type="gtk_icon_factory_get_type">
+                       <implements>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="add" symbol="gtk_icon_factory_add">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="factory" type="GtkIconFactory*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
                                </parameters>
-                       </signal>
-                       <signal name="selection-changed" when="FIRST">
+                       </method>
+                       <method name="add_default" symbol="gtk_icon_factory_add_default">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="factory" type="GtkIconFactory*"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-cursor-item" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="lookup" symbol="gtk_icon_factory_lookup">
+                               <return-type type="GtkIconSet*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="factory" type="GtkIconFactory*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="unselect-all" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="lookup_default" symbol="gtk_icon_factory_lookup_default">
+                               <return-type type="GtkIconSet*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkImage" parent="GtkMisc" type-name="GtkImage" get-type="gtk_image_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="clear" symbol="gtk_image_clear">
+                       </method>
+                       <constructor name="new" symbol="gtk_icon_factory_new">
+                               <return-type type="GtkIconFactory*"/>
+                       </constructor>
+                       <method name="remove_default" symbol="gtk_icon_factory_remove_default">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="factory" type="GtkIconFactory*"/>
                                </parameters>
                        </method>
-                       <method name="get_animation" symbol="gtk_image_get_animation">
-                               <return-type type="GdkPixbufAnimation*"/>
+               </object>
+               <object name="GtkIconTheme" parent="GObject" type-name="GtkIconTheme" get-type="gtk_icon_theme_get_type">
+                       <method name="add_builtin_icon" symbol="gtk_icon_theme_add_builtin_icon">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="size" type="gint"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
                        </method>
-                       <method name="get_gicon" symbol="gtk_image_get_gicon">
+                       <method name="append_search_path" symbol="gtk_icon_theme_append_search_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="gicon" type="GIcon**"/>
-                                       <parameter name="size" type="GtkIconSize*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="path" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_name" symbol="gtk_image_get_icon_name">
-                               <return-type type="void"/>
+                       <method name="choose_icon" symbol="gtk_icon_theme_choose_icon">
+                               <return-type type="GtkIconInfo*"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="icon_name" type="gchar**"/>
-                                       <parameter name="size" type="GtkIconSize*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="icon_names" type="gchar*[]"/>
+                                       <parameter name="size" type="gint"/>
+                                       <parameter name="flags" type="GtkIconLookupFlags"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_set" symbol="gtk_image_get_icon_set">
-                               <return-type type="void"/>
+                       <method name="error_quark" symbol="gtk_icon_theme_error_quark">
+                               <return-type type="GQuark"/>
+                       </method>
+                       <method name="get_default" symbol="gtk_icon_theme_get_default">
+                               <return-type type="GtkIconTheme*"/>
+                       </method>
+                       <method name="get_example_icon_name" symbol="gtk_icon_theme_get_example_icon_name">
+                               <return-type type="char*"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="icon_set" type="GtkIconSet**"/>
-                                       <parameter name="size" type="GtkIconSize*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
                                </parameters>
                        </method>
-                       <method name="get_pixbuf" symbol="gtk_image_get_pixbuf">
-                               <return-type type="GdkPixbuf*"/>
+                       <method name="get_for_screen" symbol="gtk_icon_theme_get_for_screen">
+                               <return-type type="GtkIconTheme*"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
                                </parameters>
                        </method>
-                       <method name="get_pixel_size" symbol="gtk_image_get_pixel_size">
-                               <return-type type="gint"/>
+                       <method name="get_icon_sizes" symbol="gtk_icon_theme_get_icon_sizes">
+                               <return-type type="gint*"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_stock" symbol="gtk_image_get_stock">
+                       <method name="get_search_path" symbol="gtk_icon_theme_get_search_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="stock_id" type="gchar**"/>
-                                       <parameter name="size" type="GtkIconSize*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="path" type="gchar**[]"/>
+                                       <parameter name="n_elements" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="get_storage_type" symbol="gtk_image_get_storage_type">
-                               <return-type type="GtkImageType"/>
+                       <method name="has_icon" symbol="gtk_icon_theme_has_icon">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_image_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_from_animation" symbol="gtk_image_new_from_animation">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="animation" type="GdkPixbufAnimation*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_file" symbol="gtk_image_new_from_file">
-                               <return-type type="GtkWidget*"/>
+                       <method name="list_contexts" symbol="gtk_icon_theme_list_contexts">
+                               <return-type type="GList*"/>
                                <parameters>
-                                       <parameter name="filename" type="gchar*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_gicon" symbol="gtk_image_new_from_gicon">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="list_icons" symbol="gtk_icon_theme_list_icons">
+                               <return-type type="GList*"/>
                                <parameters>
-                                       <parameter name="icon" type="GIcon*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="context" type="gchar*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_icon_name" symbol="gtk_image_new_from_icon_name">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="load_icon" symbol="gtk_icon_theme_load_icon">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
                                        <parameter name="icon_name" type="gchar*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_icon_set" symbol="gtk_image_new_from_icon_set">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="size" type="gint"/>
+                                       <parameter name="flags" type="GtkIconLookupFlags"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_pixbuf" symbol="gtk_image_new_from_pixbuf">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="lookup_by_gicon" symbol="gtk_icon_theme_lookup_by_gicon">
+                               <return-type type="GtkIconInfo*"/>
                                <parameters>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="icon" type="GIcon*"/>
+                                       <parameter name="size" type="gint"/>
+                                       <parameter name="flags" type="GtkIconLookupFlags"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_stock" symbol="gtk_image_new_from_stock">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="lookup_icon" symbol="gtk_icon_theme_lookup_icon">
+                               <return-type type="GtkIconInfo*"/>
                                <parameters>
-                                       <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="size" type="gint"/>
+                                       <parameter name="flags" type="GtkIconLookupFlags"/>
                                </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_icon_theme_new">
+                               <return-type type="GtkIconTheme*"/>
                        </constructor>
-                       <method name="set_from_animation" symbol="gtk_image_set_from_animation">
+                       <method name="prepend_search_path" symbol="gtk_icon_theme_prepend_search_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="animation" type="GdkPixbufAnimation*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="path" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_from_file" symbol="gtk_image_set_from_file">
-                               <return-type type="void"/>
+                       <method name="rescan_if_needed" symbol="gtk_icon_theme_rescan_if_needed">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="filename" type="gchar*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
                                </parameters>
                        </method>
-                       <method name="set_from_gicon" symbol="gtk_image_set_from_gicon">
+                       <method name="set_custom_theme" symbol="gtk_icon_theme_set_custom_theme">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="icon" type="GIcon*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
-                               </parameters>
-                       </method>
-                       <method name="set_from_icon_name" symbol="gtk_image_set_from_icon_name">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
-                               </parameters>
-                       </method>
-                       <method name="set_from_icon_set" symbol="gtk_image_set_from_icon_set">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="theme_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_from_pixbuf" symbol="gtk_image_set_from_pixbuf">
+                       <method name="set_screen" symbol="gtk_icon_theme_set_screen">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
                                </parameters>
                        </method>
-                       <method name="set_from_stock" symbol="gtk_image_set_from_stock">
+                       <method name="set_search_path" symbol="gtk_icon_theme_set_search_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="path" type="gchar*[]"/>
+                                       <parameter name="n_elements" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_pixel_size" symbol="gtk_image_set_pixel_size">
+                       <signal name="changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="pixel_size" type="gint"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
                                </parameters>
-                       </method>
-                       <property name="file" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="icon-set" type="GtkIconSet*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="icon-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pixbuf" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pixbuf-animation" type="GdkPixbufAnimation*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pixel-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="stock" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="storage-type" type="GtkImageType" readable="1" writable="0" construct="0" construct-only="0"/>
+                       </signal>
                </object>
-               <object name="GtkImageMenuItem" parent="GtkMenuItem" type-name="GtkImageMenuItem" get-type="gtk_image_menu_item_get_type">
+               <object name="GtkIconView" parent="GtkContainer" type-name="GtkIconView" get-type="gtk_icon_view_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkActivatable"/>
+                               <interface name="GtkCellLayout"/>
+                               <interface name="GtkScrollable"/>
                        </implements>
-                       <method name="get_always_show_image" symbol="gtk_image_menu_item_get_always_show_image">
-                               <return-type type="gboolean"/>
+                       <method name="convert_widget_to_bin_window_coords" symbol="gtk_icon_view_convert_widget_to_bin_window_coords">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="wx" type="gint"/>
+                                       <parameter name="wy" type="gint"/>
+                                       <parameter name="bx" type="gint*"/>
+                                       <parameter name="by" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="get_image" symbol="gtk_image_menu_item_get_image">
-                               <return-type type="GtkWidget*"/>
+                       <method name="create_drag_icon" symbol="gtk_icon_view_create_drag_icon">
+                               <return-type type="cairo_surface_t*"/>
                                <parameters>
-                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="get_use_stock" symbol="gtk_image_menu_item_get_use_stock">
-                               <return-type type="gboolean"/>
+                       <method name="enable_model_drag_dest" symbol="gtk_icon_view_enable_model_drag_dest">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="targets" type="GtkTargetEntry*"/>
+                                       <parameter name="n_targets" type="gint"/>
+                                       <parameter name="actions" type="GdkDragAction"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_image_menu_item_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_from_stock" symbol="gtk_image_menu_item_new_from_stock">
-                               <return-type type="GtkWidget*"/>
+                       <method name="enable_model_drag_source" symbol="gtk_icon_view_enable_model_drag_source">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="start_button_mask" type="GdkModifierType"/>
+                                       <parameter name="targets" type="GtkTargetEntry*"/>
+                                       <parameter name="n_targets" type="gint"/>
+                                       <parameter name="actions" type="GdkDragAction"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_label" symbol="gtk_image_menu_item_new_with_label">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="get_column_spacing" symbol="gtk_icon_view_get_column_spacing">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_image_menu_item_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="get_columns" symbol="gtk_icon_view_get_columns">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_accel_group" symbol="gtk_image_menu_item_set_accel_group">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_cursor" symbol="gtk_icon_view_get_cursor">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath**"/>
+                                       <parameter name="cell" type="GtkCellRenderer**"/>
                                </parameters>
                        </method>
-                       <method name="set_always_show_image" symbol="gtk_image_menu_item_set_always_show_image">
-                               <return-type type="void"/>
+                       <method name="get_dest_item_at_pos" symbol="gtk_icon_view_get_dest_item_at_pos">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
-                                       <parameter name="always_show" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="drag_x" type="gint"/>
+                                       <parameter name="drag_y" type="gint"/>
+                                       <parameter name="path" type="GtkTreePath**"/>
+                                       <parameter name="pos" type="GtkIconViewDropPosition*"/>
                                </parameters>
                        </method>
-                       <method name="set_image" symbol="gtk_image_menu_item_set_image">
+                       <method name="get_drag_dest_item" symbol="gtk_icon_view_get_drag_dest_item">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
-                                       <parameter name="image" type="GtkWidget*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath**"/>
+                                       <parameter name="pos" type="GtkIconViewDropPosition*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_stock" symbol="gtk_image_menu_item_set_use_stock">
-                               <return-type type="void"/>
+                       <method name="get_item_at_pos" symbol="gtk_icon_view_get_item_at_pos">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
-                                       <parameter name="use_stock" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="path" type="GtkTreePath**"/>
+                                       <parameter name="cell" type="GtkCellRenderer**"/>
                                </parameters>
                        </method>
-                       <property name="accel-group" type="GtkAccelGroup*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="always-show-image" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="image" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="use-stock" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-               </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"/>
+                       <method name="get_item_column" symbol="gtk_icon_view_get_item_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="info_bar" type="GtkInfoBar*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="add_button" symbol="gtk_info_bar_add_button">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_item_orientation" symbol="gtk_icon_view_get_item_orientation">
+                               <return-type type="GtkOrientation"/>
                                <parameters>
-                                       <parameter name="info_bar" type="GtkInfoBar*"/>
-                                       <parameter name="button_text" type="gchar*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="add_buttons" symbol="gtk_info_bar_add_buttons">
-                               <return-type type="void"/>
+                       <method name="get_item_padding" symbol="gtk_icon_view_get_item_padding">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="info_bar" type="GtkInfoBar*"/>
-                                       <parameter name="first_button_text" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_action_area" symbol="gtk_info_bar_get_action_area">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_item_row" symbol="gtk_icon_view_get_item_row">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="info_bar" type="GtkInfoBar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="get_content_area" symbol="gtk_info_bar_get_content_area">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_item_width" symbol="gtk_icon_view_get_item_width">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="info_bar" type="GtkInfoBar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_message_type" symbol="gtk_info_bar_get_message_type">
-                               <return-type type="GtkMessageType"/>
+                       <method name="get_margin" symbol="gtk_icon_view_get_margin">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="info_bar" type="GtkInfoBar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </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*"/>
+                       <method name="get_markup_column" symbol="gtk_icon_view_get_markup_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="first_button_text" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
-                       </constructor>
-                       <method name="response" symbol="gtk_info_bar_response">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_model" symbol="gtk_icon_view_get_model">
+                               <return-type type="GtkTreeModel*"/>
                                <parameters>
-                                       <parameter name="info_bar" type="GtkInfoBar*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="set_default_response" symbol="gtk_info_bar_set_default_response">
-                               <return-type type="void"/>
+                       <method name="get_path_at_pos" symbol="gtk_icon_view_get_path_at_pos">
+                               <return-type type="GtkTreePath*"/>
                                <parameters>
-                                       <parameter name="info_bar" type="GtkInfoBar*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_message_type" symbol="gtk_info_bar_set_message_type">
-                               <return-type type="void"/>
+                       <method name="get_pixbuf_column" symbol="gtk_icon_view_get_pixbuf_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="info_bar" type="GtkInfoBar*"/>
-                                       <parameter name="message_type" type="GtkMessageType"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="set_response_sensitive" symbol="gtk_info_bar_set_response_sensitive">
-                               <return-type type="void"/>
+                       <method name="get_reorderable" symbol="gtk_icon_view_get_reorderable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="info_bar" type="GtkInfoBar*"/>
-                                       <parameter name="response_id" type="gint"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </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"/>
+                       <method name="get_row_spacing" symbol="gtk_icon_view_get_row_spacing">
+                               <return-type type="gint"/>
                                <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="GtkInvisible" parent="GtkWidget" type-name="GtkInvisible" get-type="gtk_invisible_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_screen" symbol="gtk_invisible_get_screen">
-                               <return-type type="GdkScreen*"/>
-                               <parameters>
-                                       <parameter name="invisible" type="GtkInvisible*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_invisible_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_for_screen" symbol="gtk_invisible_new_for_screen">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="screen" type="GdkScreen*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_screen" symbol="gtk_invisible_set_screen">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="invisible" type="GtkInvisible*"/>
-                                       <parameter name="screen" type="GdkScreen*"/>
-                               </parameters>
-                       </method>
-                       <property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkLabel" parent="GtkMisc" type-name="GtkLabel" get-type="gtk_label_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_angle" symbol="gtk_label_get_angle">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_attributes" symbol="gtk_label_get_attributes">
-                               <return-type type="PangoAttrList*"/>
-                               <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_current_uri" symbol="gtk_label_get_current_uri">
-                               <return-type type="gchar*"/>
+                       <method name="get_selected_items" symbol="gtk_icon_view_get_selected_items">
+                               <return-type type="GList*"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_ellipsize" symbol="gtk_label_get_ellipsize">
-                               <return-type type="PangoEllipsizeMode"/>
+                       <method name="get_selection_mode" symbol="gtk_icon_view_get_selection_mode">
+                               <return-type type="GtkSelectionMode"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_justify" symbol="gtk_label_get_justify">
-                               <return-type type="GtkJustification"/>
+                       <method name="get_spacing" symbol="gtk_icon_view_get_spacing">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_label" symbol="gtk_label_get_label">
-                               <return-type type="gchar*"/>
+                       <method name="get_text_column" symbol="gtk_icon_view_get_text_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_layout" symbol="gtk_label_get_layout">
-                               <return-type type="PangoLayout*"/>
+                       <method name="get_tooltip_column" symbol="gtk_icon_view_get_tooltip_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_layout_offsets" symbol="gtk_label_get_layout_offsets">
-                               <return-type type="void"/>
+                       <method name="get_tooltip_context" symbol="gtk_icon_view_get_tooltip_context">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                        <parameter name="x" type="gint*"/>
                                        <parameter name="y" type="gint*"/>
+                                       <parameter name="keyboard_tip" type="gboolean"/>
+                                       <parameter name="model" type="GtkTreeModel**"/>
+                                       <parameter name="path" type="GtkTreePath**"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_line_wrap" symbol="gtk_label_get_line_wrap">
+                       <method name="get_visible_range" symbol="gtk_icon_view_get_visible_range">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_line_wrap_mode" symbol="gtk_label_get_line_wrap_mode">
-                               <return-type type="PangoWrapMode"/>
-                               <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="start_path" type="GtkTreePath**"/>
+                                       <parameter name="end_path" type="GtkTreePath**"/>
                                </parameters>
                        </method>
-                       <method name="get_max_width_chars" symbol="gtk_label_get_max_width_chars">
-                               <return-type type="gint"/>
+                       <method name="item_activated" symbol="gtk_icon_view_item_activated">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="get_mnemonic_keyval" symbol="gtk_label_get_mnemonic_keyval">
-                               <return-type type="guint"/>
+                       <constructor name="new" symbol="gtk_icon_view_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_area" symbol="gtk_icon_view_new_with_area">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="area" type="GtkCellArea*"/>
                                </parameters>
-                       </method>
-                       <method name="get_mnemonic_widget" symbol="gtk_label_get_mnemonic_widget">
+                       </constructor>
+                       <constructor name="new_with_model" symbol="gtk_icon_view_new_with_model">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </parameters>
-                       </method>
-                       <method name="get_selectable" symbol="gtk_label_get_selectable">
+                       </constructor>
+                       <method name="path_is_selected" symbol="gtk_icon_view_path_is_selected">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="get_selection_bounds" symbol="gtk_label_get_selection_bounds">
-                               <return-type type="gboolean"/>
+                       <method name="scroll_to_path" symbol="gtk_icon_view_scroll_to_path">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="start" type="gint*"/>
-                                       <parameter name="end" type="gint*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="use_align" type="gboolean"/>
+                                       <parameter name="row_align" type="gfloat"/>
+                                       <parameter name="col_align" type="gfloat"/>
                                </parameters>
                        </method>
-                       <method name="get_single_line_mode" symbol="gtk_label_get_single_line_mode">
-                               <return-type type="gboolean"/>
+                       <method name="select_all" symbol="gtk_icon_view_select_all">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_text" symbol="gtk_label_get_text">
-                               <return-type type="gchar*"/>
+                       <method name="select_path" symbol="gtk_icon_view_select_path">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="get_track_visited_links" symbol="gtk_label_get_track_visited_links">
-                               <return-type type="gboolean"/>
+                       <method name="selected_foreach" symbol="gtk_icon_view_selected_foreach">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="func" type="GtkIconViewForeachFunc"/>
+                                       <parameter name="data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="get_use_markup" symbol="gtk_label_get_use_markup">
-                               <return-type type="gboolean"/>
+                       <method name="set_column_spacing" symbol="gtk_icon_view_set_column_spacing">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="column_spacing" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_use_underline" symbol="gtk_label_get_use_underline">
-                               <return-type type="gboolean"/>
+                       <method name="set_columns" symbol="gtk_icon_view_set_columns">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="columns" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_width_chars" symbol="gtk_label_get_width_chars">
-                               <return-type type="gint"/>
+                       <method name="set_cursor" symbol="gtk_icon_view_set_cursor">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="start_editing" type="gboolean"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_label_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="str" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_label_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="str" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="select_region" symbol="gtk_label_select_region">
+                       <method name="set_drag_dest_item" symbol="gtk_icon_view_set_drag_dest_item">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="start_offset" type="gint"/>
-                                       <parameter name="end_offset" type="gint"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="pos" type="GtkIconViewDropPosition"/>
                                </parameters>
                        </method>
-                       <method name="set_angle" symbol="gtk_label_set_angle">
+                       <method name="set_item_orientation" symbol="gtk_icon_view_set_item_orientation">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="angle" type="gdouble"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="orientation" type="GtkOrientation"/>
                                </parameters>
                        </method>
-                       <method name="set_attributes" symbol="gtk_label_set_attributes">
+                       <method name="set_item_padding" symbol="gtk_icon_view_set_item_padding">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="attrs" type="PangoAttrList*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="item_padding" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_ellipsize" symbol="gtk_label_set_ellipsize">
+                       <method name="set_item_width" symbol="gtk_icon_view_set_item_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="mode" type="PangoEllipsizeMode"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="item_width" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_justify" symbol="gtk_label_set_justify">
+                       <method name="set_margin" symbol="gtk_icon_view_set_margin">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="jtype" type="GtkJustification"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="margin" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_label" symbol="gtk_label_set_label">
+                       <method name="set_markup_column" symbol="gtk_icon_view_set_markup_column">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_line_wrap" symbol="gtk_label_set_line_wrap">
+                       <method name="set_model" symbol="gtk_icon_view_set_model">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="wrap" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </parameters>
                        </method>
-                       <method name="set_line_wrap_mode" symbol="gtk_label_set_line_wrap_mode">
+                       <method name="set_pixbuf_column" symbol="gtk_icon_view_set_pixbuf_column">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="wrap_mode" type="PangoWrapMode"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_markup" symbol="gtk_label_set_markup">
+                       <method name="set_reorderable" symbol="gtk_icon_view_set_reorderable">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="reorderable" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_markup_with_mnemonic" symbol="gtk_label_set_markup_with_mnemonic">
+                       <method name="set_row_spacing" symbol="gtk_icon_view_set_row_spacing">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="row_spacing" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_max_width_chars" symbol="gtk_label_set_max_width_chars">
+                       <method name="set_selection_mode" symbol="gtk_icon_view_set_selection_mode">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="n_chars" type="gint"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="mode" type="GtkSelectionMode"/>
                                </parameters>
                        </method>
-                       <method name="set_mnemonic_widget" symbol="gtk_label_set_mnemonic_widget">
+                       <method name="set_spacing" symbol="gtk_icon_view_set_spacing">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="spacing" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_pattern" symbol="gtk_label_set_pattern">
+                       <method name="set_text_column" symbol="gtk_icon_view_set_text_column">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="pattern" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_selectable" symbol="gtk_label_set_selectable">
+                       <method name="set_tooltip_cell" symbol="gtk_icon_view_set_tooltip_cell">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="tooltip" type="GtkTooltip*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
                                </parameters>
                        </method>
-                       <method name="set_single_line_mode" symbol="gtk_label_set_single_line_mode">
+                       <method name="set_tooltip_column" symbol="gtk_icon_view_set_tooltip_column">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="single_line_mode" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_text" symbol="gtk_label_set_text">
+                       <method name="set_tooltip_item" symbol="gtk_icon_view_set_tooltip_item">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="tooltip" type="GtkTooltip*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="set_text_with_mnemonic" symbol="gtk_label_set_text_with_mnemonic">
+                       <method name="unselect_all" symbol="gtk_icon_view_unselect_all">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="set_track_visited_links" symbol="gtk_label_set_track_visited_links">
+                       <method name="unselect_path" symbol="gtk_icon_view_unselect_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="track_links" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_markup" symbol="gtk_label_set_use_markup">
+                       <method name="unset_model_drag_dest" symbol="gtk_icon_view_unset_model_drag_dest">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_underline" symbol="gtk_label_set_use_underline">
+                       <method name="unset_model_drag_source" symbol="gtk_icon_view_unset_model_drag_source">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="set_width_chars" symbol="gtk_label_set_width_chars">
-                               <return-type type="void"/>
+                       <property name="cell-area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <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-orientation" type="GtkOrientation" 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"/>
+                       <property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pixbuf-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="reorderable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="row-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="selection-mode" type="GtkSelectionMode" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="tooltip-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="activate-cursor-item" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="n_chars" type="gint"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
-                       </method>
-                       <property name="angle" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="attributes" type="PangoAttrList*" 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="ellipsize" type="PangoEllipsizeMode" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="justify" type="GtkJustification" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="max-width-chars" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="mnemonic-keyval" type="guint" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="mnemonic-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pattern" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <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">
+                       </signal>
+                       <signal name="item-activated" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </signal>
-                       <signal name="activate-link" when="LAST">
+                       <signal name="move-cursor" when="LAST">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="uri" type="char*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="step" type="GtkMovementStep"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </signal>
-                       <signal name="copy-clipboard" when="LAST">
+                       <signal name="select-all" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </signal>
-                       <signal name="move-cursor" when="LAST">
+                       <signal name="select-cursor-item" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="step" type="GtkMovementStep"/>
-                                       <parameter name="count" type="gint"/>
-                                       <parameter name="extend_selection" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </signal>
-                       <signal name="populate-popup" when="LAST">
+                       <signal name="selection-changed" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="toggle-cursor-item" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="unselect-all" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </signal>
                </object>
-               <object name="GtkLayout" parent="GtkContainer" type-name="GtkLayout" get-type="gtk_layout_get_type">
+               <object name="GtkImage" parent="GtkMisc" type-name="GtkImage" get-type="gtk_image_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkScrollable"/>
                        </implements>
-                       <method name="get_bin_window" symbol="gtk_layout_get_bin_window">
-                               <return-type type="GdkWindow*"/>
-                               <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_hadjustment" symbol="gtk_layout_get_hadjustment">
-                               <return-type type="GtkAdjustment*"/>
-                               <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_size" symbol="gtk_layout_get_size">
+                       <method name="clear" symbol="gtk_image_clear">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
-                                       <parameter name="width" type="guint*"/>
-                                       <parameter name="height" type="guint*"/>
+                                       <parameter name="image" type="GtkImage*"/>
                                </parameters>
                        </method>
-                       <method name="get_vadjustment" symbol="gtk_layout_get_vadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       <method name="get_animation" symbol="gtk_image_get_animation">
+                               <return-type type="GdkPixbufAnimation*"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="image" type="GtkImage*"/>
                                </parameters>
                        </method>
-                       <method name="move" symbol="gtk_layout_move">
+                       <method name="get_gicon" symbol="gtk_image_get_gicon">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
-                                       <parameter name="child_widget" type="GtkWidget*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="gicon" type="GIcon**"/>
+                                       <parameter name="size" type="GtkIconSize*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_layout_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="hadjustment" type="GtkAdjustment*"/>
-                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="put" symbol="gtk_layout_put">
+                       <method name="get_icon_name" symbol="gtk_image_get_icon_name">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
-                                       <parameter name="child_widget" type="GtkWidget*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="icon_name" type="gchar**"/>
+                                       <parameter name="size" type="GtkIconSize*"/>
                                </parameters>
                        </method>
-                       <method name="set_hadjustment" symbol="gtk_layout_set_hadjustment">
+                       <method name="get_icon_set" symbol="gtk_image_get_icon_set">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="icon_set" type="GtkIconSet**"/>
+                                       <parameter name="size" type="GtkIconSize*"/>
                                </parameters>
                        </method>
-                       <method name="set_size" symbol="gtk_layout_set_size">
-                               <return-type type="void"/>
+                       <method name="get_pixbuf" symbol="gtk_image_get_pixbuf">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
-                                       <parameter name="width" type="guint"/>
-                                       <parameter name="height" type="guint"/>
+                                       <parameter name="image" type="GtkImage*"/>
                                </parameters>
                        </method>
-                       <method name="set_vadjustment" symbol="gtk_layout_set_vadjustment">
-                               <return-type type="void"/>
+                       <method name="get_pixel_size" symbol="gtk_image_get_pixel_size">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="image" type="GtkImage*"/>
                                </parameters>
                        </method>
-                       <property name="height" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="width" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkLinkButton" parent="GtkButton" type-name="GtkLinkButton" get-type="gtk_link_button_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkActivatable"/>
-                       </implements>
-                       <method name="get_uri" symbol="gtk_link_button_get_uri">
-                               <return-type type="gchar*"/>
+                       <method name="get_stock" symbol="gtk_image_get_stock">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="link_button" type="GtkLinkButton*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="stock_id" type="gchar**"/>
+                                       <parameter name="size" type="GtkIconSize*"/>
                                </parameters>
                        </method>
-                       <method name="get_visited" symbol="gtk_link_button_get_visited">
-                               <return-type type="gboolean"/>
+                       <method name="get_storage_type" symbol="gtk_image_get_storage_type">
+                               <return-type type="GtkImageType"/>
                                <parameters>
-                                       <parameter name="link_button" type="GtkLinkButton*"/>
+                                       <parameter name="image" type="GtkImage*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_link_button_new">
+                       <constructor name="new" symbol="gtk_image_new">
                                <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="uri" type="gchar*"/>
-                               </parameters>
                        </constructor>
-                       <constructor name="new_with_label" symbol="gtk_link_button_new_with_label">
+                       <constructor name="new_from_animation" symbol="gtk_image_new_from_animation">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="uri" type="gchar*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="animation" type="GdkPixbufAnimation*"/>
                                </parameters>
                        </constructor>
-                       <method name="set_uri" symbol="gtk_link_button_set_uri">
-                               <return-type type="void"/>
+                       <constructor name="new_from_file" symbol="gtk_image_new_from_file">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="link_button" type="GtkLinkButton*"/>
-                                       <parameter name="uri" type="gchar*"/>
+                                       <parameter name="filename" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_visited" symbol="gtk_link_button_set_visited">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_from_gicon" symbol="gtk_image_new_from_gicon">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="link_button" type="GtkLinkButton*"/>
-                                       <parameter name="visited" type="gboolean"/>
+                                       <parameter name="icon" type="GIcon*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
-                       </method>
-                       <property name="uri" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="visited" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="activate-link" when="LAST">
-                               <return-type type="gboolean"/>
+                       </constructor>
+                       <constructor name="new_from_icon_name" symbol="gtk_image_new_from_icon_name">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="button" type="GtkLinkButton*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkListStore" parent="GObject" type-name="GtkListStore" get-type="gtk_list_store_get_type">
-                       <implements>
-                               <interface name="GtkTreeModel"/>
-                               <interface name="GtkTreeDragSource"/>
-                               <interface name="GtkTreeDragDest"/>
-                               <interface name="GtkTreeSortable"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="append" symbol="gtk_list_store_append">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_from_icon_set" symbol="gtk_image_new_from_icon_set">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
-                       </method>
-                       <method name="clear" symbol="gtk_list_store_clear">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_from_pixbuf" symbol="gtk_image_new_from_pixbuf">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
-                       </method>
-                       <method name="insert" symbol="gtk_list_store_insert">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_from_stock" symbol="gtk_image_new_from_stock">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
-                       </method>
-                       <method name="insert_after" symbol="gtk_list_store_insert_after">
+                       </constructor>
+                       <method name="set_from_animation" symbol="gtk_image_set_from_animation">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="sibling" type="GtkTreeIter*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="animation" type="GdkPixbufAnimation*"/>
                                </parameters>
                        </method>
-                       <method name="insert_before" symbol="gtk_list_store_insert_before">
+                       <method name="set_from_file" symbol="gtk_image_set_from_file">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="sibling" type="GtkTreeIter*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="filename" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="insert_with_values" symbol="gtk_list_store_insert_with_values">
+                       <method name="set_from_gicon" symbol="gtk_image_set_from_gicon">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="icon" type="GIcon*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
                        </method>
-                       <method name="insert_with_valuesv" symbol="gtk_list_store_insert_with_valuesv">
+                       <method name="set_from_icon_name" symbol="gtk_image_set_from_icon_name">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="position" type="gint"/>
-                                       <parameter name="columns" type="gint*"/>
-                                       <parameter name="values" type="GValue*"/>
-                                       <parameter name="n_values" type="gint"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
                        </method>
-                       <method name="iter_is_valid" symbol="gtk_list_store_iter_is_valid">
-                               <return-type type="gboolean"/>
+                       <method name="set_from_icon_set" symbol="gtk_image_set_from_icon_set">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
                        </method>
-                       <method name="move_after" symbol="gtk_list_store_move_after">
+                       <method name="set_from_pixbuf" symbol="gtk_image_set_from_pixbuf">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="position" type="GtkTreeIter*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
                        </method>
-                       <method name="move_before" symbol="gtk_list_store_move_before">
+                       <method name="set_from_stock" symbol="gtk_image_set_from_stock">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="position" type="GtkTreeIter*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_list_store_new">
-                               <return-type type="GtkListStore*"/>
+                       <method name="set_pixel_size" symbol="gtk_image_set_pixel_size">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="n_columns" type="gint"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="pixel_size" type="gint"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="newv" symbol="gtk_list_store_newv">
-                               <return-type type="GtkListStore*"/>
+                       </method>
+                       <property name="file" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="icon-set" type="GtkIconSet*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="icon-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pixbuf" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pixbuf-animation" type="GdkPixbufAnimation*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pixel-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="stock" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="storage-type" type="GtkImageType" readable="1" writable="0" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkImageMenuItem" parent="GtkMenuItem" type-name="GtkImageMenuItem" get-type="gtk_image_menu_item_get_type">
+                       <implements>
+                               <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"/>
                                <parameters>
-                                       <parameter name="n_columns" type="gint"/>
-                                       <parameter name="types" type="GType*"/>
+                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
                                </parameters>
-                       </constructor>
-                       <method name="prepend" symbol="gtk_list_store_prepend">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_image" symbol="gtk_image_menu_item_get_image">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="remove" symbol="gtk_list_store_remove">
+                       <method name="get_use_stock" symbol="gtk_image_menu_item_get_use_stock">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="reorder" symbol="gtk_list_store_reorder">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_image_menu_item_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_from_stock" symbol="gtk_image_menu_item_new_from_stock">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="store" type="GtkListStore*"/>
-                                       <parameter name="new_order" type="gint*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
                                </parameters>
-                       </method>
-                       <method name="set" symbol="gtk_list_store_set">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_with_label" symbol="gtk_image_menu_item_new_with_label">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_column_types" symbol="gtk_list_store_set_column_types">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_with_mnemonic" symbol="gtk_image_menu_item_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="n_columns" type="gint"/>
-                                       <parameter name="types" type="GType*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_valist" symbol="gtk_list_store_set_valist">
+                       </constructor>
+                       <method name="set_accel_group" symbol="gtk_image_menu_item_set_accel_group">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="var_args" type="va_list"/>
+                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
                                </parameters>
                        </method>
-                       <method name="set_value" symbol="gtk_list_store_set_value">
+                       <method name="set_always_show_image" symbol="gtk_image_menu_item_set_always_show_image">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="value" type="GValue*"/>
+                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
+                                       <parameter name="always_show" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_valuesv" symbol="gtk_list_store_set_valuesv">
+                       <method name="set_image" symbol="gtk_image_menu_item_set_image">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="columns" type="gint*"/>
-                                       <parameter name="values" type="GValue*"/>
-                                       <parameter name="n_values" type="gint"/>
+                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
+                                       <parameter name="image" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="swap" symbol="gtk_list_store_swap">
+                       <method name="set_use_stock" symbol="gtk_image_menu_item_set_use_stock">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="store" type="GtkListStore*"/>
-                                       <parameter name="a" type="GtkTreeIter*"/>
-                                       <parameter name="b" type="GtkTreeIter*"/>
+                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
+                                       <parameter name="use_stock" type="gboolean"/>
                                </parameters>
                        </method>
+                       <property name="accel-group" type="GtkAccelGroup*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <property name="always-show-image" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="image" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="use-stock" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
                </object>
-               <object name="GtkMenu" parent="GtkMenuShell" type-name="GtkMenu" get-type="gtk_menu_get_type">
+               <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="attach" symbol="gtk_menu_attach">
+                       <method name="add_action_widget" symbol="gtk_info_bar_add_action_widget">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
                                        <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="left_attach" type="guint"/>
-                                       <parameter name="right_attach" type="guint"/>
-                                       <parameter name="top_attach" type="guint"/>
-                                       <parameter name="bottom_attach" type="guint"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="attach_to_widget" symbol="gtk_menu_attach_to_widget">
-                               <return-type type="void"/>
+                       <method name="add_button" symbol="gtk_info_bar_add_button">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="attach_widget" type="GtkWidget*"/>
-                                       <parameter name="detacher" type="GtkMenuDetachFunc"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
+                                       <parameter name="button_text" type="gchar*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="detach" symbol="gtk_menu_detach">
+                       <method name="add_buttons" symbol="gtk_info_bar_add_buttons">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_accel_group" symbol="gtk_menu_get_accel_group">
-                               <return-type type="GtkAccelGroup*"/>
-                               <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_accel_path" symbol="gtk_menu_get_accel_path">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
+                                       <parameter name="first_button_text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_active" symbol="gtk_menu_get_active">
+                       <method name="get_action_area" symbol="gtk_info_bar_get_action_area">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
                                </parameters>
                        </method>
-                       <method name="get_attach_widget" symbol="gtk_menu_get_attach_widget">
+                       <method name="get_content_area" symbol="gtk_info_bar_get_content_area">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_for_attach_widget" symbol="gtk_menu_get_for_attach_widget">
-                               <return-type type="GList*"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_monitor" symbol="gtk_menu_get_monitor">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <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>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
                                </parameters>
                        </method>
-                       <method name="get_title" symbol="gtk_menu_get_title">
-                               <return-type type="gchar*"/>
+                       <method name="get_message_type" symbol="gtk_info_bar_get_message_type">
+                               <return-type type="GtkMessageType"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_menu_new">
+                       <constructor name="new" symbol="gtk_info_bar_new">
                                <return-type type="GtkWidget*"/>
                        </constructor>
-                       <method name="popdown" symbol="gtk_menu_popdown">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                               </parameters>
-                       </method>
-                       <method name="popup" symbol="gtk_menu_popup">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="parent_menu_shell" type="GtkWidget*"/>
-                                       <parameter name="parent_menu_item" type="GtkWidget*"/>
-                                       <parameter name="func" type="GtkMenuPositionFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="button" type="guint"/>
-                                       <parameter name="activate_time" type="guint32"/>
-                               </parameters>
-                       </method>
-                       <method name="popup_for_device" symbol="gtk_menu_popup_for_device">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="device" type="GdkDevice*"/>
-                                       <parameter name="parent_menu_shell" type="GtkWidget*"/>
-                                       <parameter name="parent_menu_item" type="GtkWidget*"/>
-                                       <parameter name="func" type="GtkMenuPositionFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GDestroyNotify"/>
-                                       <parameter name="button" type="guint"/>
-                                       <parameter name="activate_time" type="guint32"/>
-                               </parameters>
-                       </method>
-                       <method name="reorder_child" symbol="gtk_menu_reorder_child">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="reposition" symbol="gtk_menu_reposition">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_accel_group" symbol="gtk_menu_set_accel_group">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_accel_path" symbol="gtk_menu_set_accel_path">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="accel_path" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_active" symbol="gtk_menu_set_active">
-                               <return-type type="void"/>
+                       <constructor name="new_with_buttons" symbol="gtk_info_bar_new_with_buttons">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="index_" type="guint"/>
+                                       <parameter name="first_button_text" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_monitor" symbol="gtk_menu_set_monitor">
+                       </constructor>
+                       <method name="response" symbol="gtk_info_bar_response">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="monitor_num" type="gint"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_reserve_toggle_size" symbol="gtk_menu_set_reserve_toggle_size">
+                       <method name="set_default_response" symbol="gtk_info_bar_set_default_response">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="reserve_toggle_size" type="gboolean"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_screen" symbol="gtk_menu_set_screen">
+                       <method name="set_message_type" symbol="gtk_info_bar_set_message_type">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
+                                       <parameter name="message_type" type="GtkMessageType"/>
                                </parameters>
                        </method>
-                       <method name="set_tearoff_state" symbol="gtk_menu_set_tearoff_state">
+                       <method name="set_response_sensitive" symbol="gtk_info_bar_set_response_sensitive">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="torn_off" type="gboolean"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
+                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_title" symbol="gtk_menu_set_title">
+                       <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="menu" type="GtkMenu*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
                                </parameters>
-                       </method>
-                       <property name="accel-group" type="GtkAccelGroup*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="accel-path" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <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">
+                       </signal>
+                       <signal name="response" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkMenu*"/>
-                                       <parameter name="p0" type="GtkScrollType"/>
+                                       <parameter name="info_bar" type="GtkInfoBar*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </signal>
                </object>
-               <object name="GtkMenuBar" parent="GtkMenuShell" type-name="GtkMenuBar" get-type="gtk_menu_bar_get_type">
+               <object name="GtkInvisible" parent="GtkWidget" type-name="GtkInvisible" get-type="gtk_invisible_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
                        </implements>
-                       <method name="get_child_pack_direction" symbol="gtk_menu_bar_get_child_pack_direction">
-                               <return-type type="GtkPackDirection"/>
-                               <parameters>
-                                       <parameter name="menubar" type="GtkMenuBar*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_pack_direction" symbol="gtk_menu_bar_get_pack_direction">
-                               <return-type type="GtkPackDirection"/>
+                       <method name="get_screen" symbol="gtk_invisible_get_screen">
+                               <return-type type="GdkScreen*"/>
                                <parameters>
-                                       <parameter name="menubar" type="GtkMenuBar*"/>
+                                       <parameter name="invisible" type="GtkInvisible*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_menu_bar_new">
+                       <constructor name="new" symbol="gtk_invisible_new">
                                <return-type type="GtkWidget*"/>
                        </constructor>
-                       <method name="set_child_pack_direction" symbol="gtk_menu_bar_set_child_pack_direction">
-                               <return-type type="void"/>
+                       <constructor name="new_for_screen" symbol="gtk_invisible_new_for_screen">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="menubar" type="GtkMenuBar*"/>
-                                       <parameter name="child_pack_dir" type="GtkPackDirection"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
                                </parameters>
-                       </method>
-                       <method name="set_pack_direction" symbol="gtk_menu_bar_set_pack_direction">
+                       </constructor>
+                       <method name="set_screen" symbol="gtk_invisible_set_screen">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menubar" type="GtkMenuBar*"/>
-                                       <parameter name="pack_dir" type="GtkPackDirection"/>
+                                       <parameter name="invisible" type="GtkInvisible*"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
                                </parameters>
                        </method>
-                       <property name="child-pack-direction" type="GtkPackDirection" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pack-direction" type="GtkPackDirection" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
-               <object name="GtkMenuItem" parent="GtkBin" type-name="GtkMenuItem" get-type="gtk_menu_item_get_type">
+               <object name="GtkLabel" parent="GtkMisc" type-name="GtkLabel" get-type="gtk_label_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkActivatable"/>
                        </implements>
-                       <method name="activate" symbol="gtk_menu_item_activate">
-                               <return-type type="void"/>
+                       <method name="get_angle" symbol="gtk_label_get_angle">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="deselect" symbol="gtk_menu_item_deselect">
-                               <return-type type="void"/>
+                       <method name="get_attributes" symbol="gtk_label_get_attributes">
+                               <return-type type="PangoAttrList*"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="get_accel_path" symbol="gtk_menu_item_get_accel_path">
+                       <method name="get_current_uri" symbol="gtk_label_get_current_uri">
                                <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="get_label" symbol="gtk_menu_item_get_label">
-                               <return-type type="gchar*"/>
+                       <method name="get_ellipsize" symbol="gtk_label_get_ellipsize">
+                               <return-type type="PangoEllipsizeMode"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="get_right_justified" symbol="gtk_menu_item_get_right_justified">
-                               <return-type type="gboolean"/>
+                       <method name="get_justify" symbol="gtk_label_get_justify">
+                               <return-type type="GtkJustification"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="get_submenu" symbol="gtk_menu_item_get_submenu">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_label" symbol="gtk_label_get_label">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="get_use_underline" symbol="gtk_menu_item_get_use_underline">
-                               <return-type type="gboolean"/>
+                       <method name="get_layout" symbol="gtk_label_get_layout">
+                               <return-type type="PangoLayout*"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_menu_item_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_label" symbol="gtk_menu_item_new_with_label">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_layout_offsets" symbol="gtk_label_get_layout_offsets">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="x" type="gint*"/>
+                                       <parameter name="y" type="gint*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_menu_item_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="get_line_wrap" symbol="gtk_label_get_line_wrap">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
-                       </constructor>
-                       <method name="select" symbol="gtk_menu_item_select">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_line_wrap_mode" symbol="gtk_label_get_line_wrap_mode">
+                               <return-type type="PangoWrapMode"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="set_accel_path" symbol="gtk_menu_item_set_accel_path">
-                               <return-type type="void"/>
+                       <method name="get_max_width_chars" symbol="gtk_label_get_max_width_chars">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="accel_path" type="gchar*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="set_label" symbol="gtk_menu_item_set_label">
-                               <return-type type="void"/>
+                       <method name="get_mnemonic_keyval" symbol="gtk_label_get_mnemonic_keyval">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="set_right_justified" symbol="gtk_menu_item_set_right_justified">
-                               <return-type type="void"/>
+                       <method name="get_mnemonic_widget" symbol="gtk_label_get_mnemonic_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="right_justified" type="gboolean"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="set_submenu" symbol="gtk_menu_item_set_submenu">
-                               <return-type type="void"/>
+                       <method name="get_selectable" symbol="gtk_label_get_selectable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="submenu" type="GtkWidget*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_underline" symbol="gtk_menu_item_set_use_underline">
-                               <return-type type="void"/>
+                       <method name="get_selection_bounds" symbol="gtk_label_get_selection_bounds">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="start" type="gint*"/>
+                                       <parameter name="end" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="toggle_size_allocate" symbol="gtk_menu_item_toggle_size_allocate">
-                               <return-type type="void"/>
+                       <method name="get_single_line_mode" symbol="gtk_label_get_single_line_mode">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="allocation" type="gint"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="toggle_size_request" symbol="gtk_menu_item_toggle_size_request">
-                               <return-type type="void"/>
+                       <method name="get_text" symbol="gtk_label_get_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="requisition" type="gint*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <property name="accel-path" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="right-justified" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="submenu" type="GtkMenu*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="use-underline" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="activate" when="FIRST">
-                               <return-type type="void"/>
+                       <method name="get_track_visited_links" symbol="gtk_label_get_track_visited_links">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
-                       </signal>
-                       <signal name="activate-item" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_use_markup" symbol="gtk_label_get_use_markup">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
-                       </signal>
-                       <signal name="deselect" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_use_underline" symbol="gtk_label_get_use_underline">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
-                       </signal>
-                       <signal name="select" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_width_chars" symbol="gtk_label_get_width_chars">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-size-allocate" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <constructor name="new" symbol="gtk_label_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="allocation" type="gint"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-size-request" when="FIRST">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_with_mnemonic" symbol="gtk_label_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="requisition" type="gpointer"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="get_label">
-                               <return-type type="gchar*"/>
+                       </constructor>
+                       <method name="select_region" symbol="gtk_label_select_region">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="start_offset" type="gint"/>
+                                       <parameter name="end_offset" type="gint"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_label">
+                       </method>
+                       <method name="set_angle" symbol="gtk_label_set_angle">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="angle" type="gdouble"/>
                                </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkMenuShell" parent="GtkContainer" type-name="GtkMenuShell" get-type="gtk_menu_shell_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="activate_item" symbol="gtk_menu_shell_activate_item">
+                       </method>
+                       <method name="set_attributes" symbol="gtk_label_set_attributes">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="menu_item" type="GtkWidget*"/>
-                                       <parameter name="force_deactivate" type="gboolean"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="attrs" type="PangoAttrList*"/>
                                </parameters>
                        </method>
-                       <method name="append" symbol="gtk_menu_shell_append">
+                       <method name="set_ellipsize" symbol="gtk_label_set_ellipsize">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="mode" type="PangoEllipsizeMode"/>
                                </parameters>
                        </method>
-                       <method name="cancel" symbol="gtk_menu_shell_cancel">
+                       <method name="set_justify" symbol="gtk_label_set_justify">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="jtype" type="GtkJustification"/>
                                </parameters>
                        </method>
-                       <method name="deactivate" symbol="gtk_menu_shell_deactivate">
+                       <method name="set_label" symbol="gtk_label_set_label">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="deselect" symbol="gtk_menu_shell_deselect">
+                       <method name="set_line_wrap" symbol="gtk_label_set_line_wrap">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="wrap" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_take_focus" symbol="gtk_menu_shell_get_take_focus">
-                               <return-type type="gboolean"/>
+                       <method name="set_line_wrap_mode" symbol="gtk_label_set_line_wrap_mode">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="wrap_mode" type="PangoWrapMode"/>
                                </parameters>
                        </method>
-                       <method name="insert" symbol="gtk_menu_shell_insert">
+                       <method name="set_markup" symbol="gtk_label_set_markup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="prepend" symbol="gtk_menu_shell_prepend">
+                       <method name="set_markup_with_mnemonic" symbol="gtk_label_set_markup_with_mnemonic">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="select_first" symbol="gtk_menu_shell_select_first">
+                       <method name="set_max_width_chars" symbol="gtk_label_set_max_width_chars">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="search_sensitive" type="gboolean"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="select_item" symbol="gtk_menu_shell_select_item">
+                       <method name="set_mnemonic_widget" symbol="gtk_label_set_mnemonic_widget">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="menu_item" type="GtkWidget*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_take_focus" symbol="gtk_menu_shell_set_take_focus">
+                       <method name="set_pattern" symbol="gtk_label_set_pattern">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="take_focus" type="gboolean"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="pattern" type="gchar*"/>
                                </parameters>
                        </method>
-                       <property name="take-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="activate-current" when="LAST">
+                       <method name="set_selectable" symbol="gtk_label_set_selectable">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="force_hide" type="gboolean"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
-                       </signal>
-                       <signal name="cancel" when="LAST">
+                       </method>
+                       <method name="set_single_line_mode" symbol="gtk_label_set_single_line_mode">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="single_line_mode" type="gboolean"/>
                                </parameters>
-                       </signal>
-                       <signal name="cycle-focus" when="LAST">
+                       </method>
+                       <method name="set_text" symbol="gtk_label_set_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkMenuShell*"/>
-                                       <parameter name="p0" type="GtkDirectionType"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="deactivate" when="FIRST">
+                       </method>
+                       <method name="set_text_with_mnemonic" symbol="gtk_label_set_text_with_mnemonic">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="move-current" when="LAST">
+                       </method>
+                       <method name="set_track_visited_links" symbol="gtk_label_set_track_visited_links">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="direction" type="GtkMenuDirectionType"/>
+                                       <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>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="setting" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_use_underline" symbol="gtk_label_set_use_underline">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="setting" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_width_chars" symbol="gtk_label_set_width_chars">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="n_chars" type="gint"/>
+                               </parameters>
+                       </method>
+                       <property name="angle" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="attributes" type="PangoAttrList*" 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="ellipsize" type="PangoEllipsizeMode" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="justify" type="GtkJustification" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="max-width-chars" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="mnemonic-keyval" type="guint" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="mnemonic-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pattern" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <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="move-selected" when="LAST">
+                       <signal name="activate-link" when="LAST">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="distance" type="gint"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="uri" type="char*"/>
                                </parameters>
                        </signal>
-                       <signal name="selection-done" when="FIRST">
+                       <signal name="copy-clipboard" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </signal>
-                       <vfunc name="get_popup_delay">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="insert">
+                       <signal name="move-cursor" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="step" type="GtkMovementStep"/>
+                                       <parameter name="count" type="gint"/>
+                                       <parameter name="extend_selection" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="select_item">
+                       </signal>
+                       <signal name="populate-popup" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="menu_item" type="GtkWidget*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
-                       </vfunc>
+                       </signal>
                </object>
-               <object name="GtkMenuToolButton" parent="GtkToolButton" type-name="GtkMenuToolButton" get-type="gtk_menu_tool_button_get_type">
+               <object name="GtkLayout" parent="GtkContainer" type-name="GtkLayout" get-type="gtk_layout_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkActivatable"/>
+                               <interface name="GtkScrollable"/>
                        </implements>
-                       <method name="get_menu" symbol="gtk_menu_tool_button_get_menu">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_bin_window" symbol="gtk_layout_get_bin_window">
+                               <return-type type="GdkWindow*"/>
                                <parameters>
-                                       <parameter name="button" type="GtkMenuToolButton*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_menu_tool_button_new">
-                               <return-type type="GtkToolItem*"/>
+                       <method name="get_hadjustment" symbol="gtk_layout_get_hadjustment">
+                               <return-type type="GtkAdjustment*"/>
                                <parameters>
-                                       <parameter name="icon_widget" type="GtkWidget*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_stock" symbol="gtk_menu_tool_button_new_from_stock">
-                               <return-type type="GtkToolItem*"/>
+                       </method>
+                       <method name="get_size" symbol="gtk_layout_get_size">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="width" type="guint*"/>
+                                       <parameter name="height" type="guint*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_arrow_tooltip_markup" symbol="gtk_menu_tool_button_set_arrow_tooltip_markup">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_vadjustment" symbol="gtk_layout_get_vadjustment">
+                               <return-type type="GtkAdjustment*"/>
                                <parameters>
-                                       <parameter name="button" type="GtkMenuToolButton*"/>
-                                       <parameter name="markup" type="gchar*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
                                </parameters>
                        </method>
-                       <method name="set_arrow_tooltip_text" symbol="gtk_menu_tool_button_set_arrow_tooltip_text">
+                       <method name="move" symbol="gtk_layout_move">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkMenuToolButton*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="child_widget" type="GtkWidget*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_menu" symbol="gtk_menu_tool_button_set_menu">
+                       <constructor name="new" symbol="gtk_layout_new">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="hadjustment" type="GtkAdjustment*"/>
+                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="put" symbol="gtk_layout_put">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkMenuToolButton*"/>
-                                       <parameter name="menu" type="GtkWidget*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="child_widget" type="GtkWidget*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
                        </method>
-                       <property name="menu" type="GtkMenu*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="show-menu" when="FIRST">
+                       <method name="set_hadjustment" symbol="gtk_layout_set_hadjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkMenuToolButton*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkMessageDialog" parent="GtkDialog" type-name="GtkMessageDialog" get-type="gtk_message_dialog_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="format_secondary_markup" symbol="gtk_message_dialog_format_secondary_markup">
+                       </method>
+                       <method name="set_size" symbol="gtk_layout_set_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
-                                       <parameter name="message_format" type="gchar*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="width" type="guint"/>
+                                       <parameter name="height" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="format_secondary_text" symbol="gtk_message_dialog_format_secondary_text">
+                       <method name="set_vadjustment" symbol="gtk_layout_set_vadjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
-                                       <parameter name="message_format" type="gchar*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <method name="get_image" symbol="gtk_message_dialog_get_image">
-                               <return-type type="GtkWidget*"/>
+                       <property name="height" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="width" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkLinkButton" parent="GtkButton" type-name="GtkLinkButton" get-type="gtk_link_button_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkActivatable"/>
+                       </implements>
+                       <method name="get_uri" symbol="gtk_link_button_get_uri">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkMessageDialog*"/>
+                                       <parameter name="link_button" type="GtkLinkButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_message_area" symbol="gtk_message_dialog_get_message_area">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_visited" symbol="gtk_link_button_get_visited">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
+                                       <parameter name="link_button" type="GtkLinkButton*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_message_dialog_new">
+                       <constructor name="new" symbol="gtk_link_button_new">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="parent" type="GtkWindow*"/>
-                                       <parameter name="flags" type="GtkDialogFlags"/>
-                                       <parameter name="type" type="GtkMessageType"/>
-                                       <parameter name="buttons" type="GtkButtonsType"/>
-                                       <parameter name="message_format" type="gchar*"/>
+                                       <parameter name="uri" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <constructor name="new_with_markup" symbol="gtk_message_dialog_new_with_markup">
+                       <constructor name="new_with_label" symbol="gtk_link_button_new_with_label">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="parent" type="GtkWindow*"/>
-                                       <parameter name="flags" type="GtkDialogFlags"/>
-                                       <parameter name="type" type="GtkMessageType"/>
-                                       <parameter name="buttons" type="GtkButtonsType"/>
-                                       <parameter name="message_format" type="gchar*"/>
+                                       <parameter name="uri" type="gchar*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <method name="set_image" symbol="gtk_message_dialog_set_image">
+                       <method name="set_uri" symbol="gtk_link_button_set_uri">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkMessageDialog*"/>
-                                       <parameter name="image" type="GtkWidget*"/>
+                                       <parameter name="link_button" type="GtkLinkButton*"/>
+                                       <parameter name="uri" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_markup" symbol="gtk_message_dialog_set_markup">
+                       <method name="set_visited" symbol="gtk_link_button_set_visited">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
-                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="link_button" type="GtkLinkButton*"/>
+                                       <parameter name="visited" type="gboolean"/>
                                </parameters>
                        </method>
-                       <property name="buttons" type="GtkButtonsType" readable="0" writable="1" construct="0" construct-only="1"/>
-                       <property name="image" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="message-area" type="GtkWidget*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="message-type" type="GtkMessageType" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="secondary-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="secondary-use-markup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="text" type="char*" 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="uri" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="visited" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="activate-link" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="button" type="GtkLinkButton*"/>
+                               </parameters>
+                       </signal>
                </object>
-               <object name="GtkMisc" parent="GtkWidget" type-name="GtkMisc" get-type="gtk_misc_get_type">
+               <object name="GtkListStore" parent="GObject" type-name="GtkListStore" get-type="gtk_list_store_get_type">
                        <implements>
-                               <interface name="AtkImplementor"/>
+                               <interface name="GtkTreeModel"/>
+                               <interface name="GtkTreeDragSource"/>
+                               <interface name="GtkTreeDragDest"/>
+                               <interface name="GtkTreeSortable"/>
                                <interface name="GtkBuildable"/>
                        </implements>
-                       <method name="get_alignment" symbol="gtk_misc_get_alignment">
+                       <method name="append" symbol="gtk_list_store_append">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="misc" type="GtkMisc*"/>
-                                       <parameter name="xalign" type="gfloat*"/>
-                                       <parameter name="yalign" type="gfloat*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_padding" symbol="gtk_misc_get_padding">
+                       <method name="clear" symbol="gtk_list_store_clear">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="misc" type="GtkMisc*"/>
-                                       <parameter name="xpad" type="gint*"/>
-                                       <parameter name="ypad" type="gint*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
                                </parameters>
                        </method>
-                       <method name="set_alignment" symbol="gtk_misc_set_alignment">
+                       <method name="insert" symbol="gtk_list_store_insert">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="misc" type="GtkMisc*"/>
-                                       <parameter name="xalign" type="gfloat"/>
-                                       <parameter name="yalign" type="gfloat"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_padding" symbol="gtk_misc_set_padding">
+                       <method name="insert_after" symbol="gtk_list_store_insert_after">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="misc" type="GtkMisc*"/>
-                                       <parameter name="xpad" type="gint"/>
-                                       <parameter name="ypad" type="gint"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="sibling" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <property name="xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="xpad" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="ypad" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkMountOperation" parent="GMountOperation" type-name="GtkMountOperation" get-type="gtk_mount_operation_get_type">
-                       <method name="get_parent" symbol="gtk_mount_operation_get_parent">
-                               <return-type type="GtkWindow*"/>
+                       <method name="insert_before" symbol="gtk_list_store_insert_before">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="op" type="GtkMountOperation*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="sibling" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_screen" symbol="gtk_mount_operation_get_screen">
-                               <return-type type="GdkScreen*"/>
+                       <method name="insert_with_values" symbol="gtk_list_store_insert_with_values">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="op" type="GtkMountOperation*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="is_showing" symbol="gtk_mount_operation_is_showing">
-                               <return-type type="gboolean"/>
+                       <method name="insert_with_valuesv" symbol="gtk_list_store_insert_with_valuesv">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="op" type="GtkMountOperation*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="position" type="gint"/>
+                                       <parameter name="columns" type="gint*"/>
+                                       <parameter name="values" type="GValue*"/>
+                                       <parameter name="n_values" type="gint"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_mount_operation_new">
-                               <return-type type="GMountOperation*"/>
+                       <method name="iter_is_valid" symbol="gtk_list_store_iter_is_valid">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_parent" symbol="gtk_mount_operation_set_parent">
+                       </method>
+                       <method name="move_after" symbol="gtk_list_store_move_after">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="op" type="GtkMountOperation*"/>
-                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="position" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_screen" symbol="gtk_mount_operation_set_screen">
+                       <method name="move_before" symbol="gtk_list_store_move_before">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="op" type="GtkMountOperation*"/>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="position" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <property name="is-showing" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="parent" type="GtkWindow*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkNotebook" parent="GtkContainer" type-name="GtkNotebook" get-type="gtk_notebook_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="append_page" symbol="gtk_notebook_append_page">
-                               <return-type type="gint"/>
+                       <constructor name="new" symbol="gtk_list_store_new">
+                               <return-type type="GtkListStore*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="n_columns" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="append_page_menu" symbol="gtk_notebook_append_page_menu">
-                               <return-type type="gint"/>
+                       </constructor>
+                       <constructor name="newv" symbol="gtk_list_store_newv">
+                               <return-type type="GtkListStore*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_label" type="GtkWidget*"/>
-                                       <parameter name="menu_label" type="GtkWidget*"/>
+                                       <parameter name="n_columns" type="gint"/>
+                                       <parameter name="types" type="GType*"/>
                                </parameters>
-                       </method>
-                       <method name="get_action_widget" symbol="gtk_notebook_get_action_widget">
-                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="prepend" symbol="gtk_list_store_prepend">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="pack_type" type="GtkPackType"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_current_page" symbol="gtk_notebook_get_current_page">
-                               <return-type type="gint"/>
+                       <method name="remove" symbol="gtk_list_store_remove">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_group_name" symbol="gtk_notebook_get_group_name">
-                               <return-type type="gchar*"/>
+                       <method name="reorder" symbol="gtk_list_store_reorder">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="store" type="GtkListStore*"/>
+                                       <parameter name="new_order" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="get_menu_label" symbol="gtk_notebook_get_menu_label">
-                               <return-type type="GtkWidget*"/>
+                       <method name="set" symbol="gtk_list_store_set">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_menu_label_text" symbol="gtk_notebook_get_menu_label_text">
-                               <return-type type="gchar*"/>
+                       <method name="set_column_types" symbol="gtk_list_store_set_column_types">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="n_columns" type="gint"/>
+                                       <parameter name="types" type="GType*"/>
                                </parameters>
                        </method>
-                       <method name="get_n_pages" symbol="gtk_notebook_get_n_pages">
-                               <return-type type="gint"/>
+                       <method name="set_valist" symbol="gtk_list_store_set_valist">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="var_args" type="va_list"/>
                                </parameters>
                        </method>
-                       <method name="get_nth_page" symbol="gtk_notebook_get_nth_page">
-                               <return-type type="GtkWidget*"/>
+                       <method name="set_value" symbol="gtk_list_store_set_value">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="page_num" type="gint"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="column" type="gint"/>
+                                       <parameter name="value" type="GValue*"/>
                                </parameters>
                        </method>
-                       <method name="get_scrollable" symbol="gtk_notebook_get_scrollable">
-                               <return-type type="gboolean"/>
+                       <method name="set_valuesv" symbol="gtk_list_store_set_valuesv">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="columns" type="gint*"/>
+                                       <parameter name="values" type="GValue*"/>
+                                       <parameter name="n_values" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_show_border" symbol="gtk_notebook_get_show_border">
-                               <return-type type="gboolean"/>
+                       <method name="swap" symbol="gtk_list_store_swap">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="store" type="GtkListStore*"/>
+                                       <parameter name="a" type="GtkTreeIter*"/>
+                                       <parameter name="b" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_show_tabs" symbol="gtk_notebook_get_show_tabs">
-                               <return-type type="gboolean"/>
+               </object>
+               <object name="GtkMenu" parent="GtkMenuShell" type-name="GtkMenu" get-type="gtk_menu_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="attach" symbol="gtk_menu_attach">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="left_attach" type="guint"/>
+                                       <parameter name="right_attach" type="guint"/>
+                                       <parameter name="top_attach" type="guint"/>
+                                       <parameter name="bottom_attach" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_detachable" symbol="gtk_notebook_get_tab_detachable">
-                               <return-type type="gboolean"/>
+                       <method name="attach_to_widget" symbol="gtk_menu_attach_to_widget">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="attach_widget" type="GtkWidget*"/>
+                                       <parameter name="detacher" type="GtkMenuDetachFunc"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_hborder" symbol="gtk_notebook_get_tab_hborder">
-                               <return-type type="guint16"/>
+                       <method name="detach" symbol="gtk_menu_detach">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_label" symbol="gtk_notebook_get_tab_label">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_accel_group" symbol="gtk_menu_get_accel_group">
+                               <return-type type="GtkAccelGroup*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_label_text" symbol="gtk_notebook_get_tab_label_text">
+                       <method name="get_accel_path" symbol="gtk_menu_get_accel_path">
                                <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_pos" symbol="gtk_notebook_get_tab_pos">
-                               <return-type type="GtkPositionType"/>
+                       <method name="get_active" symbol="gtk_menu_get_active">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_reorderable" symbol="gtk_notebook_get_tab_reorderable">
-                               <return-type type="gboolean"/>
+                       <method name="get_attach_widget" symbol="gtk_menu_get_attach_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_vborder" symbol="gtk_notebook_get_tab_vborder">
-                               <return-type type="guint16"/>
+                       <method name="get_for_attach_widget" symbol="gtk_menu_get_for_attach_widget">
+                               <return-type type="GList*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="insert_page" symbol="gtk_notebook_insert_page">
+                       <method name="get_monitor" symbol="gtk_menu_get_monitor">
                                <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_label" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </method>
-                       <method name="insert_page_menu" symbol="gtk_notebook_insert_page_menu">
-                               <return-type type="gint"/>
+                       <method name="get_reserve_toggle_size" symbol="gtk_menu_get_reserve_toggle_size">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_label" type="GtkWidget*"/>
-                                       <parameter name="menu_label" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_notebook_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="next_page" symbol="gtk_notebook_next_page">
-                               <return-type type="void"/>
+                       <method name="get_tearoff_state" symbol="gtk_menu_get_tearoff_state">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </method>
-                       <method name="page_num" symbol="gtk_notebook_page_num">
-                               <return-type type="gint"/>
+                       <method name="get_title" symbol="gtk_menu_get_title">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </method>
-                       <method name="popup_disable" symbol="gtk_notebook_popup_disable">
+                       <constructor name="new" symbol="gtk_menu_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="popdown" symbol="gtk_menu_popdown">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </method>
-                       <method name="popup_enable" symbol="gtk_notebook_popup_enable">
+                       <method name="popup" symbol="gtk_menu_popup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="parent_menu_shell" type="GtkWidget*"/>
+                                       <parameter name="parent_menu_item" type="GtkWidget*"/>
+                                       <parameter name="func" type="GtkMenuPositionFunc"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="button" type="guint"/>
+                                       <parameter name="activate_time" type="guint32"/>
                                </parameters>
                        </method>
-                       <method name="prepend_page" symbol="gtk_notebook_prepend_page">
-                               <return-type type="gint"/>
+                       <method name="popup_for_device" symbol="gtk_menu_popup_for_device">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="device" type="GdkDevice*"/>
+                                       <parameter name="parent_menu_shell" type="GtkWidget*"/>
+                                       <parameter name="parent_menu_item" type="GtkWidget*"/>
+                                       <parameter name="func" type="GtkMenuPositionFunc"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
+                                       <parameter name="button" type="guint"/>
+                                       <parameter name="activate_time" type="guint32"/>
                                </parameters>
                        </method>
-                       <method name="prepend_page_menu" symbol="gtk_notebook_prepend_page_menu">
-                               <return-type type="gint"/>
+                       <method name="reorder_child" symbol="gtk_menu_reorder_child">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                        <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_label" type="GtkWidget*"/>
-                                       <parameter name="menu_label" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="prev_page" symbol="gtk_notebook_prev_page">
+                       <method name="reposition" symbol="gtk_menu_reposition">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </method>
-                       <method name="remove_page" symbol="gtk_notebook_remove_page">
+                       <method name="set_accel_group" symbol="gtk_menu_set_accel_group">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="page_num" type="gint"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
                                </parameters>
                        </method>
-                       <method name="reorder_child" symbol="gtk_notebook_reorder_child">
+                       <method name="set_accel_path" symbol="gtk_menu_set_accel_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="accel_path" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_action_widget" symbol="gtk_notebook_set_action_widget">
+                       <method name="set_active" symbol="gtk_menu_set_active">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="pack_type" type="GtkPackType"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="index_" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="set_current_page" symbol="gtk_notebook_set_current_page">
+                       <method name="set_monitor" symbol="gtk_menu_set_monitor">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="page_num" type="gint"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="monitor_num" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_group_name" symbol="gtk_notebook_set_group_name">
+                       <method name="set_reserve_toggle_size" symbol="gtk_menu_set_reserve_toggle_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="group_name" type="gchar*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="reserve_toggle_size" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_menu_label" symbol="gtk_notebook_set_menu_label">
+                       <method name="set_screen" symbol="gtk_menu_set_screen">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="menu_label" type="GtkWidget*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
                                </parameters>
                        </method>
-                       <method name="set_menu_label_text" symbol="gtk_notebook_set_menu_label_text">
+                       <method name="set_tearoff_state" symbol="gtk_menu_set_tearoff_state">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="menu_text" type="gchar*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="torn_off" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_scrollable" symbol="gtk_notebook_set_scrollable">
+                       <method name="set_title" symbol="gtk_menu_set_title">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="scrollable" type="gboolean"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_show_border" symbol="gtk_notebook_set_show_border">
+                       <property name="accel-group" type="GtkAccelGroup*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="accel-path" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <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">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="show_border" type="gboolean"/>
+                                       <parameter name="object" type="GtkMenu*"/>
+                                       <parameter name="p0" type="GtkScrollType"/>
                                </parameters>
-                       </method>
-                       <method name="set_show_tabs" symbol="gtk_notebook_set_show_tabs">
-                               <return-type type="void"/>
+                       </signal>
+               </object>
+               <object name="GtkMenuBar" parent="GtkMenuShell" type-name="GtkMenuBar" get-type="gtk_menu_bar_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_child_pack_direction" symbol="gtk_menu_bar_get_child_pack_direction">
+                               <return-type type="GtkPackDirection"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="show_tabs" type="gboolean"/>
+                                       <parameter name="menubar" type="GtkMenuBar*"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_detachable" symbol="gtk_notebook_set_tab_detachable">
-                               <return-type type="void"/>
+                       <method name="get_pack_direction" symbol="gtk_menu_bar_get_pack_direction">
+                               <return-type type="GtkPackDirection"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="detachable" type="gboolean"/>
+                                       <parameter name="menubar" type="GtkMenuBar*"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_label" symbol="gtk_notebook_set_tab_label">
+                       <constructor name="new" symbol="gtk_menu_bar_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="set_child_pack_direction" symbol="gtk_menu_bar_set_child_pack_direction">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="menubar" type="GtkMenuBar*"/>
+                                       <parameter name="child_pack_dir" type="GtkPackDirection"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_label_text" symbol="gtk_notebook_set_tab_label_text">
+                       <method name="set_pack_direction" symbol="gtk_menu_bar_set_pack_direction">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_text" type="gchar*"/>
+                                       <parameter name="menubar" type="GtkMenuBar*"/>
+                                       <parameter name="pack_dir" type="GtkPackDirection"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_pos" symbol="gtk_notebook_set_tab_pos">
+                       <property name="child-pack-direction" type="GtkPackDirection" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pack-direction" type="GtkPackDirection" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkMenuItem" parent="GtkBin" type-name="GtkMenuItem" get-type="gtk_menu_item_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkActivatable"/>
+                       </implements>
+                       <method name="activate" symbol="gtk_menu_item_activate">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="pos" type="GtkPositionType"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_reorderable" symbol="gtk_notebook_set_tab_reorderable">
+                       <method name="deselect" symbol="gtk_menu_item_deselect">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="reorderable" type="gboolean"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
                        </method>
-                       <property name="enable-popup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="group-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="page" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="scrollable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-border" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-tabs" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="tab-pos" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="change-current-page" when="LAST">
-                               <return-type type="gboolean"/>
+                       <method name="get_accel_path" symbol="gtk_menu_item_get_accel_path">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="offset" type="gint"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </signal>
-                       <signal name="create-window" when="LAST">
-                               <return-type type="GtkNotebook*"/>
+                       </method>
+                       <method name="get_label" symbol="gtk_menu_item_get_label">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </signal>
-                       <signal name="focus-tab" when="LAST">
+                       </method>
+                       <method name="get_reserve_indicator" symbol="gtk_menu_item_get_reserve_indicator">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="type" type="GtkNotebookTab"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </signal>
-                       <signal name="move-focus-out" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_right_justified" symbol="gtk_menu_item_get_right_justified">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="direction" type="GtkDirectionType"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </signal>
-                       <signal name="page-added" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_submenu" symbol="gtk_menu_item_get_submenu">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="page_num" type="guint"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </signal>
-                       <signal name="page-removed" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_use_underline" symbol="gtk_menu_item_get_use_underline">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="page_num" type="guint"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </signal>
-                       <signal name="page-reordered" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="page_num" type="guint"/>
-                               </parameters>
-                       </signal>
-                       <signal name="reorder-tab" when="LAST">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <constructor name="new" symbol="gtk_menu_item_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_label" symbol="gtk_menu_item_new_with_label">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="direction" type="GtkDirectionType"/>
-                                       <parameter name="move_to_last" type="gboolean"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="select-page" when="LAST">
-                               <return-type type="gboolean"/>
+                       </constructor>
+                       <constructor name="new_with_mnemonic" symbol="gtk_menu_item_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="move_focus" type="gboolean"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="switch-page" when="LAST">
+                       </constructor>
+                       <method name="select" symbol="gtk_menu_item_select">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
-                                       <parameter name="page_num" type="guint"/>
-                               </parameters>
-                       </signal>
-                       <vfunc name="insert_page">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_label" type="GtkWidget*"/>
-                                       <parameter name="menu_label" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
-                               </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkOffscreenWindow" parent="GtkWindow" type-name="GtkOffscreenWindow" get-type="gtk_offscreen_window_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_pixbuf" symbol="gtk_offscreen_window_get_pixbuf">
-                               <return-type type="GdkPixbuf*"/>
-                               <parameters>
-                                       <parameter name="offscreen" type="GtkOffscreenWindow*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="get_surface" symbol="gtk_offscreen_window_get_surface">
-                               <return-type type="cairo_surface_t*"/>
+                       <method name="set_accel_path" symbol="gtk_menu_item_set_accel_path">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="offscreen" type="GtkOffscreenWindow*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="accel_path" type="gchar*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_offscreen_window_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-               </object>
-               <object name="GtkPageSetup" parent="GObject" type-name="GtkPageSetup" get-type="gtk_page_setup_get_type">
-                       <method name="copy" symbol="gtk_page_setup_copy">
-                               <return-type type="GtkPageSetup*"/>
+                       <method name="set_label" symbol="gtk_menu_item_set_label">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="other" type="GtkPageSetup*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_bottom_margin" symbol="gtk_page_setup_get_bottom_margin">
-                               <return-type type="gdouble"/>
+                       <method name="set_reserve_indicator" symbol="gtk_menu_item_set_reserve_indicator">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="reserve" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_left_margin" symbol="gtk_page_setup_get_left_margin">
-                               <return-type type="gdouble"/>
+                       <method name="set_right_justified" symbol="gtk_menu_item_set_right_justified">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="right_justified" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_orientation" symbol="gtk_page_setup_get_orientation">
-                               <return-type type="GtkPageOrientation"/>
+                       <method name="set_submenu" symbol="gtk_menu_item_set_submenu">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="submenu" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_page_height" symbol="gtk_page_setup_get_page_height">
-                               <return-type type="gdouble"/>
+                       <method name="set_use_underline" symbol="gtk_menu_item_set_use_underline">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_page_width" symbol="gtk_page_setup_get_page_width">
-                               <return-type type="gdouble"/>
+                       <method name="toggle_size_allocate" symbol="gtk_menu_item_toggle_size_allocate">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="allocation" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_paper_height" symbol="gtk_page_setup_get_paper_height">
-                               <return-type type="gdouble"/>
+                       <method name="toggle_size_request" symbol="gtk_menu_item_toggle_size_request">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="requisition" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="get_paper_size" symbol="gtk_page_setup_get_paper_size">
-                               <return-type type="GtkPaperSize*"/>
+                       <property name="accel-path" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="right-justified" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="submenu" type="GtkMenu*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="use-underline" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="activate" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </method>
-                       <method name="get_paper_width" symbol="gtk_page_setup_get_paper_width">
-                               <return-type type="gdouble"/>
+                       </signal>
+                       <signal name="activate-item" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </method>
-                       <method name="get_right_margin" symbol="gtk_page_setup_get_right_margin">
-                               <return-type type="gdouble"/>
+                       </signal>
+                       <signal name="deselect" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </method>
-                       <method name="get_top_margin" symbol="gtk_page_setup_get_top_margin">
-                               <return-type type="gdouble"/>
+                       </signal>
+                       <signal name="select" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </method>
-                       <method name="load_file" symbol="gtk_page_setup_load_file">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="toggle-size-allocate" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="file_name" type="char*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="allocation" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="load_key_file" symbol="gtk_page_setup_load_key_file">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="toggle-size-request" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="key_file" type="GKeyFile*"/>
-                                       <parameter name="group_name" type="gchar*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="requisition" type="gpointer"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_page_setup_new">
-                               <return-type type="GtkPageSetup*"/>
-                       </constructor>
-                       <constructor name="new_from_file" symbol="gtk_page_setup_new_from_file">
-                               <return-type type="GtkPageSetup*"/>
+                       </signal>
+                       <vfunc name="get_label">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="file_name" type="gchar*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_key_file" symbol="gtk_page_setup_new_from_key_file">
-                               <return-type type="GtkPageSetup*"/>
+                       </vfunc>
+                       <vfunc name="set_label">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="key_file" type="GKeyFile*"/>
-                                       <parameter name="group_name" type="gchar*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_bottom_margin" symbol="gtk_page_setup_set_bottom_margin">
+                       </vfunc>
+               </object>
+               <object name="GtkMenuShell" parent="GtkContainer" type-name="GtkMenuShell" get-type="gtk_menu_shell_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="activate_item" symbol="gtk_menu_shell_activate_item">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="margin" type="gdouble"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="menu_item" type="GtkWidget*"/>
+                                       <parameter name="force_deactivate" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_left_margin" symbol="gtk_page_setup_set_left_margin">
+                       <method name="append" symbol="gtk_menu_shell_append">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="margin" type="gdouble"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_orientation" symbol="gtk_page_setup_set_orientation">
+                       <method name="cancel" symbol="gtk_menu_shell_cancel">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="orientation" type="GtkPageOrientation"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
                        </method>
-                       <method name="set_paper_size" symbol="gtk_page_setup_set_paper_size">
+                       <method name="deactivate" symbol="gtk_menu_shell_deactivate">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="size" type="GtkPaperSize*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
                        </method>
-                       <method name="set_paper_size_and_default_margins" symbol="gtk_page_setup_set_paper_size_and_default_margins">
+                       <method name="deselect" symbol="gtk_menu_shell_deselect">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="size" type="GtkPaperSize*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
                        </method>
-                       <method name="set_right_margin" symbol="gtk_page_setup_set_right_margin">
-                               <return-type type="void"/>
+                       <method name="get_parent_shell" symbol="gtk_menu_shell_get_parent_shell">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="margin" type="gdouble"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
                        </method>
-                       <method name="set_top_margin" symbol="gtk_page_setup_set_top_margin">
-                               <return-type type="void"/>
+                       <method name="get_selected_item" symbol="gtk_menu_shell_get_selected_item">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="margin" type="gdouble"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
                        </method>
-                       <method name="to_file" symbol="gtk_page_setup_to_file">
+                       <method name="get_take_focus" symbol="gtk_menu_shell_get_take_focus">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="file_name" type="char*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </method>
-                       <method name="to_key_file" symbol="gtk_page_setup_to_key_file">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="key_file" type="GKeyFile*"/>
-                                       <parameter name="group_name" type="gchar*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
                        </method>
-               </object>
-               <object name="GtkPaned" parent="GtkContainer" type-name="GtkPaned" get-type="gtk_paned_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <method name="add1" symbol="gtk_paned_add1">
+                       <method name="insert" symbol="gtk_menu_shell_insert">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                        <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="add2" symbol="gtk_paned_add2">
+                       <method name="prepend" symbol="gtk_menu_shell_prepend">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                        <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_child1" symbol="gtk_paned_get_child1">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_child2" symbol="gtk_paned_get_child2">
-                               <return-type type="GtkWidget*"/>
+                       <method name="select_first" symbol="gtk_menu_shell_select_first">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="search_sensitive" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_handle_window" symbol="gtk_paned_get_handle_window">
-                               <return-type type="GdkWindow*"/>
+                       <method name="select_item" symbol="gtk_menu_shell_select_item">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="menu_item" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_position" symbol="gtk_paned_get_position">
-                               <return-type type="gint"/>
+                       <method name="set_take_focus" symbol="gtk_menu_shell_set_take_focus">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="take_focus" type="gboolean"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_paned_new">
-                               <return-type type="GtkWidget*"/>
+                       <property name="take-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="activate-current" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="force_hide" type="gboolean"/>
                                </parameters>
-                       </constructor>
-                       <method name="pack1" symbol="gtk_paned_pack1">
+                       </signal>
+                       <signal name="cancel" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="resize" type="gboolean"/>
-                                       <parameter name="shrink" type="gboolean"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
-                       </method>
-                       <method name="pack2" symbol="gtk_paned_pack2">
+                       </signal>
+                       <signal name="cycle-focus" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="resize" type="gboolean"/>
-                                       <parameter name="shrink" type="gboolean"/>
+                                       <parameter name="object" type="GtkMenuShell*"/>
+                                       <parameter name="p0" type="GtkDirectionType"/>
                                </parameters>
-                       </method>
-                       <method name="set_position" symbol="gtk_paned_set_position">
+                       </signal>
+                       <signal name="deactivate" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
-                       </method>
-                       <property name="max-position" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="min-position" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="position" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="position-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="accept-position" when="LAST">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="move-current" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="direction" type="GtkMenuDirectionType"/>
                                </parameters>
                        </signal>
-                       <signal name="cancel-position" when="LAST">
+                       <signal name="move-selected" when="LAST">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="distance" type="gint"/>
                                </parameters>
                        </signal>
-                       <signal name="cycle-child-focus" when="LAST">
-                               <return-type type="gboolean"/>
+                       <signal name="selection-done" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
-                                       <parameter name="reverse" type="gboolean"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
                        </signal>
-                       <signal name="cycle-handle-focus" when="LAST">
-                               <return-type type="gboolean"/>
+                       <vfunc name="get_popup_delay">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
-                                       <parameter name="reverse" type="gboolean"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
-                       </signal>
-                       <signal name="move-handle" when="LAST">
-                               <return-type type="gboolean"/>
+                       </vfunc>
+                       <vfunc name="insert">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
-                                       <parameter name="scroll" type="GtkScrollType"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-handle-focus" when="LAST">
-                               <return-type type="gboolean"/>
+                       </vfunc>
+                       <vfunc name="select_item">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="menu_item" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
+                       </vfunc>
                </object>
-               <object name="GtkPlug" parent="GtkWindow" type-name="GtkPlug" get-type="gtk_plug_get_type">
+               <object name="GtkMenuToolButton" parent="GtkToolButton" type-name="GtkMenuToolButton" get-type="gtk_menu_tool_button_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
+                               <interface name="GtkActivatable"/>
                        </implements>
-                       <method name="construct" symbol="gtk_plug_construct">
-                               <return-type type="void"/>
+                       <method name="get_menu" symbol="gtk_menu_tool_button_get_menu">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="plug" type="GtkPlug*"/>
-                                       <parameter name="socket_id" type="GdkNativeWindow"/>
+                                       <parameter name="button" type="GtkMenuToolButton*"/>
                                </parameters>
                        </method>
-                       <method name="construct_for_display" symbol="gtk_plug_construct_for_display">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_menu_tool_button_new">
+                               <return-type type="GtkToolItem*"/>
                                <parameters>
-                                       <parameter name="plug" type="GtkPlug*"/>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="socket_id" type="GdkNativeWindow"/>
+                                       <parameter name="icon_widget" type="GtkWidget*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="get_embedded" symbol="gtk_plug_get_embedded">
-                               <return-type type="gboolean"/>
+                       </constructor>
+                       <constructor name="new_from_stock" symbol="gtk_menu_tool_button_new_from_stock">
+                               <return-type type="GtkToolItem*"/>
                                <parameters>
-                                       <parameter name="plug" type="GtkPlug*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="get_id" symbol="gtk_plug_get_id">
-                               <return-type type="GdkNativeWindow"/>
+                       </constructor>
+                       <method name="set_arrow_tooltip_markup" symbol="gtk_menu_tool_button_set_arrow_tooltip_markup">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="plug" type="GtkPlug*"/>
+                                       <parameter name="button" type="GtkMenuToolButton*"/>
+                                       <parameter name="markup" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_socket_window" symbol="gtk_plug_get_socket_window">
-                               <return-type type="GdkWindow*"/>
+                       <method name="set_arrow_tooltip_text" symbol="gtk_menu_tool_button_set_arrow_tooltip_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="plug" type="GtkPlug*"/>
+                                       <parameter name="button" type="GtkMenuToolButton*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_plug_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="socket_id" type="GdkNativeWindow"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_for_display" symbol="gtk_plug_new_for_display">
-                               <return-type type="GtkWidget*"/>
+                       <method name="set_menu" symbol="gtk_menu_tool_button_set_menu">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="socket_id" type="GdkNativeWindow"/>
+                                       <parameter name="button" type="GtkMenuToolButton*"/>
+                                       <parameter name="menu" type="GtkWidget*"/>
                                </parameters>
-                       </constructor>
-                       <property name="embedded" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="socket-window" type="GdkWindow*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <signal name="embedded" when="LAST">
+                       </method>
+                       <property name="menu" type="GtkMenu*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="show-menu" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="plug" type="GtkPlug*"/>
+                                       <parameter name="button" type="GtkMenuToolButton*"/>
                                </parameters>
                        </signal>
                </object>
-               <object name="GtkPrintContext" parent="GObject" type-name="GtkPrintContext" get-type="gtk_print_context_get_type">
-                       <method name="create_pango_context" symbol="gtk_print_context_create_pango_context">
-                               <return-type type="PangoContext*"/>
+               <object name="GtkMessageDialog" parent="GtkDialog" type-name="GtkMessageDialog" get-type="gtk_message_dialog_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="format_secondary_markup" symbol="gtk_message_dialog_format_secondary_markup">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
+                                       <parameter name="message_format" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="create_pango_layout" symbol="gtk_print_context_create_pango_layout">
-                               <return-type type="PangoLayout*"/>
+                       <method name="format_secondary_text" symbol="gtk_message_dialog_format_secondary_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
+                                       <parameter name="message_format" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_cairo_context" symbol="gtk_print_context_get_cairo_context">
-                               <return-type type="cairo_t*"/>
+                       <method name="get_image" symbol="gtk_message_dialog_get_image">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="dialog" type="GtkMessageDialog*"/>
                                </parameters>
                        </method>
-                       <method name="get_dpi_x" symbol="gtk_print_context_get_dpi_x">
-                               <return-type type="gdouble"/>
+                       <method name="get_message_area" symbol="gtk_message_dialog_get_message_area">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
                                </parameters>
                        </method>
-                       <method name="get_dpi_y" symbol="gtk_print_context_get_dpi_y">
-                               <return-type type="gdouble"/>
+                       <constructor name="new" symbol="gtk_message_dialog_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="flags" type="GtkDialogFlags"/>
+                                       <parameter name="type" type="GtkMessageType"/>
+                                       <parameter name="buttons" type="GtkButtonsType"/>
+                                       <parameter name="message_format" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="get_hard_margins" symbol="gtk_print_context_get_hard_margins">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="context" type="GtkPrintContext*"/>
-                                       <parameter name="top" type="gdouble*"/>
-                                       <parameter name="bottom" type="gdouble*"/>
-                                       <parameter name="left" type="gdouble*"/>
-                                       <parameter name="right" type="gdouble*"/>
+                       </constructor>
+                       <constructor name="new_with_markup" symbol="gtk_message_dialog_new_with_markup">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="flags" type="GtkDialogFlags"/>
+                                       <parameter name="type" type="GtkMessageType"/>
+                                       <parameter name="buttons" type="GtkButtonsType"/>
+                                       <parameter name="message_format" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="get_height" symbol="gtk_print_context_get_height">
-                               <return-type type="gdouble"/>
+                       </constructor>
+                       <method name="set_image" symbol="gtk_message_dialog_set_image">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="dialog" type="GtkMessageDialog*"/>
+                                       <parameter name="image" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_page_setup" symbol="gtk_print_context_get_page_setup">
-                               <return-type type="GtkPageSetup*"/>
+                       <method name="set_markup" symbol="gtk_message_dialog_set_markup">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_pango_fontmap" symbol="gtk_print_context_get_pango_fontmap">
-                               <return-type type="PangoFontMap*"/>
+                       <property name="buttons" type="GtkButtonsType" readable="0" writable="1" construct="0" construct-only="1"/>
+                       <property name="image" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="message-area" type="GtkWidget*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="message-type" type="GtkMessageType" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="secondary-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="secondary-use-markup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="use-markup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkMisc" parent="GtkWidget" type-name="GtkMisc" get-type="gtk_misc_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_alignment" symbol="gtk_misc_get_alignment">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="misc" type="GtkMisc*"/>
+                                       <parameter name="xalign" type="gfloat*"/>
+                                       <parameter name="yalign" type="gfloat*"/>
                                </parameters>
                        </method>
-                       <method name="get_width" symbol="gtk_print_context_get_width">
-                               <return-type type="gdouble"/>
+                       <method name="get_padding" symbol="gtk_misc_get_padding">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="misc" type="GtkMisc*"/>
+                                       <parameter name="xpad" type="gint*"/>
+                                       <parameter name="ypad" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_cairo_context" symbol="gtk_print_context_set_cairo_context">
+                       <method name="set_alignment" symbol="gtk_misc_set_alignment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkPrintContext*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="dpi_x" type="double"/>
-                                       <parameter name="dpi_y" type="double"/>
+                                       <parameter name="misc" type="GtkMisc*"/>
+                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="yalign" type="gfloat"/>
                                </parameters>
                        </method>
-               </object>
-               <object name="GtkPrintOperation" parent="GObject" type-name="GtkPrintOperation" get-type="gtk_print_operation_get_type">
-                       <implements>
-                               <interface name="GtkPrintOperationPreview"/>
-                       </implements>
-                       <method name="cancel" symbol="gtk_print_operation_cancel">
+                       <method name="set_padding" symbol="gtk_misc_set_padding">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="misc" type="GtkMisc*"/>
+                                       <parameter name="xpad" type="gint"/>
+                                       <parameter name="ypad" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="draw_page_finish" symbol="gtk_print_operation_draw_page_finish">
-                               <return-type type="void"/>
+                       <property name="xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="xpad" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="ypad" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkMountOperation" parent="GMountOperation" type-name="GtkMountOperation" get-type="gtk_mount_operation_get_type">
+                       <method name="get_parent" symbol="gtk_mount_operation_get_parent">
+                               <return-type type="GtkWindow*"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="op" type="GtkMountOperation*"/>
                                </parameters>
                        </method>
-                       <method name="get_default_page_setup" symbol="gtk_print_operation_get_default_page_setup">
-                               <return-type type="GtkPageSetup*"/>
+                       <method name="get_screen" symbol="gtk_mount_operation_get_screen">
+                               <return-type type="GdkScreen*"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="op" type="GtkMountOperation*"/>
                                </parameters>
                        </method>
-                       <method name="get_embed_page_setup" symbol="gtk_print_operation_get_embed_page_setup">
+                       <method name="is_showing" symbol="gtk_mount_operation_is_showing">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="op" type="GtkMountOperation*"/>
                                </parameters>
                        </method>
-                       <method name="get_error" symbol="gtk_print_operation_get_error">
+                       <constructor name="new" symbol="gtk_mount_operation_new">
+                               <return-type type="GMountOperation*"/>
+                               <parameters>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_parent" symbol="gtk_mount_operation_set_parent">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="op" type="GtkMountOperation*"/>
+                                       <parameter name="parent" type="GtkWindow*"/>
                                </parameters>
                        </method>
-                       <method name="get_has_selection" symbol="gtk_print_operation_get_has_selection">
-                               <return-type type="gboolean"/>
+                       <method name="set_screen" symbol="gtk_mount_operation_set_screen">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="op" type="GtkMountOperation*"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
                                </parameters>
                        </method>
-                       <method name="get_n_pages_to_print" symbol="gtk_print_operation_get_n_pages_to_print">
+                       <property name="is-showing" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="parent" type="GtkWindow*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkNotebook" parent="GtkContainer" type-name="GtkNotebook" get-type="gtk_notebook_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="append_page" symbol="gtk_notebook_append_page">
                                <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_print_settings" symbol="gtk_print_operation_get_print_settings">
-                               <return-type type="GtkPrintSettings*"/>
+                       <method name="append_page_menu" symbol="gtk_notebook_append_page_menu">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="menu_label" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_status" symbol="gtk_print_operation_get_status">
-                               <return-type type="GtkPrintStatus"/>
+                       <method name="get_action_widget" symbol="gtk_notebook_get_action_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="pack_type" type="GtkPackType"/>
                                </parameters>
                        </method>
-                       <method name="get_status_string" symbol="gtk_print_operation_get_status_string">
-                               <return-type type="gchar*"/>
+                       <method name="get_current_page" symbol="gtk_notebook_get_current_page">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="get_support_selection" symbol="gtk_print_operation_get_support_selection">
-                               <return-type type="gboolean"/>
+                       <method name="get_group_name" symbol="gtk_notebook_get_group_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="is_finished" symbol="gtk_print_operation_is_finished">
-                               <return-type type="gboolean"/>
+                       <method name="get_menu_label" symbol="gtk_notebook_get_menu_label">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_print_operation_new">
-                               <return-type type="GtkPrintOperation*"/>
-                       </constructor>
-                       <method name="run" symbol="gtk_print_operation_run">
-                               <return-type type="GtkPrintOperationResult"/>
+                       <method name="get_menu_label_text" symbol="gtk_notebook_get_menu_label_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="action" type="GtkPrintOperationAction"/>
-                                       <parameter name="parent" type="GtkWindow*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_allow_async" symbol="gtk_print_operation_set_allow_async">
-                               <return-type type="void"/>
+                       <method name="get_n_pages" symbol="gtk_notebook_get_n_pages">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="allow_async" type="gboolean"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="set_current_page" symbol="gtk_print_operation_set_current_page">
-                               <return-type type="void"/>
+                       <method name="get_nth_page" symbol="gtk_notebook_get_nth_page">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="current_page" type="gint"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="page_num" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_custom_tab_label" symbol="gtk_print_operation_set_custom_tab_label">
-                               <return-type type="void"/>
+                       <method name="get_scrollable" symbol="gtk_notebook_get_scrollable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="set_default_page_setup" symbol="gtk_print_operation_set_default_page_setup">
-                               <return-type type="void"/>
+                       <method name="get_show_border" symbol="gtk_notebook_get_show_border">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="default_page_setup" type="GtkPageSetup*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="set_defer_drawing" symbol="gtk_print_operation_set_defer_drawing">
-                               <return-type type="void"/>
+                       <method name="get_show_tabs" symbol="gtk_notebook_get_show_tabs">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="set_embed_page_setup" symbol="gtk_print_operation_set_embed_page_setup">
-                               <return-type type="void"/>
+                       <method name="get_tab_detachable" symbol="gtk_notebook_get_tab_detachable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="embed" type="gboolean"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_export_filename" symbol="gtk_print_operation_set_export_filename">
-                               <return-type type="void"/>
+                       <method name="get_tab_hborder" symbol="gtk_notebook_get_tab_hborder">
+                               <return-type type="guint16"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="filename" type="gchar*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="set_has_selection" symbol="gtk_print_operation_set_has_selection">
-                               <return-type type="void"/>
+                       <method name="get_tab_label" symbol="gtk_notebook_get_tab_label">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="has_selection" type="gboolean"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_job_name" symbol="gtk_print_operation_set_job_name">
-                               <return-type type="void"/>
+                       <method name="get_tab_label_text" symbol="gtk_notebook_get_tab_label_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="job_name" type="gchar*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_n_pages" symbol="gtk_print_operation_set_n_pages">
-                               <return-type type="void"/>
+                       <method name="get_tab_pos" symbol="gtk_notebook_get_tab_pos">
+                               <return-type type="GtkPositionType"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="n_pages" type="gint"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="set_print_settings" symbol="gtk_print_operation_set_print_settings">
-                               <return-type type="void"/>
+                       <method name="get_tab_reorderable" symbol="gtk_notebook_get_tab_reorderable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="print_settings" type="GtkPrintSettings*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_show_progress" symbol="gtk_print_operation_set_show_progress">
-                               <return-type type="void"/>
+                       <method name="get_tab_vborder" symbol="gtk_notebook_get_tab_vborder">
+                               <return-type type="guint16"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="show_progress" type="gboolean"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="set_support_selection" symbol="gtk_print_operation_set_support_selection">
-                               <return-type type="void"/>
+                       <method name="insert_page" symbol="gtk_notebook_insert_page">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="support_selection" type="gboolean"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_track_print_status" symbol="gtk_print_operation_set_track_print_status">
-                               <return-type type="void"/>
+                       <method name="insert_page_menu" symbol="gtk_notebook_insert_page_menu">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="track_status" type="gboolean"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="menu_label" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_unit" symbol="gtk_print_operation_set_unit">
+                       <constructor name="new" symbol="gtk_notebook_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="next_page" symbol="gtk_notebook_next_page">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_full_page" symbol="gtk_print_operation_set_use_full_page">
-                               <return-type type="void"/>
+                       <method name="page_num" symbol="gtk_notebook_page_num">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="op" type="GtkPrintOperation*"/>
-                                       <parameter name="full_page" type="gboolean"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <property name="allow-async" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <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"/>
-                       <signal name="begin-print" when="LAST">
+                       <method name="popup_disable" symbol="gtk_notebook_popup_disable">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="operation" type="GtkPrintOperation*"/>
-                                       <parameter name="context" type="GtkPrintContext*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="create-custom-widget" when="LAST">
-                               <return-type type="GObject*"/>
-                               <parameters>
-                                       <parameter name="operation" type="GtkPrintOperation*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
-                       </signal>
-                       <signal name="custom-widget-apply" when="LAST">
+                       </method>
+                       <method name="popup_enable" symbol="gtk_notebook_popup_enable">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="operation" type="GtkPrintOperation*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
-                       </signal>
-                       <signal name="done" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="prepend_page" symbol="gtk_notebook_prepend_page">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="operation" type="GtkPrintOperation*"/>
-                                       <parameter name="result" type="GtkPrintOperationResult"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
-                       <signal name="draw-page" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="prepend_page_menu" symbol="gtk_notebook_prepend_page_menu">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="operation" type="GtkPrintOperation*"/>
-                                       <parameter name="context" type="GtkPrintContext*"/>
-                                       <parameter name="page_nr" type="gint"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="menu_label" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
-                       <signal name="end-print" when="LAST">
+                       </method>
+                       <method name="prev_page" symbol="gtk_notebook_prev_page">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="operation" type="GtkPrintOperation*"/>
-                                       <parameter name="context" type="GtkPrintContext*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="paginate" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="operation" type="GtkPrintOperation*"/>
-                                       <parameter name="context" type="GtkPrintContext*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="preview" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="operation" type="GtkPrintOperation*"/>
-                                       <parameter name="preview" type="GtkPrintOperationPreview*"/>
-                                       <parameter name="context" type="GtkPrintContext*"/>
-                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
-                       </signal>
-                       <signal name="request-page-setup" when="LAST">
+                       </method>
+                       <method name="remove_page" symbol="gtk_notebook_remove_page">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="operation" type="GtkPrintOperation*"/>
-                                       <parameter name="context" type="GtkPrintContext*"/>
-                                       <parameter name="page_nr" type="gint"/>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="page_num" type="gint"/>
                                </parameters>
-                       </signal>
-                       <signal name="status-changed" when="LAST">
+                       </method>
+                       <method name="reorder_child" symbol="gtk_notebook_reorder_child">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="operation" type="GtkPrintOperation*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
-                       </signal>
-                       <signal name="update-custom-widget" when="LAST">
+                       </method>
+                       <method name="set_action_widget" symbol="gtk_notebook_set_action_widget">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="operation" type="GtkPrintOperation*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                        <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="setup" type="GtkPageSetup*"/>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="pack_type" type="GtkPackType"/>
                                </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">
-                               <return-type type="GtkPrintSettings*"/>
+                       </method>
+                       <method name="set_current_page" symbol="gtk_notebook_set_current_page">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="other" type="GtkPrintSettings*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="page_num" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="foreach" symbol="gtk_print_settings_foreach">
+                       <method name="set_group_name" symbol="gtk_notebook_set_group_name">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="func" type="GtkPrintSettingsFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="group_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get" symbol="gtk_print_settings_get">
-                               <return-type type="gchar*"/>
+                       <method name="set_menu_label" symbol="gtk_notebook_set_menu_label">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu_label" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_bool" symbol="gtk_print_settings_get_bool">
-                               <return-type type="gboolean"/>
+                       <method name="set_menu_label_text" symbol="gtk_notebook_set_menu_label_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu_text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_collate" symbol="gtk_print_settings_get_collate">
-                               <return-type type="gboolean"/>
+                       <method name="set_scrollable" symbol="gtk_notebook_set_scrollable">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="scrollable" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_default_source" symbol="gtk_print_settings_get_default_source">
-                               <return-type type="gchar*"/>
+                       <method name="set_show_border" symbol="gtk_notebook_set_show_border">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="show_border" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_dither" symbol="gtk_print_settings_get_dither">
-                               <return-type type="gchar*"/>
+                       <method name="set_show_tabs" symbol="gtk_notebook_set_show_tabs">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="show_tabs" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_double" symbol="gtk_print_settings_get_double">
-                               <return-type type="gdouble"/>
+                       <method name="set_tab_detachable" symbol="gtk_notebook_set_tab_detachable">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="detachable" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_double_with_default" symbol="gtk_print_settings_get_double_with_default">
-                               <return-type type="gdouble"/>
+                       <method name="set_tab_label" symbol="gtk_notebook_set_tab_label">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
-                                       <parameter name="def" type="gdouble"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_duplex" symbol="gtk_print_settings_get_duplex">
-                               <return-type type="GtkPrintDuplex"/>
+                       <method name="set_tab_label_text" symbol="gtk_notebook_set_tab_label_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_finishings" symbol="gtk_print_settings_get_finishings">
-                               <return-type type="gchar*"/>
+                       <method name="set_tab_pos" symbol="gtk_notebook_set_tab_pos">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="pos" type="GtkPositionType"/>
                                </parameters>
                        </method>
-                       <method name="get_int" symbol="gtk_print_settings_get_int">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
+                       <method name="set_tab_reorderable" symbol="gtk_notebook_set_tab_reorderable">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="reorderable" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_int_with_default" symbol="gtk_print_settings_get_int_with_default">
+                       <property name="enable-popup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="group-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="page" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="scrollable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="show-border" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="show-tabs" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="tab-pos" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="change-current-page" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="offset" type="gint"/>
+                               </parameters>
+                       </signal>
+                       <signal name="create-window" when="LAST">
+                               <return-type type="GtkNotebook*"/>
+                               <parameters>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                               </parameters>
+                       </signal>
+                       <signal name="focus-tab" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="type" type="GtkNotebookTab"/>
+                               </parameters>
+                       </signal>
+                       <signal name="move-focus-out" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="direction" type="GtkDirectionType"/>
+                               </parameters>
+                       </signal>
+                       <signal name="page-added" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="page_num" type="guint"/>
+                               </parameters>
+                       </signal>
+                       <signal name="page-removed" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="page_num" type="guint"/>
+                               </parameters>
+                       </signal>
+                       <signal name="page-reordered" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="page_num" type="guint"/>
+                               </parameters>
+                       </signal>
+                       <signal name="reorder-tab" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="direction" type="GtkDirectionType"/>
+                                       <parameter name="move_to_last" type="gboolean"/>
+                               </parameters>
+                       </signal>
+                       <signal name="select-page" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="move_focus" type="gboolean"/>
+                               </parameters>
+                       </signal>
+                       <signal name="switch-page" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="page_num" type="guint"/>
+                               </parameters>
+                       </signal>
+                       <vfunc name="insert_page">
                                <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
-                                       <parameter name="def" type="gint"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="menu_label" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="get_length" symbol="gtk_print_settings_get_length">
-                               <return-type type="gdouble"/>
+                       </vfunc>
+               </object>
+               <object name="GtkNumerableIcon" parent="GEmblemedIcon" type-name="GtkNumerableIcon" get-type="gtk_numerable_icon_get_type">
+                       <implements>
+                               <interface name="GIcon"/>
+                       </implements>
+                       <method name="get_background_gicon" symbol="gtk_numerable_icon_get_background_gicon">
+                               <return-type type="GIcon*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="self" type="GtkNumerableIcon*"/>
                                </parameters>
                        </method>
-                       <method name="get_media_type" symbol="gtk_print_settings_get_media_type">
+                       <method name="get_background_icon_name" symbol="gtk_numerable_icon_get_background_icon_name">
                                <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="self" type="GtkNumerableIcon*"/>
                                </parameters>
                        </method>
-                       <method name="get_n_copies" symbol="gtk_print_settings_get_n_copies">
+                       <method name="get_count" symbol="gtk_numerable_icon_get_count">
                                <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="self" type="GtkNumerableIcon*"/>
                                </parameters>
                        </method>
-                       <method name="get_number_up" symbol="gtk_print_settings_get_number_up">
-                               <return-type type="gint"/>
+                       <method name="get_label" symbol="gtk_numerable_icon_get_label">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="self" type="GtkNumerableIcon*"/>
                                </parameters>
                        </method>
-                       <method name="get_number_up_layout" symbol="gtk_print_settings_get_number_up_layout">
-                               <return-type type="GtkNumberUpLayout"/>
+                       <method name="get_style_context" symbol="gtk_numerable_icon_get_style_context">
+                               <return-type type="GtkStyleContext*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="self" type="GtkNumerableIcon*"/>
                                </parameters>
                        </method>
-                       <method name="get_orientation" symbol="gtk_print_settings_get_orientation">
-                               <return-type type="GtkPageOrientation"/>
+                       <constructor name="new" symbol="gtk_numerable_icon_new">
+                               <return-type type="GIcon*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="base_icon" type="GIcon*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_with_style_context" symbol="gtk_numerable_icon_new_with_style_context">
+                               <return-type type="GIcon*"/>
+                               <parameters>
+                                       <parameter name="base_icon" type="GIcon*"/>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_background_gicon" symbol="gtk_numerable_icon_set_background_gicon">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkNumerableIcon*"/>
+                                       <parameter name="icon" type="GIcon*"/>
                                </parameters>
                        </method>
-                       <method name="get_output_bin" symbol="gtk_print_settings_get_output_bin">
-                               <return-type type="gchar*"/>
+                       <method name="set_background_icon_name" symbol="gtk_numerable_icon_set_background_icon_name">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="self" type="GtkNumerableIcon*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_page_ranges" symbol="gtk_print_settings_get_page_ranges">
-                               <return-type type="GtkPageRange*"/>
+                       <method name="set_count" symbol="gtk_numerable_icon_set_count">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="num_ranges" type="gint*"/>
+                                       <parameter name="self" type="GtkNumerableIcon*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_page_set" symbol="gtk_print_settings_get_page_set">
-                               <return-type type="GtkPageSet"/>
+                       <method name="set_label" symbol="gtk_numerable_icon_set_label">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="self" type="GtkNumerableIcon*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_paper_height" symbol="gtk_print_settings_get_paper_height">
-                               <return-type type="gdouble"/>
+                       <method name="set_style_context" symbol="gtk_numerable_icon_set_style_context">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="self" type="GtkNumerableIcon*"/>
+                                       <parameter name="style" type="GtkStyleContext*"/>
                                </parameters>
                        </method>
-                       <method name="get_paper_size" symbol="gtk_print_settings_get_paper_size">
-                               <return-type type="GtkPaperSize*"/>
+                       <property name="background-icon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="background-icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="count" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="style-context" type="GtkStyleContext*" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkOffscreenWindow" parent="GtkWindow" type-name="GtkOffscreenWindow" get-type="gtk_offscreen_window_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_pixbuf" symbol="gtk_offscreen_window_get_pixbuf">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="offscreen" type="GtkOffscreenWindow*"/>
                                </parameters>
                        </method>
-                       <method name="get_paper_width" symbol="gtk_print_settings_get_paper_width">
-                               <return-type type="gdouble"/>
+                       <method name="get_surface" symbol="gtk_offscreen_window_get_surface">
+                               <return-type type="cairo_surface_t*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="offscreen" type="GtkOffscreenWindow*"/>
                                </parameters>
                        </method>
-                       <method name="get_print_pages" symbol="gtk_print_settings_get_print_pages">
-                               <return-type type="GtkPrintPages"/>
+                       <constructor name="new" symbol="gtk_offscreen_window_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+               </object>
+               <object name="GtkPageSetup" parent="GObject" type-name="GtkPageSetup" get-type="gtk_page_setup_get_type">
+                       <method name="copy" symbol="gtk_page_setup_copy">
+                               <return-type type="GtkPageSetup*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="other" type="GtkPageSetup*"/>
                                </parameters>
                        </method>
-                       <method name="get_printer" symbol="gtk_print_settings_get_printer">
-                               <return-type type="gchar*"/>
+                       <method name="get_bottom_margin" symbol="gtk_page_setup_get_bottom_margin">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="get_printer_lpi" symbol="gtk_print_settings_get_printer_lpi">
+                       <method name="get_left_margin" symbol="gtk_page_setup_get_left_margin">
                                <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="get_quality" symbol="gtk_print_settings_get_quality">
-                               <return-type type="GtkPrintQuality"/>
+                       <method name="get_orientation" symbol="gtk_page_setup_get_orientation">
+                               <return-type type="GtkPageOrientation"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
                                </parameters>
                        </method>
-                       <method name="get_resolution" symbol="gtk_print_settings_get_resolution">
-                               <return-type type="gint"/>
+                       <method name="get_page_height" symbol="gtk_page_setup_get_page_height">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="get_resolution_x" symbol="gtk_print_settings_get_resolution_x">
-                               <return-type type="gint"/>
+                       <method name="get_page_width" symbol="gtk_page_setup_get_page_width">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="get_resolution_y" symbol="gtk_print_settings_get_resolution_y">
-                               <return-type type="gint"/>
+                       <method name="get_paper_height" symbol="gtk_page_setup_get_paper_height">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="get_reverse" symbol="gtk_print_settings_get_reverse">
-                               <return-type type="gboolean"/>
+                       <method name="get_paper_size" symbol="gtk_page_setup_get_paper_size">
+                               <return-type type="GtkPaperSize*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
                                </parameters>
                        </method>
-                       <method name="get_scale" symbol="gtk_print_settings_get_scale">
+                       <method name="get_paper_width" symbol="gtk_page_setup_get_paper_width">
                                <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="get_use_color" symbol="gtk_print_settings_get_use_color">
-                               <return-type type="gboolean"/>
+                       <method name="get_right_margin" symbol="gtk_page_setup_get_right_margin">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="has_key" symbol="gtk_print_settings_has_key">
-                               <return-type type="gboolean"/>
+                       <method name="get_top_margin" symbol="gtk_page_setup_get_top_margin">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="load_file" symbol="gtk_print_settings_load_file">
+                       <method name="load_file" symbol="gtk_page_setup_load_file">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="file_name" type="gchar*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="file_name" type="char*"/>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="load_key_file" symbol="gtk_print_settings_load_key_file">
+                       <method name="load_key_file" symbol="gtk_page_setup_load_key_file">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
                                        <parameter name="key_file" type="GKeyFile*"/>
                                        <parameter name="group_name" type="gchar*"/>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_print_settings_new">
-                               <return-type type="GtkPrintSettings*"/>
+                       <constructor name="new" symbol="gtk_page_setup_new">
+                               <return-type type="GtkPageSetup*"/>
                        </constructor>
-                       <constructor name="new_from_file" symbol="gtk_print_settings_new_from_file">
-                               <return-type type="GtkPrintSettings*"/>
+                       <constructor name="new_from_file" symbol="gtk_page_setup_new_from_file">
+                               <return-type type="GtkPageSetup*"/>
                                <parameters>
                                        <parameter name="file_name" type="gchar*"/>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </constructor>
-                       <constructor name="new_from_key_file" symbol="gtk_print_settings_new_from_key_file">
-                               <return-type type="GtkPrintSettings*"/>
+                       <constructor name="new_from_key_file" symbol="gtk_page_setup_new_from_key_file">
+                               <return-type type="GtkPageSetup*"/>
                                <parameters>
                                        <parameter name="key_file" type="GKeyFile*"/>
                                        <parameter name="group_name" type="gchar*"/>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </constructor>
-                       <method name="set" symbol="gtk_print_settings_set">
+                       <method name="set_bottom_margin" symbol="gtk_page_setup_set_bottom_margin">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
-                                       <parameter name="value" type="gchar*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="margin" type="gdouble"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="set_bool" symbol="gtk_print_settings_set_bool">
+                       <method name="set_left_margin" symbol="gtk_page_setup_set_left_margin">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
-                                       <parameter name="value" type="gboolean"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="margin" type="gdouble"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="set_collate" symbol="gtk_print_settings_set_collate">
+                       <method name="set_orientation" symbol="gtk_page_setup_set_orientation">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="collate" type="gboolean"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="orientation" type="GtkPageOrientation"/>
                                </parameters>
                        </method>
-                       <method name="set_default_source" symbol="gtk_print_settings_set_default_source">
+                       <method name="set_paper_size" symbol="gtk_page_setup_set_paper_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="default_source" type="gchar*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
                                </parameters>
                        </method>
-                       <method name="set_dither" symbol="gtk_print_settings_set_dither">
+                       <method name="set_paper_size_and_default_margins" symbol="gtk_page_setup_set_paper_size_and_default_margins">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="dither" type="gchar*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
                                </parameters>
                        </method>
-                       <method name="set_double" symbol="gtk_print_settings_set_double">
+                       <method name="set_right_margin" symbol="gtk_page_setup_set_right_margin">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
-                                       <parameter name="value" type="gdouble"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="margin" type="gdouble"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="set_duplex" symbol="gtk_print_settings_set_duplex">
+                       <method name="set_top_margin" symbol="gtk_page_setup_set_top_margin">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="duplex" type="GtkPrintDuplex"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="margin" type="gdouble"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="set_finishings" symbol="gtk_print_settings_set_finishings">
-                               <return-type type="void"/>
+                       <method name="to_file" symbol="gtk_page_setup_to_file">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="finishings" type="gchar*"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="file_name" type="char*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="set_int" symbol="gtk_print_settings_set_int">
+                       <method name="to_key_file" symbol="gtk_page_setup_to_key_file">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
-                                       <parameter name="value" type="gint"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                                       <parameter name="key_file" type="GKeyFile*"/>
+                                       <parameter name="group_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_length" symbol="gtk_print_settings_set_length">
+               </object>
+               <object name="GtkPaned" parent="GtkContainer" type-name="GtkPaned" get-type="gtk_paned_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <method name="add1" symbol="gtk_paned_add1">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
-                                       <parameter name="value" type="gdouble"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_media_type" symbol="gtk_print_settings_set_media_type">
+                       <method name="add2" symbol="gtk_paned_add2">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="media_type" type="gchar*"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_n_copies" symbol="gtk_print_settings_set_n_copies">
-                               <return-type type="void"/>
+                       <method name="get_child1" symbol="gtk_paned_get_child1">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="num_copies" type="gint"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
                                </parameters>
                        </method>
-                       <method name="set_number_up" symbol="gtk_print_settings_set_number_up">
-                               <return-type type="void"/>
+                       <method name="get_child2" symbol="gtk_paned_get_child2">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="number_up" type="gint"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
                                </parameters>
                        </method>
-                       <method name="set_number_up_layout" symbol="gtk_print_settings_set_number_up_layout">
-                               <return-type type="void"/>
+                       <method name="get_handle_window" symbol="gtk_paned_get_handle_window">
+                               <return-type type="GdkWindow*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="number_up_layout" type="GtkNumberUpLayout"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
                                </parameters>
                        </method>
-                       <method name="set_orientation" symbol="gtk_print_settings_set_orientation">
-                               <return-type type="void"/>
+                       <method name="get_position" symbol="gtk_paned_get_position">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="orientation" type="GtkPageOrientation"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
                                </parameters>
                        </method>
-                       <method name="set_output_bin" symbol="gtk_print_settings_set_output_bin">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_paned_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="output_bin" type="gchar*"/>
+                                       <parameter name="orientation" type="GtkOrientation"/>
                                </parameters>
-                       </method>
-                       <method name="set_page_ranges" symbol="gtk_print_settings_set_page_ranges">
+                       </constructor>
+                       <method name="pack1" symbol="gtk_paned_pack1">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="page_ranges" type="GtkPageRange*"/>
-                                       <parameter name="num_ranges" type="gint"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="resize" type="gboolean"/>
+                                       <parameter name="shrink" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_page_set" symbol="gtk_print_settings_set_page_set">
+                       <method name="pack2" symbol="gtk_paned_pack2">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="page_set" type="GtkPageSet"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="resize" type="gboolean"/>
+                                       <parameter name="shrink" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_paper_height" symbol="gtk_print_settings_set_paper_height">
+                       <method name="set_position" symbol="gtk_paned_set_position">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="height" type="gdouble"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_paper_size" symbol="gtk_print_settings_set_paper_size">
-                               <return-type type="void"/>
+                       <property name="max-position" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="min-position" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="position" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="position-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="accept-position" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="paper_size" type="GtkPaperSize*"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
                                </parameters>
-                       </method>
-                       <method name="set_paper_width" symbol="gtk_print_settings_set_paper_width">
-                               <return-type type="void"/>
+                       </signal>
+                       <signal name="cancel-position" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="width" type="gdouble"/>
-                                       <parameter name="unit" type="GtkUnit"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
                                </parameters>
-                       </method>
-                       <method name="set_print_pages" symbol="gtk_print_settings_set_print_pages">
-                               <return-type type="void"/>
+                       </signal>
+                       <signal name="cycle-child-focus" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="pages" type="GtkPrintPages"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="reverse" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <method name="set_printer" symbol="gtk_print_settings_set_printer">
-                               <return-type type="void"/>
+                       </signal>
+                       <signal name="cycle-handle-focus" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="printer" type="gchar*"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="reverse" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <method name="set_printer_lpi" symbol="gtk_print_settings_set_printer_lpi">
-                               <return-type type="void"/>
+                       </signal>
+                       <signal name="move-handle" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="lpi" type="gdouble"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
+                                       <parameter name="scroll" type="GtkScrollType"/>
                                </parameters>
-                       </method>
-                       <method name="set_quality" symbol="gtk_print_settings_set_quality">
-                               <return-type type="void"/>
+                       </signal>
+                       <signal name="toggle-handle-focus" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="quality" type="GtkPrintQuality"/>
+                                       <parameter name="paned" type="GtkPaned*"/>
                                </parameters>
-                       </method>
-                       <method name="set_resolution" symbol="gtk_print_settings_set_resolution">
+                       </signal>
+               </object>
+               <object name="GtkPlug" parent="GtkWindow" type-name="GtkPlug" get-type="gtk_plug_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="construct" symbol="gtk_plug_construct">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="resolution" type="gint"/>
+                                       <parameter name="plug" type="GtkPlug*"/>
+                                       <parameter name="socket_id" type="GdkNativeWindow"/>
                                </parameters>
                        </method>
-                       <method name="set_resolution_xy" symbol="gtk_print_settings_set_resolution_xy">
+                       <method name="construct_for_display" symbol="gtk_plug_construct_for_display">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="resolution_x" type="gint"/>
-                                       <parameter name="resolution_y" type="gint"/>
+                                       <parameter name="plug" type="GtkPlug*"/>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="socket_id" type="GdkNativeWindow"/>
                                </parameters>
                        </method>
-                       <method name="set_reverse" symbol="gtk_print_settings_set_reverse">
-                               <return-type type="void"/>
+                       <method name="get_embedded" symbol="gtk_plug_get_embedded">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="reverse" type="gboolean"/>
+                                       <parameter name="plug" type="GtkPlug*"/>
                                </parameters>
                        </method>
-                       <method name="set_scale" symbol="gtk_print_settings_set_scale">
-                               <return-type type="void"/>
+                       <method name="get_id" symbol="gtk_plug_get_id">
+                               <return-type type="GdkNativeWindow"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="scale" type="gdouble"/>
+                                       <parameter name="plug" type="GtkPlug*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_color" symbol="gtk_print_settings_set_use_color">
-                               <return-type type="void"/>
+                       <method name="get_socket_window" symbol="gtk_plug_get_socket_window">
+                               <return-type type="GdkWindow*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="use_color" type="gboolean"/>
+                                       <parameter name="plug" type="GtkPlug*"/>
                                </parameters>
                        </method>
-                       <method name="to_file" symbol="gtk_print_settings_to_file">
-                               <return-type type="gboolean"/>
+                       <constructor name="new" symbol="gtk_plug_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="file_name" type="gchar*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="socket_id" type="GdkNativeWindow"/>
                                </parameters>
-                       </method>
-                       <method name="to_key_file" symbol="gtk_print_settings_to_key_file">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_for_display" symbol="gtk_plug_new_for_display">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key_file" type="GKeyFile*"/>
-                                       <parameter name="group_name" type="gchar*"/>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="socket_id" type="GdkNativeWindow"/>
                                </parameters>
-                       </method>
-                       <method name="unset" symbol="gtk_print_settings_unset">
+                       </constructor>
+                       <property name="embedded" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="socket-window" type="GdkWindow*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <signal name="embedded" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkPrintSettings*"/>
-                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="plug" type="GtkPlug*"/>
                                </parameters>
-                       </method>
+                       </signal>
                </object>
-               <object name="GtkProgressBar" parent="GtkWidget" type-name="GtkProgressBar" get-type="gtk_progress_bar_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <method name="get_ellipsize" symbol="gtk_progress_bar_get_ellipsize">
-                               <return-type type="PangoEllipsizeMode"/>
+               <object name="GtkPrintContext" parent="GObject" type-name="GtkPrintContext" get-type="gtk_print_context_get_type">
+                       <method name="create_pango_context" symbol="gtk_print_context_create_pango_context">
+                               <return-type type="PangoContext*"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
                        </method>
-                       <method name="get_fraction" symbol="gtk_progress_bar_get_fraction">
-                               <return-type type="gdouble"/>
+                       <method name="create_pango_layout" symbol="gtk_print_context_create_pango_layout">
+                               <return-type type="PangoLayout*"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
                        </method>
-                       <method name="get_inverted" symbol="gtk_progress_bar_get_inverted">
-                               <return-type type="gboolean"/>
+                       <method name="get_cairo_context" symbol="gtk_print_context_get_cairo_context">
+                               <return-type type="cairo_t*"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
                        </method>
-                       <method name="get_pulse_step" symbol="gtk_progress_bar_get_pulse_step">
+                       <method name="get_dpi_x" symbol="gtk_print_context_get_dpi_x">
                                <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
                        </method>
-                       <method name="get_show_text" symbol="gtk_progress_bar_get_show_text">
-                               <return-type type="gboolean"/>
+                       <method name="get_dpi_y" symbol="gtk_print_context_get_dpi_y">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
                        </method>
-                       <method name="get_text" symbol="gtk_progress_bar_get_text">
-                               <return-type type="gchar*"/>
+                       <method name="get_hard_margins" symbol="gtk_print_context_get_hard_margins">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="top" type="gdouble*"/>
+                                       <parameter name="bottom" type="gdouble*"/>
+                                       <parameter name="left" type="gdouble*"/>
+                                       <parameter name="right" type="gdouble*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_progress_bar_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="pulse" symbol="gtk_progress_bar_pulse">
-                               <return-type type="void"/>
+                       <method name="get_height" symbol="gtk_print_context_get_height">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
                        </method>
-                       <method name="set_ellipsize" symbol="gtk_progress_bar_set_ellipsize">
-                               <return-type type="void"/>
+                       <method name="get_page_setup" symbol="gtk_print_context_get_page_setup">
+                               <return-type type="GtkPageSetup*"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
-                                       <parameter name="mode" type="PangoEllipsizeMode"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
                        </method>
-                       <method name="set_fraction" symbol="gtk_progress_bar_set_fraction">
-                               <return-type type="void"/>
+                       <method name="get_pango_fontmap" symbol="gtk_print_context_get_pango_fontmap">
+                               <return-type type="PangoFontMap*"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
-                                       <parameter name="fraction" type="gdouble"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
                        </method>
-                       <method name="set_inverted" symbol="gtk_progress_bar_set_inverted">
-                               <return-type type="void"/>
+                       <method name="get_width" symbol="gtk_print_context_get_width">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
-                                       <parameter name="inverted" type="gboolean"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
                        </method>
-                       <method name="set_pulse_step" symbol="gtk_progress_bar_set_pulse_step">
+                       <method name="set_cairo_context" symbol="gtk_print_context_set_cairo_context">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
-                                       <parameter name="fraction" type="gdouble"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="dpi_x" type="double"/>
+                                       <parameter name="dpi_y" type="double"/>
                                </parameters>
                        </method>
-                       <method name="set_show_text" symbol="gtk_progress_bar_set_show_text">
+               </object>
+               <object name="GtkPrintOperation" parent="GObject" type-name="GtkPrintOperation" get-type="gtk_print_operation_get_type">
+                       <implements>
+                               <interface name="GtkPrintOperationPreview"/>
+                       </implements>
+                       <method name="cancel" symbol="gtk_print_operation_cancel">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
-                                       <parameter name="show_text" type="gboolean"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
                        </method>
-                       <method name="set_text" symbol="gtk_progress_bar_set_text">
+                       <method name="draw_page_finish" symbol="gtk_print_operation_draw_page_finish">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
                        </method>
-                       <property name="ellipsize" type="PangoEllipsizeMode" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="fraction" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="inverted" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pulse-step" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-text" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkRadioAction" parent="GtkToggleAction" type-name="GtkRadioAction" get-type="gtk_radio_action_get_type">
-                       <implements>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_current_value" symbol="gtk_radio_action_get_current_value">
-                               <return-type type="gint"/>
+                       <method name="get_default_page_setup" symbol="gtk_print_operation_get_default_page_setup">
+                               <return-type type="GtkPageSetup*"/>
                                <parameters>
-                                       <parameter name="action" type="GtkRadioAction*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
                        </method>
-                       <method name="get_group" symbol="gtk_radio_action_get_group">
-                               <return-type type="GSList*"/>
+                       <method name="get_embed_page_setup" symbol="gtk_print_operation_get_embed_page_setup">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="action" type="GtkRadioAction*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
                        </method>
-                       <method name="join_group" symbol="gtk_radio_action_join_group">
+                       <method name="get_error" symbol="gtk_print_operation_get_error">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="action" type="GtkRadioAction*"/>
-                                       <parameter name="group_source" type="GtkRadioAction*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_radio_action_new">
-                               <return-type type="GtkRadioAction*"/>
+                       <method name="get_has_selection" symbol="gtk_print_operation_get_has_selection">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="label" type="gchar*"/>
-                                       <parameter name="tooltip" type="gchar*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="value" type="gint"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_current_value" symbol="gtk_radio_action_set_current_value">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_n_pages_to_print" symbol="gtk_print_operation_get_n_pages_to_print">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="action" type="GtkRadioAction*"/>
-                                       <parameter name="current_value" type="gint"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
                        </method>
-                       <method name="set_group" symbol="gtk_radio_action_set_group">
-                               <return-type type="void"/>
+                       <method name="get_print_settings" symbol="gtk_print_operation_get_print_settings">
+                               <return-type type="GtkPrintSettings*"/>
                                <parameters>
-                                       <parameter name="action" type="GtkRadioAction*"/>
-                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
                        </method>
-                       <property name="current-value" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="group" type="GtkRadioAction*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="value" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="changed" when="FIRST">
-                               <return-type type="void"/>
+                       <method name="get_status" symbol="gtk_print_operation_get_status">
+                               <return-type type="GtkPrintStatus"/>
                                <parameters>
-                                       <parameter name="action" type="GtkRadioAction*"/>
-                                       <parameter name="current" type="GtkRadioAction*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkRadioButton" parent="GtkCheckButton" type-name="GtkRadioButton" get-type="gtk_radio_button_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkActivatable"/>
-                       </implements>
-                       <method name="get_group" symbol="gtk_radio_button_get_group">
-                               <return-type type="GSList*"/>
+                       </method>
+                       <method name="get_status_string" symbol="gtk_print_operation_get_status_string">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="radio_button" type="GtkRadioButton*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
                        </method>
-                       <method name="join_group" symbol="gtk_radio_button_join_group">
-                               <return-type type="void"/>
+                       <method name="get_support_selection" symbol="gtk_print_operation_get_support_selection">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="radio_button" type="GtkRadioButton*"/>
-                                       <parameter name="group_source" type="GtkRadioButton*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_radio_button_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="is_finished" symbol="gtk_print_operation_is_finished">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_print_operation_new">
+                               <return-type type="GtkPrintOperation*"/>
                        </constructor>
-                       <constructor name="new_from_widget" symbol="gtk_radio_button_new_from_widget">
-                               <return-type type="GtkWidget*"/>
+                       <method name="run" symbol="gtk_print_operation_run">
+                               <return-type type="GtkPrintOperationResult"/>
                                <parameters>
-                                       <parameter name="radio_group_member" type="GtkRadioButton*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="action" type="GtkPrintOperationAction"/>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_label" symbol="gtk_radio_button_new_with_label">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_allow_async" symbol="gtk_print_operation_set_allow_async">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="group" type="GSList*"/>
-                                       <parameter name="label" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_with_label_from_widget" symbol="gtk_radio_button_new_with_label_from_widget">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="radio_group_member" type="GtkRadioButton*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="allow_async" type="gboolean"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_radio_button_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_current_page" symbol="gtk_print_operation_set_current_page">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="group" type="GSList*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="current_page" type="gint"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic_from_widget" symbol="gtk_radio_button_new_with_mnemonic_from_widget">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_custom_tab_label" symbol="gtk_print_operation_set_custom_tab_label">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="radio_group_member" type="GtkRadioButton*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                        <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_group" symbol="gtk_radio_button_set_group">
+                       </method>
+                       <method name="set_default_page_setup" symbol="gtk_print_operation_set_default_page_setup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="radio_button" type="GtkRadioButton*"/>
-                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="default_page_setup" type="GtkPageSetup*"/>
                                </parameters>
                        </method>
-                       <property name="group" type="GtkRadioButton*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <signal name="group-changed" when="FIRST">
+                       <method name="set_defer_drawing" symbol="gtk_print_operation_set_defer_drawing">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="radio_button" type="GtkRadioButton*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkRadioMenuItem" parent="GtkCheckMenuItem" type-name="GtkRadioMenuItem" get-type="gtk_radio_menu_item_get_type">
-                       <implements>
-                               <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*"/>
+                       </method>
+                       <method name="set_embed_page_setup" symbol="gtk_print_operation_set_embed_page_setup">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="radio_menu_item" type="GtkRadioMenuItem*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="embed" type="gboolean"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_radio_menu_item_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="set_export_filename" symbol="gtk_print_operation_set_export_filename">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="filename" type="gchar*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_widget" symbol="gtk_radio_menu_item_new_from_widget">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_has_selection" symbol="gtk_print_operation_set_has_selection">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="group" type="GtkRadioMenuItem*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="has_selection" type="gboolean"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_label" symbol="gtk_radio_menu_item_new_with_label">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_job_name" symbol="gtk_print_operation_set_job_name">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="group" type="GSList*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="job_name" type="gchar*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_label_from_widget" symbol="gtk_radio_menu_item_new_with_label_from_widget">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_n_pages" symbol="gtk_print_operation_set_n_pages">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="group" type="GtkRadioMenuItem*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="n_pages" type="gint"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_radio_menu_item_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_print_settings" symbol="gtk_print_operation_set_print_settings">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="group" type="GSList*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="print_settings" type="GtkPrintSettings*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic_from_widget" symbol="gtk_radio_menu_item_new_with_mnemonic_from_widget">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_show_progress" symbol="gtk_print_operation_set_show_progress">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="group" type="GtkRadioMenuItem*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="show_progress" type="gboolean"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_group" symbol="gtk_radio_menu_item_set_group">
+                       </method>
+                       <method name="set_support_selection" symbol="gtk_print_operation_set_support_selection">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="radio_menu_item" type="GtkRadioMenuItem*"/>
-                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="support_selection" type="gboolean"/>
                                </parameters>
                        </method>
-                       <property name="group" type="GtkRadioMenuItem*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <signal name="group-changed" when="FIRST">
+                       <method name="set_track_print_status" symbol="gtk_print_operation_set_track_print_status">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="radio_menu_item" type="GtkRadioMenuItem*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="track_status" type="gboolean"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkRadioToolButton" parent="GtkToggleToolButton" type-name="GtkRadioToolButton" get-type="gtk_radio_tool_button_get_type">
-                       <implements>
-                               <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*"/>
+                       </method>
+                       <method name="set_unit" symbol="gtk_print_operation_set_unit">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkRadioToolButton*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_radio_tool_button_new">
-                               <return-type type="GtkToolItem*"/>
+                       <method name="set_use_full_page" symbol="gtk_print_operation_set_use_full_page">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="op" type="GtkPrintOperation*"/>
+                                       <parameter name="full_page" type="gboolean"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_stock" symbol="gtk_radio_tool_button_new_from_stock">
-                               <return-type type="GtkToolItem*"/>
+                       </method>
+                       <property name="allow-async" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <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"/>
+                       <signal name="begin-print" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="group" type="GSList*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="operation" type="GtkPrintOperation*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_widget" symbol="gtk_radio_tool_button_new_from_widget">
-                               <return-type type="GtkToolItem*"/>
+                       </signal>
+                       <signal name="create-custom-widget" when="LAST">
+                               <return-type type="GObject*"/>
                                <parameters>
-                                       <parameter name="group" type="GtkRadioToolButton*"/>
+                                       <parameter name="operation" type="GtkPrintOperation*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_stock_from_widget" symbol="gtk_radio_tool_button_new_with_stock_from_widget">
-                               <return-type type="GtkToolItem*"/>
+                       </signal>
+                       <signal name="custom-widget-apply" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="group" type="GtkRadioToolButton*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="operation" type="GtkPrintOperation*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_group" symbol="gtk_radio_tool_button_set_group">
+                       </signal>
+                       <signal name="done" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkRadioToolButton*"/>
-                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="operation" type="GtkPrintOperation*"/>
+                                       <parameter name="result" type="GtkPrintOperationResult"/>
                                </parameters>
-                       </method>
-                       <property name="group" type="GtkRadioToolButton*" readable="0" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkRange" parent="GtkWidget" type-name="GtkRange" get-type="gtk_range_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <method name="get_adjustment" symbol="gtk_range_get_adjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       </signal>
+                       <signal name="draw-page" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="operation" type="GtkPrintOperation*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="page_nr" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="get_fill_level" symbol="gtk_range_get_fill_level">
-                               <return-type type="gdouble"/>
+                       </signal>
+                       <signal name="end-print" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="operation" type="GtkPrintOperation*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
-                       </method>
-                       <method name="get_flippable" symbol="gtk_range_get_flippable">
+                       </signal>
+                       <signal name="paginate" when="LAST">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="operation" type="GtkPrintOperation*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
                                </parameters>
-                       </method>
-                       <method name="get_inverted" symbol="gtk_range_get_inverted">
+                       </signal>
+                       <signal name="preview" when="LAST">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="operation" type="GtkPrintOperation*"/>
+                                       <parameter name="preview" type="GtkPrintOperationPreview*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="parent" type="GtkWindow*"/>
                                </parameters>
-                       </method>
-                       <method name="get_lower_stepper_sensitivity" symbol="gtk_range_get_lower_stepper_sensitivity">
-                               <return-type type="GtkSensitivityType"/>
+                       </signal>
+                       <signal name="request-page-setup" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_min_slider_size" symbol="gtk_range_get_min_slider_size">
-                               <return-type type="gint"/>
+                                       <parameter name="operation" type="GtkPrintOperation*"/>
+                                       <parameter name="context" type="GtkPrintContext*"/>
+                                       <parameter name="page_nr" type="gint"/>
+                                       <parameter name="setup" type="GtkPageSetup*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="status-changed" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="operation" type="GtkPrintOperation*"/>
                                </parameters>
-                       </method>
-                       <method name="get_range_rect" symbol="gtk_range_get_range_rect">
+                       </signal>
+                       <signal name="update-custom-widget" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="range_rect" type="GdkRectangle*"/>
+                                       <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">
+                               <return-type type="GtkPrintSettings*"/>
+                               <parameters>
+                                       <parameter name="other" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="get_restrict_to_fill_level" symbol="gtk_range_get_restrict_to_fill_level">
-                               <return-type type="gboolean"/>
+                       <method name="foreach" symbol="gtk_print_settings_foreach">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="func" type="GtkPrintSettingsFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="get_show_fill_level" symbol="gtk_range_get_show_fill_level">
-                               <return-type type="gboolean"/>
+                       <method name="get" symbol="gtk_print_settings_get">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_slider_range" symbol="gtk_range_get_slider_range">
-                               <return-type type="void"/>
+                       <method name="get_bool" symbol="gtk_print_settings_get_bool">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="slider_start" type="gint*"/>
-                                       <parameter name="slider_end" type="gint*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_slider_size_fixed" symbol="gtk_range_get_slider_size_fixed">
+                       <method name="get_collate" symbol="gtk_print_settings_get_collate">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="get_update_policy" symbol="gtk_range_get_update_policy">
-                               <return-type type="GtkUpdateType"/>
+                       <method name="get_default_source" symbol="gtk_print_settings_get_default_source">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="get_upper_stepper_sensitivity" symbol="gtk_range_get_upper_stepper_sensitivity">
-                               <return-type type="GtkSensitivityType"/>
+                       <method name="get_dither" symbol="gtk_print_settings_get_dither">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="get_value" symbol="gtk_range_get_value">
+                       <method name="get_double" symbol="gtk_print_settings_get_double">
                                <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_adjustment" symbol="gtk_range_set_adjustment">
-                               <return-type type="void"/>
+                       <method name="get_double_with_default" symbol="gtk_print_settings_get_double_with_default">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="def" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="set_fill_level" symbol="gtk_range_set_fill_level">
-                               <return-type type="void"/>
+                       <method name="get_duplex" symbol="gtk_print_settings_get_duplex">
+                               <return-type type="GtkPrintDuplex"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="fill_level" type="gdouble"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="set_flippable" symbol="gtk_range_set_flippable">
-                               <return-type type="void"/>
+                       <method name="get_finishings" symbol="gtk_print_settings_get_finishings">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="flippable" type="gboolean"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="set_increments" symbol="gtk_range_set_increments">
-                               <return-type type="void"/>
+                       <method name="get_int" symbol="gtk_print_settings_get_int">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="step" type="gdouble"/>
-                                       <parameter name="page" type="gdouble"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_inverted" symbol="gtk_range_set_inverted">
-                               <return-type type="void"/>
+                       <method name="get_int_with_default" symbol="gtk_print_settings_get_int_with_default">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="def" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_lower_stepper_sensitivity" symbol="gtk_range_set_lower_stepper_sensitivity">
-                               <return-type type="void"/>
+                       <method name="get_length" symbol="gtk_print_settings_get_length">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="sensitivity" type="GtkSensitivityType"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="set_min_slider_size" symbol="gtk_range_set_min_slider_size">
-                               <return-type type="void"/>
+                       <method name="get_media_type" symbol="gtk_print_settings_get_media_type">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="min_size" type="gint"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="set_range" symbol="gtk_range_set_range">
-                               <return-type type="void"/>
+                       <method name="get_n_copies" symbol="gtk_print_settings_get_n_copies">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="min" type="gdouble"/>
-                                       <parameter name="max" type="gdouble"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="set_restrict_to_fill_level" symbol="gtk_range_set_restrict_to_fill_level">
-                               <return-type type="void"/>
+                       <method name="get_number_up" symbol="gtk_print_settings_get_number_up">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="restrict_to_fill_level" type="gboolean"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="set_show_fill_level" symbol="gtk_range_set_show_fill_level">
-                               <return-type type="void"/>
+                       <method name="get_number_up_layout" symbol="gtk_print_settings_get_number_up_layout">
+                               <return-type type="GtkNumberUpLayout"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="show_fill_level" type="gboolean"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="set_slider_size_fixed" symbol="gtk_range_set_slider_size_fixed">
-                               <return-type type="void"/>
+                       <method name="get_orientation" symbol="gtk_print_settings_get_orientation">
+                               <return-type type="GtkPageOrientation"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="size_fixed" type="gboolean"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="set_update_policy" symbol="gtk_range_set_update_policy">
-                               <return-type type="void"/>
+                       <method name="get_output_bin" symbol="gtk_print_settings_get_output_bin">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="policy" type="GtkUpdateType"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <method name="set_upper_stepper_sensitivity" symbol="gtk_range_set_upper_stepper_sensitivity">
-                               <return-type type="void"/>
+                       <method name="get_page_ranges" symbol="gtk_print_settings_get_page_ranges">
+                               <return-type type="GtkPageRange*"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="sensitivity" type="GtkSensitivityType"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="num_ranges" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_value" symbol="gtk_range_set_value">
-                               <return-type type="void"/>
+                       <method name="get_page_set" symbol="gtk_print_settings_get_page_set">
+                               <return-type type="GtkPageSet"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="value" type="gdouble"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <property name="adjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="fill-level" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="inverted" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="lower-stepper-sensitivity" type="GtkSensitivityType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="restrict-to-fill-level" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-fill-level" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="update-policy" type="GtkUpdateType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="upper-stepper-sensitivity" type="GtkSensitivityType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="adjust-bounds" when="LAST">
-                               <return-type type="void"/>
+                       <method name="get_paper_height" symbol="gtk_print_settings_get_paper_height">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="new_value" type="gdouble"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
-                       </signal>
-                       <signal name="change-value" when="LAST">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <method name="get_paper_size" symbol="gtk_print_settings_get_paper_size">
+                               <return-type type="GtkPaperSize*"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="scroll" type="GtkScrollType"/>
-                                       <parameter name="new_value" type="gdouble"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
-                       </signal>
-                       <signal name="move-slider" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_paper_width" symbol="gtk_print_settings_get_paper_width">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="scroll" type="GtkScrollType"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
-                       </signal>
-                       <signal name="value-changed" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_print_pages" symbol="gtk_print_settings_get_print_pages">
+                               <return-type type="GtkPrintPages"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="get_range_border">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_printer" symbol="gtk_print_settings_get_printer">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="range" type="GtkRange*"/>
-                                       <parameter name="border_" type="GtkBorder*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkRcStyle" parent="GObject" type-name="GtkRcStyle" get-type="gtk_rc_style_get_type">
-                       <method name="copy" symbol="gtk_rc_style_copy">
-                               <return-type type="GtkRcStyle*"/>
+                       </method>
+                       <method name="get_printer_lpi" symbol="gtk_print_settings_get_printer_lpi">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="orig" type="GtkRcStyle*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_rc_style_new">
-                               <return-type type="GtkRcStyle*"/>
-                       </constructor>
-                       <vfunc name="create_rc_style">
-                               <return-type type="GtkRcStyle*"/>
+                       <method name="get_quality" symbol="gtk_print_settings_get_quality">
+                               <return-type type="GtkPrintQuality"/>
                                <parameters>
-                                       <parameter name="rc_style" type="GtkRcStyle*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="create_style">
-                               <return-type type="GtkStyle*"/>
+                       </method>
+                       <method name="get_resolution" symbol="gtk_print_settings_get_resolution">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="rc_style" type="GtkRcStyle*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="merge">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_resolution_x" symbol="gtk_print_settings_get_resolution_x">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="dest" type="GtkRcStyle*"/>
-                                       <parameter name="src" type="GtkRcStyle*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="parse">
-                               <return-type type="guint"/>
+                       </method>
+                       <method name="get_resolution_y" symbol="gtk_print_settings_get_resolution_y">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="rc_style" type="GtkRcStyle*"/>
-                                       <parameter name="settings" type="GtkSettings*"/>
-                                       <parameter name="scanner" type="GScanner*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
-                       </vfunc>
-                       <field name="name" type="gchar*"/>
-                       <field name="bg_pixmap_name" type="gchar*[]"/>
-                       <field name="font_desc" type="PangoFontDescription*"/>
-                       <field name="color_flags" type="GtkRcFlags[]"/>
-                       <field name="fg" type="GdkColor[]"/>
-                       <field name="bg" type="GdkColor[]"/>
-                       <field name="text" type="GdkColor[]"/>
-                       <field name="base" type="GdkColor[]"/>
-                       <field name="xthickness" type="gint"/>
-                       <field name="ythickness" type="gint"/>
-                       <field name="rc_properties" type="GArray*"/>
-                       <field name="rc_style_lists" type="GSList*"/>
-                       <field name="icon_factories" type="GSList*"/>
-                       <field name="engine_specified" type="guint"/>
-               </object>
-               <object name="GtkRecentAction" parent="GtkAction" type-name="GtkRecentAction" get-type="gtk_recent_action_get_type">
-                       <implements>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkRecentChooser"/>
-                       </implements>
-                       <method name="get_show_numbers" symbol="gtk_recent_action_get_show_numbers">
+                       </method>
+                       <method name="get_reverse" symbol="gtk_print_settings_get_reverse">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="action" type="GtkRecentAction*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_recent_action_new">
-                               <return-type type="GtkAction*"/>
+                       <method name="get_scale" symbol="gtk_print_settings_get_scale">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="label" type="gchar*"/>
-                                       <parameter name="tooltip" type="gchar*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_for_manager" symbol="gtk_recent_action_new_for_manager">
-                               <return-type type="GtkAction*"/>
+                       </method>
+                       <method name="get_use_color" symbol="gtk_print_settings_get_use_color">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="label" type="gchar*"/>
-                                       <parameter name="tooltip" type="gchar*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_show_numbers" symbol="gtk_recent_action_set_show_numbers">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="has_key" symbol="gtk_print_settings_has_key">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="action" type="GtkRecentAction*"/>
-                                       <parameter name="show_numbers" type="gboolean"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
                                </parameters>
                        </method>
-                       <property name="show-numbers" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkRecentChooserDialog" parent="GtkDialog" type-name="GtkRecentChooserDialog" get-type="gtk_recent_chooser_dialog_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkRecentChooser"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_recent_chooser_dialog_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="load_file" symbol="gtk_print_settings_load_file">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="parent" type="GtkWindow*"/>
-                                       <parameter name="first_button_text" type="gchar*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="file_name" type="gchar*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_for_manager" symbol="gtk_recent_chooser_dialog_new_for_manager">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="load_key_file" symbol="gtk_print_settings_load_key_file">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="parent" type="GtkWindow*"/>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
-                                       <parameter name="first_button_text" type="gchar*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key_file" type="GKeyFile*"/>
+                                       <parameter name="group_name" type="gchar*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_print_settings_new">
+                               <return-type type="GtkPrintSettings*"/>
                        </constructor>
-               </object>
-               <object name="GtkRecentChooserMenu" parent="GtkMenu" type-name="GtkRecentChooserMenu" get-type="gtk_recent_chooser_menu_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkRecentChooser"/>
-                               <interface name="GtkActivatable"/>
-                       </implements>
-                       <method name="get_show_numbers" symbol="gtk_recent_chooser_menu_get_show_numbers">
-                               <return-type type="gboolean"/>
+                       <constructor name="new_from_file" symbol="gtk_print_settings_new_from_file">
+                               <return-type type="GtkPrintSettings*"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkRecentChooserMenu*"/>
+                                       <parameter name="file_name" type="gchar*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_recent_chooser_menu_new">
-                               <return-type type="GtkWidget*"/>
                        </constructor>
-                       <constructor name="new_for_manager" symbol="gtk_recent_chooser_menu_new_for_manager">
-                               <return-type type="GtkWidget*"/>
+                       <constructor name="new_from_key_file" symbol="gtk_print_settings_new_from_key_file">
+                               <return-type type="GtkPrintSettings*"/>
                                <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="key_file" type="GKeyFile*"/>
+                                       <parameter name="group_name" type="gchar*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </constructor>
-                       <method name="set_show_numbers" symbol="gtk_recent_chooser_menu_set_show_numbers">
+                       <method name="set" symbol="gtk_print_settings_set">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkRecentChooserMenu*"/>
-                                       <parameter name="show_numbers" type="gboolean"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="value" type="gchar*"/>
                                </parameters>
                        </method>
-                       <property name="show-numbers" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <vfunc name="gtk_recent1">
-                               <return-type type="void"/>
-                       </vfunc>
-                       <vfunc name="gtk_recent2">
-                               <return-type type="void"/>
-                       </vfunc>
-                       <vfunc name="gtk_recent3">
-                               <return-type type="void"/>
-                       </vfunc>
-                       <vfunc name="gtk_recent4">
+                       <method name="set_bool" symbol="gtk_print_settings_set_bool">
                                <return-type type="void"/>
-                       </vfunc>
-               </object>
-               <object name="GtkRecentChooserWidget" parent="GtkVBox" type-name="GtkRecentChooserWidget" get-type="gtk_recent_chooser_widget_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                               <interface name="GtkRecentChooser"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_recent_chooser_widget_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_for_manager" symbol="gtk_recent_chooser_widget_new_for_manager">
-                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="value" type="gboolean"/>
                                </parameters>
-                       </constructor>
-               </object>
-               <object name="GtkRecentFilter" parent="GInitiallyUnowned" type-name="GtkRecentFilter" get-type="gtk_recent_filter_get_type">
-                       <method name="add_age" symbol="gtk_recent_filter_add_age">
+                       </method>
+                       <method name="set_collate" symbol="gtk_print_settings_set_collate">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkRecentFilter*"/>
-                                       <parameter name="days" type="gint"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="collate" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="add_application" symbol="gtk_recent_filter_add_application">
+                       <method name="set_default_source" symbol="gtk_print_settings_set_default_source">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkRecentFilter*"/>
-                                       <parameter name="application" type="gchar*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="default_source" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="add_custom" symbol="gtk_recent_filter_add_custom">
+                       <method name="set_dither" symbol="gtk_print_settings_set_dither">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkRecentFilter*"/>
-                                       <parameter name="needed" type="GtkRecentFilterFlags"/>
-                                       <parameter name="func" type="GtkRecentFilterFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="data_destroy" type="GDestroyNotify"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="dither" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="add_group" symbol="gtk_recent_filter_add_group">
+                       <method name="set_double" symbol="gtk_print_settings_set_double">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkRecentFilter*"/>
-                                       <parameter name="group" type="gchar*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="value" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="add_mime_type" symbol="gtk_recent_filter_add_mime_type">
+                       <method name="set_duplex" symbol="gtk_print_settings_set_duplex">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkRecentFilter*"/>
-                                       <parameter name="mime_type" type="gchar*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="duplex" type="GtkPrintDuplex"/>
                                </parameters>
                        </method>
-                       <method name="add_pattern" symbol="gtk_recent_filter_add_pattern">
+                       <method name="set_finishings" symbol="gtk_print_settings_set_finishings">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkRecentFilter*"/>
-                                       <parameter name="pattern" type="gchar*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="finishings" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="add_pixbuf_formats" symbol="gtk_recent_filter_add_pixbuf_formats">
+                       <method name="set_int" symbol="gtk_print_settings_set_int">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkRecentFilter*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="value" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="filter" symbol="gtk_recent_filter_filter">
-                               <return-type type="gboolean"/>
+                       <method name="set_length" symbol="gtk_print_settings_set_length">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkRecentFilter*"/>
-                                       <parameter name="filter_info" type="GtkRecentFilterInfo*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="value" type="gdouble"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="get_name" symbol="gtk_recent_filter_get_name">
-                               <return-type type="gchar*"/>
+                       <method name="set_media_type" symbol="gtk_print_settings_set_media_type">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkRecentFilter*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="media_type" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_needed" symbol="gtk_recent_filter_get_needed">
-                               <return-type type="GtkRecentFilterFlags"/>
+                       <method name="set_n_copies" symbol="gtk_print_settings_set_n_copies">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkRecentFilter*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="num_copies" type="gint"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_recent_filter_new">
-                               <return-type type="GtkRecentFilter*"/>
-                       </constructor>
-                       <method name="set_name" symbol="gtk_recent_filter_set_name">
+                       <method name="set_number_up" symbol="gtk_print_settings_set_number_up">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkRecentFilter*"/>
-                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="number_up" type="gint"/>
                                </parameters>
                        </method>
-               </object>
-               <object name="GtkRecentManager" parent="GObject" type-name="GtkRecentManager" get-type="gtk_recent_manager_get_type">
-                       <method name="add_full" symbol="gtk_recent_manager_add_full">
-                               <return-type type="gboolean"/>
+                       <method name="set_number_up_layout" symbol="gtk_print_settings_set_number_up_layout">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
-                                       <parameter name="uri" type="gchar*"/>
-                                       <parameter name="recent_data" type="GtkRecentData*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="number_up_layout" type="GtkNumberUpLayout"/>
                                </parameters>
                        </method>
-                       <method name="add_item" symbol="gtk_recent_manager_add_item">
-                               <return-type type="gboolean"/>
+                       <method name="set_orientation" symbol="gtk_print_settings_set_orientation">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
-                                       <parameter name="uri" type="gchar*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="orientation" type="GtkPageOrientation"/>
                                </parameters>
                        </method>
-                       <method name="error_quark" symbol="gtk_recent_manager_error_quark">
-                               <return-type type="GQuark"/>
+                       <method name="set_output_bin" symbol="gtk_print_settings_set_output_bin">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="output_bin" type="gchar*"/>
+                               </parameters>
                        </method>
-                       <method name="get_default" symbol="gtk_recent_manager_get_default">
-                               <return-type type="GtkRecentManager*"/>
+                       <method name="set_page_ranges" symbol="gtk_print_settings_set_page_ranges">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="page_ranges" type="GtkPageRange*"/>
+                                       <parameter name="num_ranges" type="gint"/>
+                               </parameters>
                        </method>
-                       <method name="get_items" symbol="gtk_recent_manager_get_items">
-                               <return-type type="GList*"/>
+                       <method name="set_page_set" symbol="gtk_print_settings_set_page_set">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="page_set" type="GtkPageSet"/>
                                </parameters>
                        </method>
-                       <method name="has_item" symbol="gtk_recent_manager_has_item">
-                               <return-type type="gboolean"/>
+                       <method name="set_paper_height" symbol="gtk_print_settings_set_paper_height">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
-                                       <parameter name="uri" type="gchar*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="height" type="gdouble"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="lookup_item" symbol="gtk_recent_manager_lookup_item">
-                               <return-type type="GtkRecentInfo*"/>
+                       <method name="set_paper_size" symbol="gtk_print_settings_set_paper_size">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
-                                       <parameter name="uri" type="gchar*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="paper_size" type="GtkPaperSize*"/>
                                </parameters>
                        </method>
-                       <method name="move_item" symbol="gtk_recent_manager_move_item">
-                               <return-type type="gboolean"/>
+                       <method name="set_paper_width" symbol="gtk_print_settings_set_paper_width">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
-                                       <parameter name="uri" type="gchar*"/>
-                                       <parameter name="new_uri" type="gchar*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_recent_manager_new">
-                               <return-type type="GtkRecentManager*"/>
-                       </constructor>
-                       <method name="purge_items" symbol="gtk_recent_manager_purge_items">
-                               <return-type type="gint"/>
+                       <method name="set_print_pages" symbol="gtk_print_settings_set_print_pages">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="pages" type="GtkPrintPages"/>
                                </parameters>
                        </method>
-                       <method name="remove_item" symbol="gtk_recent_manager_remove_item">
-                               <return-type type="gboolean"/>
+                       <method name="set_printer" symbol="gtk_print_settings_set_printer">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
-                                       <parameter name="uri" type="gchar*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="printer" type="gchar*"/>
                                </parameters>
                        </method>
-                       <property name="filename" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="size" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <signal name="changed" when="FIRST">
+                       <method name="set_printer_lpi" symbol="gtk_print_settings_set_printer_lpi">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="lpi" type="gdouble"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkRuler" parent="GtkWidget" type-name="GtkRuler" get-type="gtk_ruler_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <method name="get_metric" symbol="gtk_ruler_get_metric">
-                               <return-type type="GtkMetricType"/>
+                       </method>
+                       <method name="set_quality" symbol="gtk_print_settings_set_quality">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ruler" type="GtkRuler*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="quality" type="GtkPrintQuality"/>
                                </parameters>
                        </method>
-                       <method name="get_range" symbol="gtk_ruler_get_range">
+                       <method name="set_resolution" symbol="gtk_print_settings_set_resolution">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ruler" type="GtkRuler*"/>
-                                       <parameter name="lower" type="gdouble*"/>
-                                       <parameter name="upper" type="gdouble*"/>
-                                       <parameter name="position" type="gdouble*"/>
-                                       <parameter name="max_size" type="gdouble*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="resolution" type="gint"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_ruler_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="set_resolution_xy" symbol="gtk_print_settings_set_resolution_xy">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="resolution_x" type="gint"/>
+                                       <parameter name="resolution_y" type="gint"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_metric" symbol="gtk_ruler_set_metric">
+                       </method>
+                       <method name="set_reverse" symbol="gtk_print_settings_set_reverse">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="reverse" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_scale" symbol="gtk_print_settings_set_scale">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ruler" type="GtkRuler*"/>
-                                       <parameter name="metric" type="GtkMetricType"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="scale" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="set_range" symbol="gtk_ruler_set_range">
+                       <method name="set_use_color" symbol="gtk_print_settings_set_use_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ruler" type="GtkRuler*"/>
-                                       <parameter name="lower" type="gdouble"/>
-                                       <parameter name="upper" type="gdouble"/>
-                                       <parameter name="position" type="gdouble"/>
-                                       <parameter name="max_size" type="gdouble"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="use_color" type="gboolean"/>
                                </parameters>
                        </method>
-                       <property name="lower" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="max-size" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="metric" type="GtkMetricType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="position" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="upper" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <vfunc name="draw_pos">
+                       <method name="to_file" symbol="gtk_print_settings_to_file">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="file_name" type="gchar*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </method>
+                       <method name="to_key_file" symbol="gtk_print_settings_to_key_file">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ruler" type="GtkRuler*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key_file" type="GKeyFile*"/>
+                                       <parameter name="group_name" type="gchar*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_ticks">
+                       </method>
+                       <method name="unset" symbol="gtk_print_settings_unset">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ruler" type="GtkRuler*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="settings" type="GtkPrintSettings*"/>
+                                       <parameter name="key" type="gchar*"/>
                                </parameters>
-                       </vfunc>
+                       </method>
                </object>
-               <object name="GtkScale" parent="GtkRange" type-name="GtkScale" get-type="gtk_scale_get_type">
+               <object name="GtkProgressBar" parent="GtkWidget" type-name="GtkProgressBar" get-type="gtk_progress_bar_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
                                <interface name="GtkOrientable"/>
                        </implements>
-                       <method name="add_mark" symbol="gtk_scale_add_mark">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
-                                       <parameter name="value" type="gdouble"/>
-                                       <parameter name="position" type="GtkPositionType"/>
-                                       <parameter name="markup" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="clear_marks" symbol="gtk_scale_clear_marks">
-                               <return-type type="void"/>
+                       <method name="get_ellipsize" symbol="gtk_progress_bar_get_ellipsize">
+                               <return-type type="PangoEllipsizeMode"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
                                </parameters>
                        </method>
-                       <method name="get_digits" symbol="gtk_scale_get_digits">
-                               <return-type type="gint"/>
+                       <method name="get_fraction" symbol="gtk_progress_bar_get_fraction">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
                                </parameters>
                        </method>
-                       <method name="get_draw_value" symbol="gtk_scale_get_draw_value">
+                       <method name="get_inverted" symbol="gtk_progress_bar_get_inverted">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
                                </parameters>
                        </method>
-                       <method name="get_layout" symbol="gtk_scale_get_layout">
-                               <return-type type="PangoLayout*"/>
+                       <method name="get_pulse_step" symbol="gtk_progress_bar_get_pulse_step">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
                                </parameters>
                        </method>
-                       <method name="get_layout_offsets" symbol="gtk_scale_get_layout_offsets">
-                               <return-type type="void"/>
+                       <method name="get_show_text" symbol="gtk_progress_bar_get_show_text">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
-                                       <parameter name="x" type="gint*"/>
-                                       <parameter name="y" type="gint*"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
                                </parameters>
                        </method>
-                       <method name="get_value_pos" symbol="gtk_scale_get_value_pos">
-                               <return-type type="GtkPositionType"/>
+                       <method name="get_text" symbol="gtk_progress_bar_get_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_scale_new">
+                       <constructor name="new" symbol="gtk_progress_bar_new">
                                <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="orientation" type="GtkOrientation"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
-                               </parameters>
                        </constructor>
-                       <constructor name="new_with_range" symbol="gtk_scale_new_with_range">
-                               <return-type type="GtkWidget*"/>
+                       <method name="pulse" symbol="gtk_progress_bar_pulse">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="orientation" type="GtkOrientation"/>
-                                       <parameter name="min" type="gdouble"/>
-                                       <parameter name="max" type="gdouble"/>
-                                       <parameter name="step" type="gdouble"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_digits" symbol="gtk_scale_set_digits">
+                       </method>
+                       <method name="set_ellipsize" symbol="gtk_progress_bar_set_ellipsize">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
-                                       <parameter name="digits" type="gint"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="mode" type="PangoEllipsizeMode"/>
                                </parameters>
                        </method>
-                       <method name="set_draw_value" symbol="gtk_scale_set_draw_value">
+                       <method name="set_fraction" symbol="gtk_progress_bar_set_fraction">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
-                                       <parameter name="draw_value" type="gboolean"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="fraction" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="set_value_pos" symbol="gtk_scale_set_value_pos">
+                       <method name="set_inverted" symbol="gtk_progress_bar_set_inverted">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
-                                       <parameter name="pos" type="GtkPositionType"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="inverted" type="gboolean"/>
                                </parameters>
                        </method>
-                       <property name="digits" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="draw-value" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="value-pos" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="format-value" when="LAST">
-                               <return-type type="char*"/>
+                       <method name="set_pulse_step" symbol="gtk_progress_bar_set_pulse_step">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
-                                       <parameter name="value" type="gdouble"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="fraction" type="gdouble"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="draw_value">
+                       </method>
+                       <method name="set_show_text" symbol="gtk_progress_bar_set_show_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="show_text" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_layout_offsets">
+                       </method>
+                       <method name="set_text" symbol="gtk_progress_bar_set_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scale" type="GtkScale*"/>
-                                       <parameter name="x" type="gint*"/>
-                                       <parameter name="y" type="gint*"/>
+                                       <parameter name="pbar" type="GtkProgressBar*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
-                       </vfunc>
+                       </method>
+                       <property name="ellipsize" type="PangoEllipsizeMode" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="fraction" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="inverted" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pulse-step" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="show-text" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
-               <object name="GtkScaleButton" parent="GtkButton" type-name="GtkScaleButton" get-type="gtk_scale_button_get_type">
+               <object name="GtkRadioAction" parent="GtkToggleAction" type-name="GtkRadioAction" get-type="gtk_radio_action_get_type">
                        <implements>
-                               <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkActivatable"/>
-                               <interface name="GtkOrientable"/>
                        </implements>
-                       <method name="get_adjustment" symbol="gtk_scale_button_get_adjustment">
-                               <return-type type="GtkAdjustment*"/>
-                               <parameters>
-                                       <parameter name="button" type="GtkScaleButton*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_minus_button" symbol="gtk_scale_button_get_minus_button">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="button" type="GtkScaleButton*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_plus_button" symbol="gtk_scale_button_get_plus_button">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_current_value" symbol="gtk_radio_action_get_current_value">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="button" type="GtkScaleButton*"/>
+                                       <parameter name="action" type="GtkRadioAction*"/>
                                </parameters>
                        </method>
-                       <method name="get_popup" symbol="gtk_scale_button_get_popup">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_group" symbol="gtk_radio_action_get_group">
+                               <return-type type="GSList*"/>
                                <parameters>
-                                       <parameter name="button" type="GtkScaleButton*"/>
+                                       <parameter name="action" type="GtkRadioAction*"/>
                                </parameters>
                        </method>
-                       <method name="get_value" symbol="gtk_scale_button_get_value">
-                               <return-type type="gdouble"/>
+                       <method name="join_group" symbol="gtk_radio_action_join_group">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkScaleButton*"/>
+                                       <parameter name="action" type="GtkRadioAction*"/>
+                                       <parameter name="group_source" type="GtkRadioAction*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_scale_button_new">
-                               <return-type type="GtkWidget*"/>
+                       <constructor name="new" symbol="gtk_radio_action_new">
+                               <return-type type="GtkRadioAction*"/>
                                <parameters>
-                                       <parameter name="size" type="GtkIconSize"/>
-                                       <parameter name="min" type="gdouble"/>
-                                       <parameter name="max" type="gdouble"/>
-                                       <parameter name="step" type="gdouble"/>
-                                       <parameter name="icons" type="gchar**"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="tooltip" type="gchar*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="value" type="gint"/>
                                </parameters>
                        </constructor>
-                       <method name="set_adjustment" symbol="gtk_scale_button_set_adjustment">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="button" type="GtkScaleButton*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_icons" symbol="gtk_scale_button_set_icons">
+                       <method name="set_current_value" symbol="gtk_radio_action_set_current_value">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkScaleButton*"/>
-                                       <parameter name="icons" type="gchar**"/>
+                                       <parameter name="action" type="GtkRadioAction*"/>
+                                       <parameter name="current_value" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_value" symbol="gtk_scale_button_set_value">
+                       <method name="set_group" symbol="gtk_radio_action_set_group">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkScaleButton*"/>
-                                       <parameter name="value" type="gdouble"/>
+                                       <parameter name="action" type="GtkRadioAction*"/>
+                                       <parameter name="group" type="GSList*"/>
                                </parameters>
                        </method>
-                       <property name="adjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="icons" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="size" type="GtkIconSize" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="value" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="popdown" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="object" type="GtkScaleButton*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="popup" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="object" type="GtkScaleButton*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="value-changed" when="LAST">
+                       <property name="current-value" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="group" type="GtkRadioAction*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <property name="value" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="changed" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkScaleButton*"/>
-                                       <parameter name="value" type="gdouble"/>
+                                       <parameter name="action" type="GtkRadioAction*"/>
+                                       <parameter name="current" type="GtkRadioAction*"/>
                                </parameters>
                        </signal>
                </object>
-               <object name="GtkScrollbar" parent="GtkRange" type-name="GtkScrollbar" get-type="gtk_scrollbar_get_type">
+               <object name="GtkRadioButton" parent="GtkCheckButton" type-name="GtkRadioButton" get-type="gtk_radio_button_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
+                               <interface name="GtkActivatable"/>
                        </implements>
-                       <constructor name="new" symbol="gtk_scrollbar_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_group" symbol="gtk_radio_button_get_group">
+                               <return-type type="GSList*"/>
                                <parameters>
-                                       <parameter name="orientation" type="GtkOrientation"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="radio_button" type="GtkRadioButton*"/>
                                </parameters>
-                       </constructor>
-               </object>
-               <object name="GtkScrolledWindow" parent="GtkBin" type-name="GtkScrolledWindow" get-type="gtk_scrolled_window_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="add_with_viewport" symbol="gtk_scrolled_window_add_with_viewport">
+                       </method>
+                       <method name="join_group" symbol="gtk_radio_button_join_group">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="radio_button" type="GtkRadioButton*"/>
+                                       <parameter name="group_source" type="GtkRadioButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_hadjustment" symbol="gtk_scrolled_window_get_hadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       <constructor name="new" symbol="gtk_radio_button_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="group" type="GSList*"/>
                                </parameters>
-                       </method>
-                       <method name="get_hscrollbar" symbol="gtk_scrolled_window_get_hscrollbar">
+                       </constructor>
+                       <constructor name="new_from_widget" symbol="gtk_radio_button_new_from_widget">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="radio_group_member" type="GtkRadioButton*"/>
                                </parameters>
-                       </method>
-                       <method name="get_min_content_height" symbol="gtk_scrolled_window_get_min_content_height">
-                               <return-type type="gint"/>
+                       </constructor>
+                       <constructor name="new_with_label" symbol="gtk_radio_button_new_with_label">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="get_min_content_width" symbol="gtk_scrolled_window_get_min_content_width">
-                               <return-type type="gint"/>
+                       </constructor>
+                       <constructor name="new_with_label_from_widget" symbol="gtk_radio_button_new_with_label_from_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="radio_group_member" type="GtkRadioButton*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="get_placement" symbol="gtk_scrolled_window_get_placement">
-                               <return-type type="GtkCornerType"/>
+                       </constructor>
+                       <constructor name="new_with_mnemonic" symbol="gtk_radio_button_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="get_policy" symbol="gtk_scrolled_window_get_policy">
+                       </constructor>
+                       <constructor name="new_with_mnemonic_from_widget" symbol="gtk_radio_button_new_with_mnemonic_from_widget">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="radio_group_member" type="GtkRadioButton*"/>
+                                       <parameter name="label" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_group" symbol="gtk_radio_button_set_group">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
-                                       <parameter name="hscrollbar_policy" type="GtkPolicyType*"/>
-                                       <parameter name="vscrollbar_policy" type="GtkPolicyType*"/>
+                                       <parameter name="radio_button" type="GtkRadioButton*"/>
+                                       <parameter name="group" type="GSList*"/>
                                </parameters>
                        </method>
-                       <method name="get_shadow_type" symbol="gtk_scrolled_window_get_shadow_type">
-                               <return-type type="GtkShadowType"/>
+                       <property name="group" type="GtkRadioButton*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <signal name="group-changed" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="radio_button" type="GtkRadioButton*"/>
                                </parameters>
-                       </method>
-                       <method name="get_vadjustment" symbol="gtk_scrolled_window_get_vadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       </signal>
+               </object>
+               <object name="GtkRadioMenuItem" parent="GtkCheckMenuItem" type-name="GtkRadioMenuItem" get-type="gtk_radio_menu_item_get_type">
+                       <implements>
+                               <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*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="radio_menu_item" type="GtkRadioMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="get_vscrollbar" symbol="gtk_scrolled_window_get_vscrollbar">
+                       <constructor name="new" symbol="gtk_radio_menu_item_new">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="group" type="GSList*"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_scrolled_window_new">
+                       </constructor>
+                       <constructor name="new_from_widget" symbol="gtk_radio_menu_item_new_from_widget">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="hadjustment" type="GtkAdjustment*"/>
-                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
+                                       <parameter name="group" type="GtkRadioMenuItem*"/>
                                </parameters>
                        </constructor>
-                       <method name="set_hadjustment" symbol="gtk_scrolled_window_set_hadjustment">
-                               <return-type type="void"/>
+                       <constructor name="new_with_label" symbol="gtk_radio_menu_item_new_with_label">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
-                                       <parameter name="hadjustment" type="GtkAdjustment*"/>
+                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_min_content_height" symbol="gtk_scrolled_window_set_min_content_height">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_with_label_from_widget" symbol="gtk_radio_menu_item_new_with_label_from_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="group" type="GtkRadioMenuItem*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_min_content_width" symbol="gtk_scrolled_window_set_min_content_width">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_with_mnemonic" symbol="gtk_radio_menu_item_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
-                                       <parameter name="width" type="gint"/>
+                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_placement" symbol="gtk_scrolled_window_set_placement">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_with_mnemonic_from_widget" symbol="gtk_radio_menu_item_new_with_mnemonic_from_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
-                                       <parameter name="window_placement" type="GtkCornerType"/>
+                                       <parameter name="group" type="GtkRadioMenuItem*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_policy" symbol="gtk_scrolled_window_set_policy">
+                       </constructor>
+                       <method name="set_group" symbol="gtk_radio_menu_item_set_group">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
-                                       <parameter name="hscrollbar_policy" type="GtkPolicyType"/>
-                                       <parameter name="vscrollbar_policy" type="GtkPolicyType"/>
+                                       <parameter name="radio_menu_item" type="GtkRadioMenuItem*"/>
+                                       <parameter name="group" type="GSList*"/>
                                </parameters>
                        </method>
-                       <method name="set_shadow_type" symbol="gtk_scrolled_window_set_shadow_type">
+                       <property name="group" type="GtkRadioMenuItem*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <signal name="group-changed" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
-                                       <parameter name="type" type="GtkShadowType"/>
+                                       <parameter name="radio_menu_item" type="GtkRadioMenuItem*"/>
                                </parameters>
-                       </method>
-                       <method name="set_vadjustment" symbol="gtk_scrolled_window_set_vadjustment">
-                               <return-type type="void"/>
+                       </signal>
+               </object>
+               <object name="GtkRadioToolButton" parent="GtkToggleToolButton" type-name="GtkRadioToolButton" get-type="gtk_radio_tool_button_get_type">
+                       <implements>
+                               <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*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
-                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
+                                       <parameter name="button" type="GtkRadioToolButton*"/>
                                </parameters>
                        </method>
-                       <method name="unset_placement" symbol="gtk_scrolled_window_unset_placement">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_radio_tool_button_new">
+                               <return-type type="GtkToolItem*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="group" type="GSList*"/>
                                </parameters>
-                       </method>
-                       <property name="hadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="hscrollbar-policy" type="GtkPolicyType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="min-content-height" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="min-content-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="vadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="vscrollbar-policy" type="GtkPolicyType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="window-placement" type="GtkCornerType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="window-placement-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="move-focus-out" when="LAST">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_from_stock" symbol="gtk_radio_tool_button_new_from_stock">
+                               <return-type type="GtkToolItem*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
-                                       <parameter name="direction" type="GtkDirectionType"/>
+                                       <parameter name="group" type="GSList*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="scroll-child" when="LAST">
-                               <return-type type="gboolean"/>
+                       </constructor>
+                       <constructor name="new_from_widget" symbol="gtk_radio_tool_button_new_from_widget">
+                               <return-type type="GtkToolItem*"/>
                                <parameters>
-                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
-                                       <parameter name="scroll" type="GtkScrollType"/>
-                                       <parameter name="horizontal" type="gboolean"/>
+                                       <parameter name="group" type="GtkRadioToolButton*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkSeparator" parent="GtkWidget" type-name="GtkSeparator" get-type="gtk_separator_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_separator_new">
-                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_stock_from_widget" symbol="gtk_radio_tool_button_new_with_stock_from_widget">
+                               <return-type type="GtkToolItem*"/>
                                <parameters>
-                                       <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="group" type="GtkRadioToolButton*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
                                </parameters>
                        </constructor>
+                       <method name="set_group" symbol="gtk_radio_tool_button_set_group">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="button" type="GtkRadioToolButton*"/>
+                                       <parameter name="group" type="GSList*"/>
+                               </parameters>
+                       </method>
+                       <property name="group" type="GtkRadioToolButton*" readable="0" writable="1" construct="0" construct-only="0"/>
                </object>
-               <object name="GtkSeparatorMenuItem" parent="GtkMenuItem" type-name="GtkSeparatorMenuItem" get-type="gtk_separator_menu_item_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkActivatable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_separator_menu_item_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-               </object>
-               <object name="GtkSeparatorToolItem" parent="GtkToolItem" type-name="GtkSeparatorToolItem" get-type="gtk_separator_tool_item_get_type">
+               <object name="GtkRange" parent="GtkWidget" type-name="GtkRange" get-type="gtk_range_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkActivatable"/>
+                               <interface name="GtkOrientable"/>
                        </implements>
-                       <method name="get_draw" symbol="gtk_separator_tool_item_get_draw">
+                       <method name="get_adjustment" symbol="gtk_range_get_adjustment">
+                               <return-type type="GtkAdjustment*"/>
+                               <parameters>
+                                       <parameter name="range" type="GtkRange*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_fill_level" symbol="gtk_range_get_fill_level">
+                               <return-type type="gdouble"/>
+                               <parameters>
+                                       <parameter name="range" type="GtkRange*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_flippable" symbol="gtk_range_get_flippable">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="item" type="GtkSeparatorToolItem*"/>
+                                       <parameter name="range" type="GtkRange*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_separator_tool_item_new">
-                               <return-type type="GtkToolItem*"/>
-                       </constructor>
-                       <method name="set_draw" symbol="gtk_separator_tool_item_set_draw">
+                       <method name="get_inverted" symbol="gtk_range_get_inverted">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="range" type="GtkRange*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_lower_stepper_sensitivity" symbol="gtk_range_get_lower_stepper_sensitivity">
+                               <return-type type="GtkSensitivityType"/>
+                               <parameters>
+                                       <parameter name="range" type="GtkRange*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_min_slider_size" symbol="gtk_range_get_min_slider_size">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="range" type="GtkRange*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_range_rect" symbol="gtk_range_get_range_rect">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="item" type="GtkSeparatorToolItem*"/>
-                                       <parameter name="draw" type="gboolean"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="range_rect" type="GdkRectangle*"/>
                                </parameters>
                        </method>
-                       <property name="draw" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkSettings" parent="GObject" type-name="GtkSettings" get-type="gtk_settings_get_type">
-                       <method name="get_default" symbol="gtk_settings_get_default">
-                               <return-type type="GtkSettings*"/>
+                       <method name="get_restrict_to_fill_level" symbol="gtk_range_get_restrict_to_fill_level">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="range" type="GtkRange*"/>
+                               </parameters>
                        </method>
-                       <method name="get_for_screen" symbol="gtk_settings_get_for_screen">
-                               <return-type type="GtkSettings*"/>
+                       <method name="get_show_fill_level" symbol="gtk_range_get_show_fill_level">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="range" type="GtkRange*"/>
                                </parameters>
                        </method>
-                       <method name="install_property" symbol="gtk_settings_install_property">
+                       <method name="get_slider_range" symbol="gtk_range_get_slider_range">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="slider_start" type="gint*"/>
+                                       <parameter name="slider_end" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="install_property_parser" symbol="gtk_settings_install_property_parser">
+                       <method name="get_slider_size_fixed" symbol="gtk_range_get_slider_size_fixed">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="range" type="GtkRange*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_upper_stepper_sensitivity" symbol="gtk_range_get_upper_stepper_sensitivity">
+                               <return-type type="GtkSensitivityType"/>
+                               <parameters>
+                                       <parameter name="range" type="GtkRange*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_value" symbol="gtk_range_get_value">
+                               <return-type type="gdouble"/>
+                               <parameters>
+                                       <parameter name="range" type="GtkRange*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_adjustment" symbol="gtk_range_set_adjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="pspec" type="GParamSpec*"/>
-                                       <parameter name="parser" type="GtkRcPropertyParser"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <method name="set_double_property" symbol="gtk_settings_set_double_property">
+                       <method name="set_fill_level" symbol="gtk_range_set_fill_level">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkSettings*"/>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="v_double" type="gdouble"/>
-                                       <parameter name="origin" type="gchar*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="fill_level" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="set_long_property" symbol="gtk_settings_set_long_property">
+                       <method name="set_flippable" symbol="gtk_range_set_flippable">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkSettings*"/>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="v_long" type="glong"/>
-                                       <parameter name="origin" type="gchar*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="flippable" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_property_value" symbol="gtk_settings_set_property_value">
+                       <method name="set_increments" symbol="gtk_range_set_increments">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkSettings*"/>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="svalue" type="GtkSettingsValue*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="step" type="gdouble"/>
+                                       <parameter name="page" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="set_string_property" symbol="gtk_settings_set_string_property">
+                       <method name="set_inverted" symbol="gtk_range_set_inverted">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="settings" type="GtkSettings*"/>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="v_string" type="gchar*"/>
-                                       <parameter name="origin" type="gchar*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <property name="color-hash" type="GHashTable*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="gtk-alternative-button-order" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-alternative-sort-arrows" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-application-prefer-dark-theme" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-auto-mnemonics" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-button-images" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-can-change-accels" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-color-palette" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-color-scheme" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-cursor-blink" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-cursor-blink-time" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-cursor-blink-timeout" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-cursor-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-cursor-theme-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-dnd-drag-threshold" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-double-click-distance" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-double-click-time" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-enable-accels" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-enable-animations" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-enable-event-sounds" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-enable-input-feedback-sounds" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-enable-mnemonics" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-enable-tooltips" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-entry-password-hint-timeout" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-entry-select-on-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-error-bell" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-fallback-icon-theme" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-file-chooser-backend" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-font-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-fontconfig-timestamp" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-icon-sizes" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-icon-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-im-module" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-im-preedit-style" type="GtkIMPreeditStyle" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-im-status-style" type="GtkIMStatusStyle" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-key-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-keynav-cursor-only" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-keynav-wrap-around" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-label-select-on-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-menu-bar-accel" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-menu-bar-popup-delay" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-menu-images" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-menu-popdown-delay" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-menu-popup-delay" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-modules" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-print-backends" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-print-preview-command" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-recent-files-limit" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-recent-files-max-age" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-scrolled-window-placement" type="GtkCornerType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-show-input-method-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-show-unicode-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-sound-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-split-cursor" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-timeout-expand" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-timeout-initial" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-timeout-repeat" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-toolbar-icon-size" type="GtkIconSize" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-toolbar-style" type="GtkToolbarStyle" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-tooltip-browse-mode-timeout" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-tooltip-browse-timeout" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-tooltip-timeout" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-touchscreen-mode" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-xft-antialias" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-xft-dpi" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-xft-hinting" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-xft-hintstyle" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gtk-xft-rgba" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkSizeGroup" parent="GObject" type-name="GtkSizeGroup" get-type="gtk_size_group_get_type">
-                       <implements>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="add_widget" symbol="gtk_size_group_add_widget">
+                       <method name="set_lower_stepper_sensitivity" symbol="gtk_range_set_lower_stepper_sensitivity">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="size_group" type="GtkSizeGroup*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="sensitivity" type="GtkSensitivityType"/>
                                </parameters>
                        </method>
-                       <method name="get_ignore_hidden" symbol="gtk_size_group_get_ignore_hidden">
-                               <return-type type="gboolean"/>
+                       <method name="set_min_slider_size" symbol="gtk_range_set_min_slider_size">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="size_group" type="GtkSizeGroup*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="min_size" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_mode" symbol="gtk_size_group_get_mode">
-                               <return-type type="GtkSizeGroupMode"/>
+                       <method name="set_range" symbol="gtk_range_set_range">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="size_group" type="GtkSizeGroup*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="min" type="gdouble"/>
+                                       <parameter name="max" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="get_widgets" symbol="gtk_size_group_get_widgets">
-                               <return-type type="GSList*"/>
+                       <method name="set_restrict_to_fill_level" symbol="gtk_range_set_restrict_to_fill_level">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="size_group" type="GtkSizeGroup*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="restrict_to_fill_level" type="gboolean"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_size_group_new">
-                               <return-type type="GtkSizeGroup*"/>
-                               <parameters>
-                                       <parameter name="mode" type="GtkSizeGroupMode"/>
-                               </parameters>
-                       </constructor>
-                       <method name="remove_widget" symbol="gtk_size_group_remove_widget">
+                       <method name="set_show_fill_level" symbol="gtk_range_set_show_fill_level">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="size_group" type="GtkSizeGroup*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="show_fill_level" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_ignore_hidden" symbol="gtk_size_group_set_ignore_hidden">
+                       <method name="set_slider_size_fixed" symbol="gtk_range_set_slider_size_fixed">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="size_group" type="GtkSizeGroup*"/>
-                                       <parameter name="ignore_hidden" type="gboolean"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="size_fixed" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_mode" symbol="gtk_size_group_set_mode">
+                       <method name="set_upper_stepper_sensitivity" symbol="gtk_range_set_upper_stepper_sensitivity">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="size_group" type="GtkSizeGroup*"/>
-                                       <parameter name="mode" type="GtkSizeGroupMode"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="sensitivity" type="GtkSensitivityType"/>
                                </parameters>
                        </method>
-                       <property name="ignore-hidden" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="mode" type="GtkSizeGroupMode" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkSocket" parent="GtkContainer" type-name="GtkSocket" get-type="gtk_socket_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="add_id" symbol="gtk_socket_add_id">
+                       <method name="set_value" symbol="gtk_range_set_value">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="socket_" type="GtkSocket*"/>
-                                       <parameter name="window_id" type="GdkNativeWindow"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="value" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="get_id" symbol="gtk_socket_get_id">
-                               <return-type type="GdkNativeWindow"/>
+                       <property name="adjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="fill-level" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="inverted" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="lower-stepper-sensitivity" type="GtkSensitivityType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="restrict-to-fill-level" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="show-fill-level" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="upper-stepper-sensitivity" type="GtkSensitivityType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="adjust-bounds" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="socket_" type="GtkSocket*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="new_value" type="gdouble"/>
                                </parameters>
-                       </method>
-                       <method name="get_plug_window" symbol="gtk_socket_get_plug_window">
-                               <return-type type="GdkWindow*"/>
+                       </signal>
+                       <signal name="change-value" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="socket_" type="GtkSocket*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="scroll" type="GtkScrollType"/>
+                                       <parameter name="new_value" type="gdouble"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_socket_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <signal name="plug-added" when="LAST">
+                       </signal>
+                       <signal name="move-slider" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="socket_" type="GtkSocket*"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="scroll" type="GtkScrollType"/>
                                </parameters>
                        </signal>
-                       <signal name="plug-removed" when="LAST">
-                               <return-type type="gboolean"/>
+                       <signal name="value-changed" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="socket_" type="GtkSocket*"/>
+                                       <parameter name="range" type="GtkRange*"/>
                                </parameters>
                        </signal>
-               </object>
-               <object name="GtkSpinButton" parent="GtkEntry" type-name="GtkSpinButton" get-type="gtk_spin_button_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkEditable"/>
-                               <interface name="GtkCellEditable"/>
-                       </implements>
-                       <method name="configure" symbol="gtk_spin_button_configure">
+                       <vfunc name="get_range_border">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
-                                       <parameter name="climb_rate" type="gdouble"/>
-                                       <parameter name="digits" type="guint"/>
+                                       <parameter name="range" type="GtkRange*"/>
+                                       <parameter name="border_" type="GtkBorder*"/>
                                </parameters>
-                       </method>
-                       <method name="get_adjustment" symbol="gtk_spin_button_get_adjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       </vfunc>
+               </object>
+               <object name="GtkRcStyle" parent="GObject" type-name="GtkRcStyle" get-type="gtk_rc_style_get_type">
+                       <method name="copy" symbol="gtk_rc_style_copy">
+                               <return-type type="GtkRcStyle*"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="orig" type="GtkRcStyle*"/>
                                </parameters>
                        </method>
-                       <method name="get_digits" symbol="gtk_spin_button_get_digits">
-                               <return-type type="guint"/>
+                       <constructor name="new" symbol="gtk_rc_style_new">
+                               <return-type type="GtkRcStyle*"/>
+                       </constructor>
+                       <vfunc name="create_rc_style">
+                               <return-type type="GtkRcStyle*"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="rc_style" type="GtkRcStyle*"/>
                                </parameters>
-                       </method>
-                       <method name="get_increments" symbol="gtk_spin_button_get_increments">
-                               <return-type type="void"/>
+                       </vfunc>
+                       <vfunc name="create_style">
+                               <return-type type="GtkStyle*"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="step" type="gdouble*"/>
-                                       <parameter name="page" type="gdouble*"/>
+                                       <parameter name="rc_style" type="GtkRcStyle*"/>
                                </parameters>
-                       </method>
-                       <method name="get_numeric" symbol="gtk_spin_button_get_numeric">
-                               <return-type type="gboolean"/>
+                       </vfunc>
+                       <vfunc name="merge">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="dest" type="GtkRcStyle*"/>
+                                       <parameter name="src" type="GtkRcStyle*"/>
                                </parameters>
-                       </method>
-                       <method name="get_range" symbol="gtk_spin_button_get_range">
-                               <return-type type="void"/>
+                       </vfunc>
+                       <vfunc name="parse">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="min" type="gdouble*"/>
-                                       <parameter name="max" type="gdouble*"/>
+                                       <parameter name="rc_style" type="GtkRcStyle*"/>
+                                       <parameter name="settings" type="GtkSettings*"/>
+                                       <parameter name="scanner" type="GScanner*"/>
                                </parameters>
-                       </method>
-                       <method name="get_snap_to_ticks" symbol="gtk_spin_button_get_snap_to_ticks">
+                       </vfunc>
+                       <field name="name" type="gchar*"/>
+                       <field name="bg_pixmap_name" type="gchar*[]"/>
+                       <field name="font_desc" type="PangoFontDescription*"/>
+                       <field name="color_flags" type="GtkRcFlags[]"/>
+                       <field name="fg" type="GdkColor[]"/>
+                       <field name="bg" type="GdkColor[]"/>
+                       <field name="text" type="GdkColor[]"/>
+                       <field name="base" type="GdkColor[]"/>
+                       <field name="xthickness" type="gint"/>
+                       <field name="ythickness" type="gint"/>
+                       <field name="rc_properties" type="GArray*"/>
+                       <field name="rc_style_lists" type="GSList*"/>
+                       <field name="icon_factories" type="GSList*"/>
+                       <field name="engine_specified" type="guint"/>
+               </object>
+               <object name="GtkRecentAction" parent="GtkAction" type-name="GtkRecentAction" get-type="gtk_recent_action_get_type">
+                       <implements>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkRecentChooser"/>
+                       </implements>
+                       <method name="get_show_numbers" symbol="gtk_recent_action_get_show_numbers">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="action" type="GtkRecentAction*"/>
                                </parameters>
                        </method>
-                       <method name="get_update_policy" symbol="gtk_spin_button_get_update_policy">
-                               <return-type type="GtkSpinButtonUpdatePolicy"/>
-                               <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_value" symbol="gtk_spin_button_get_value">
-                               <return-type type="gdouble"/>
+                       <constructor name="new" symbol="gtk_recent_action_new">
+                               <return-type type="GtkAction*"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="tooltip" type="gchar*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="get_value_as_int" symbol="gtk_spin_button_get_value_as_int">
-                               <return-type type="gint"/>
+                       </constructor>
+                       <constructor name="new_for_manager" symbol="gtk_recent_action_new_for_manager">
+                               <return-type type="GtkAction*"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="tooltip" type="gchar*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
                                </parameters>
-                       </method>
-                       <method name="get_wrap" symbol="gtk_spin_button_get_wrap">
-                               <return-type type="gboolean"/>
+                       </constructor>
+                       <method name="set_show_numbers" symbol="gtk_recent_action_set_show_numbers">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="action" type="GtkRecentAction*"/>
+                                       <parameter name="show_numbers" type="gboolean"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_spin_button_new">
+                       <property name="show-numbers" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkRecentChooserDialog" parent="GtkDialog" type-name="GtkRecentChooserDialog" get-type="gtk_recent_chooser_dialog_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkRecentChooser"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_recent_chooser_dialog_new">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
-                                       <parameter name="climb_rate" type="gdouble"/>
-                                       <parameter name="digits" type="guint"/>
+                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="first_button_text" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <constructor name="new_with_range" symbol="gtk_spin_button_new_with_range">
+                       <constructor name="new_for_manager" symbol="gtk_recent_chooser_dialog_new_for_manager">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="min" type="gdouble"/>
-                                       <parameter name="max" type="gdouble"/>
-                                       <parameter name="step" type="gdouble"/>
+                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="first_button_text" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <method name="set_adjustment" symbol="gtk_spin_button_set_adjustment">
-                               <return-type type="void"/>
+               </object>
+               <object name="GtkRecentChooserMenu" parent="GtkMenu" type-name="GtkRecentChooserMenu" get-type="gtk_recent_chooser_menu_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkRecentChooser"/>
+                               <interface name="GtkActivatable"/>
+                       </implements>
+                       <method name="get_show_numbers" symbol="gtk_recent_chooser_menu_get_show_numbers">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="menu" type="GtkRecentChooserMenu*"/>
                                </parameters>
                        </method>
-                       <method name="set_digits" symbol="gtk_spin_button_set_digits">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_recent_chooser_menu_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_for_manager" symbol="gtk_recent_chooser_menu_new_for_manager">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="digits" type="guint"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
                                </parameters>
-                       </method>
-                       <method name="set_increments" symbol="gtk_spin_button_set_increments">
+                       </constructor>
+                       <method name="set_show_numbers" symbol="gtk_recent_chooser_menu_set_show_numbers">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="step" type="gdouble"/>
-                                       <parameter name="page" type="gdouble"/>
+                                       <parameter name="menu" type="GtkRecentChooserMenu*"/>
+                                       <parameter name="show_numbers" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_numeric" symbol="gtk_spin_button_set_numeric">
+                       <property name="show-numbers" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <vfunc name="gtk_recent1">
                                <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="numeric" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_range" symbol="gtk_spin_button_set_range">
+                       </vfunc>
+                       <vfunc name="gtk_recent2">
                                <return-type type="void"/>
+                       </vfunc>
+                       <vfunc name="gtk_recent3">
+                               <return-type type="void"/>
+                       </vfunc>
+                       <vfunc name="gtk_recent4">
+                               <return-type type="void"/>
+                       </vfunc>
+               </object>
+               <object name="GtkRecentChooserWidget" parent="GtkVBox" type-name="GtkRecentChooserWidget" get-type="gtk_recent_chooser_widget_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                               <interface name="GtkRecentChooser"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_recent_chooser_widget_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_for_manager" symbol="gtk_recent_chooser_widget_new_for_manager">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="min" type="gdouble"/>
-                                       <parameter name="max" type="gdouble"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
                                </parameters>
-                       </method>
-                       <method name="set_snap_to_ticks" symbol="gtk_spin_button_set_snap_to_ticks">
+                       </constructor>
+               </object>
+               <object name="GtkRecentFilter" parent="GInitiallyUnowned" type-name="GtkRecentFilter" get-type="gtk_recent_filter_get_type">
+                       <method name="add_age" symbol="gtk_recent_filter_add_age">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="snap_to_ticks" type="gboolean"/>
+                                       <parameter name="filter" type="GtkRecentFilter*"/>
+                                       <parameter name="days" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_update_policy" symbol="gtk_spin_button_set_update_policy">
+                       <method name="add_application" symbol="gtk_recent_filter_add_application">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="policy" type="GtkSpinButtonUpdatePolicy"/>
+                                       <parameter name="filter" type="GtkRecentFilter*"/>
+                                       <parameter name="application" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_value" symbol="gtk_spin_button_set_value">
+                       <method name="add_custom" symbol="gtk_recent_filter_add_custom">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="value" type="gdouble"/>
+                                       <parameter name="filter" type="GtkRecentFilter*"/>
+                                       <parameter name="needed" type="GtkRecentFilterFlags"/>
+                                       <parameter name="func" type="GtkRecentFilterFunc"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="data_destroy" type="GDestroyNotify"/>
                                </parameters>
                        </method>
-                       <method name="set_wrap" symbol="gtk_spin_button_set_wrap">
+                       <method name="add_group" symbol="gtk_recent_filter_add_group">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="wrap" type="gboolean"/>
+                                       <parameter name="filter" type="GtkRecentFilter*"/>
+                                       <parameter name="group" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="spin" symbol="gtk_spin_button_spin">
+                       <method name="add_mime_type" symbol="gtk_recent_filter_add_mime_type">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="direction" type="GtkSpinType"/>
-                                       <parameter name="increment" type="gdouble"/>
+                                       <parameter name="filter" type="GtkRecentFilter*"/>
+                                       <parameter name="mime_type" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="update" symbol="gtk_spin_button_update">
+                       <method name="add_pattern" symbol="gtk_recent_filter_add_pattern">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="filter" type="GtkRecentFilter*"/>
+                                       <parameter name="pattern" type="gchar*"/>
                                </parameters>
                        </method>
-                       <property name="adjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="climb-rate" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="digits" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="numeric" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="snap-to-ticks" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="update-policy" type="GtkSpinButtonUpdatePolicy" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="value" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="wrap" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="change-value" when="LAST">
+                       <method name="add_pixbuf_formats" symbol="gtk_recent_filter_add_pixbuf_formats">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="scroll" type="GtkScrollType"/>
-                               </parameters>
-                       </signal>
-                       <signal name="input" when="LAST">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                                       <parameter name="new_value" type="gpointer"/>
+                                       <parameter name="filter" type="GtkRecentFilter*"/>
                                </parameters>
-                       </signal>
-                       <signal name="output" when="LAST">
+                       </method>
+                       <method name="filter" symbol="gtk_recent_filter_filter">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="value-changed" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="filter" type="GtkRecentFilter*"/>
+                                       <parameter name="filter_info" type="GtkRecentFilterInfo*"/>
                                </parameters>
-                       </signal>
-                       <signal name="wrapped" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_name" symbol="gtk_recent_filter_get_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="filter" type="GtkRecentFilter*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkSpinner" parent="GtkWidget" type-name="GtkSpinner" get-type="gtk_spinner_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_spinner_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="start" symbol="gtk_spinner_start">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_needed" symbol="gtk_recent_filter_get_needed">
+                               <return-type type="GtkRecentFilterFlags"/>
                                <parameters>
-                                       <parameter name="spinner" type="GtkSpinner*"/>
+                                       <parameter name="filter" type="GtkRecentFilter*"/>
                                </parameters>
                        </method>
-                       <method name="stop" symbol="gtk_spinner_stop">
+                       <constructor name="new" symbol="gtk_recent_filter_new">
+                               <return-type type="GtkRecentFilter*"/>
+                       </constructor>
+                       <method name="set_name" symbol="gtk_recent_filter_set_name">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spinner" type="GtkSpinner*"/>
+                                       <parameter name="filter" type="GtkRecentFilter*"/>
+                                       <parameter name="name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
-               <object name="GtkStatusIcon" parent="GObject" type-name="GtkStatusIcon" get-type="gtk_status_icon_get_type">
-                       <method name="get_geometry" symbol="gtk_status_icon_get_geometry">
+               <object name="GtkRecentManager" parent="GObject" type-name="GtkRecentManager" get-type="gtk_recent_manager_get_type">
+                       <method name="add_full" symbol="gtk_recent_manager_add_full">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="screen" type="GdkScreen**"/>
-                                       <parameter name="area" type="GdkRectangle*"/>
-                                       <parameter name="orientation" type="GtkOrientation*"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="uri" type="gchar*"/>
+                                       <parameter name="recent_data" type="GtkRecentData*"/>
                                </parameters>
                        </method>
-                       <method name="get_gicon" symbol="gtk_status_icon_get_gicon">
-                               <return-type type="GIcon*"/>
+                       <method name="add_item" symbol="gtk_recent_manager_add_item">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="uri" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_has_tooltip" symbol="gtk_status_icon_get_has_tooltip">
-                               <return-type type="gboolean"/>
+                       <method name="error_quark" symbol="gtk_recent_manager_error_quark">
+                               <return-type type="GQuark"/>
+                       </method>
+                       <method name="get_default" symbol="gtk_recent_manager_get_default">
+                               <return-type type="GtkRecentManager*"/>
+                       </method>
+                       <method name="get_items" symbol="gtk_recent_manager_get_items">
+                               <return-type type="GList*"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_name" symbol="gtk_status_icon_get_icon_name">
-                               <return-type type="gchar*"/>
+                       <method name="has_item" symbol="gtk_recent_manager_has_item">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="uri" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_pixbuf" symbol="gtk_status_icon_get_pixbuf">
-                               <return-type type="GdkPixbuf*"/>
+                       <method name="lookup_item" symbol="gtk_recent_manager_lookup_item">
+                               <return-type type="GtkRecentInfo*"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="uri" type="gchar*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="get_screen" symbol="gtk_status_icon_get_screen">
-                               <return-type type="GdkScreen*"/>
+                       <method name="move_item" symbol="gtk_recent_manager_move_item">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="uri" type="gchar*"/>
+                                       <parameter name="new_uri" type="gchar*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="get_size" symbol="gtk_status_icon_get_size">
+                       <constructor name="new" symbol="gtk_recent_manager_new">
+                               <return-type type="GtkRecentManager*"/>
+                       </constructor>
+                       <method name="purge_items" symbol="gtk_recent_manager_purge_items">
                                <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="get_stock" symbol="gtk_status_icon_get_stock">
-                               <return-type type="gchar*"/>
+                       <method name="remove_item" symbol="gtk_recent_manager_remove_item">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
+                                       <parameter name="uri" type="gchar*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="get_storage_type" symbol="gtk_status_icon_get_storage_type">
-                               <return-type type="GtkImageType"/>
+                       <property name="filename" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="size" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <signal name="changed" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="manager" type="GtkRecentManager*"/>
                                </parameters>
-                       </method>
-                       <method name="get_title" symbol="gtk_status_icon_get_title">
-                               <return-type type="gchar*"/>
+                       </signal>
+               </object>
+               <object name="GtkScale" parent="GtkRange" type-name="GtkScale" get-type="gtk_scale_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <method name="add_mark" symbol="gtk_scale_add_mark">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="value" type="gdouble"/>
+                                       <parameter name="position" type="GtkPositionType"/>
+                                       <parameter name="markup" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_tooltip_markup" symbol="gtk_status_icon_get_tooltip_markup">
-                               <return-type type="gchar*"/>
+                       <method name="clear_marks" symbol="gtk_scale_clear_marks">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
                                </parameters>
                        </method>
-                       <method name="get_tooltip_text" symbol="gtk_status_icon_get_tooltip_text">
-                               <return-type type="gchar*"/>
+                       <method name="get_digits" symbol="gtk_scale_get_digits">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
                                </parameters>
                        </method>
-                       <method name="get_visible" symbol="gtk_status_icon_get_visible">
+                       <method name="get_draw_value" symbol="gtk_scale_get_draw_value">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
                                </parameters>
                        </method>
-                       <method name="get_x11_window_id" symbol="gtk_status_icon_get_x11_window_id">
-                               <return-type type="guint32"/>
+                       <method name="get_layout" symbol="gtk_scale_get_layout">
+                               <return-type type="PangoLayout*"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
                                </parameters>
                        </method>
-                       <method name="is_embedded" symbol="gtk_status_icon_is_embedded">
-                               <return-type type="gboolean"/>
+                       <method name="get_layout_offsets" symbol="gtk_scale_get_layout_offsets">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="x" type="gint*"/>
+                                       <parameter name="y" type="gint*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_status_icon_new">
-                               <return-type type="GtkStatusIcon*"/>
-                       </constructor>
-                       <constructor name="new_from_file" symbol="gtk_status_icon_new_from_file">
-                               <return-type type="GtkStatusIcon*"/>
-                               <parameters>
-                                       <parameter name="filename" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_gicon" symbol="gtk_status_icon_new_from_gicon">
-                               <return-type type="GtkStatusIcon*"/>
-                               <parameters>
-                                       <parameter name="icon" type="GIcon*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_icon_name" symbol="gtk_status_icon_new_from_icon_name">
-                               <return-type type="GtkStatusIcon*"/>
+                       <method name="get_value_pos" symbol="gtk_scale_get_value_pos">
+                               <return-type type="GtkPositionType"/>
                                <parameters>
-                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_pixbuf" symbol="gtk_status_icon_new_from_pixbuf">
-                               <return-type type="GtkStatusIcon*"/>
+                       </method>
+                       <constructor name="new" symbol="gtk_scale_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </constructor>
-                       <constructor name="new_from_stock" symbol="gtk_status_icon_new_from_stock">
-                               <return-type type="GtkStatusIcon*"/>
+                       <constructor name="new_with_range" symbol="gtk_scale_new_with_range">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="min" type="gdouble"/>
+                                       <parameter name="max" type="gdouble"/>
+                                       <parameter name="step" type="gdouble"/>
                                </parameters>
                        </constructor>
-                       <method name="position_menu" symbol="gtk_status_icon_position_menu">
+                       <method name="set_digits" symbol="gtk_scale_set_digits">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="x" type="gint*"/>
-                                       <parameter name="y" type="gint*"/>
-                                       <parameter name="push_in" type="gboolean*"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="digits" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_from_file" symbol="gtk_status_icon_set_from_file">
+                       <method name="set_draw_value" symbol="gtk_scale_set_draw_value">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="filename" type="gchar*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="draw_value" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_from_gicon" symbol="gtk_status_icon_set_from_gicon">
+                       <method name="set_value_pos" symbol="gtk_scale_set_value_pos">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="icon" type="GIcon*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="pos" type="GtkPositionType"/>
                                </parameters>
                        </method>
-                       <method name="set_from_icon_name" symbol="gtk_status_icon_set_from_icon_name">
-                               <return-type type="void"/>
+                       <property name="digits" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="draw-value" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="value-pos" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="format-value" when="LAST">
+                               <return-type type="char*"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="value" type="gdouble"/>
                                </parameters>
-                       </method>
-                       <method name="set_from_pixbuf" symbol="gtk_status_icon_set_from_pixbuf">
+                       </signal>
+                       <vfunc name="draw_value">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
                                </parameters>
-                       </method>
-                       <method name="set_from_stock" symbol="gtk_status_icon_set_from_stock">
+                       </vfunc>
+                       <vfunc name="get_layout_offsets">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="scale" type="GtkScale*"/>
+                                       <parameter name="x" type="gint*"/>
+                                       <parameter name="y" type="gint*"/>
                                </parameters>
-                       </method>
-                       <method name="set_has_tooltip" symbol="gtk_status_icon_set_has_tooltip">
-                               <return-type type="void"/>
+                       </vfunc>
+               </object>
+               <object name="GtkScaleButton" parent="GtkButton" type-name="GtkScaleButton" get-type="gtk_scale_button_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkActivatable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <method name="get_adjustment" symbol="gtk_scale_button_get_adjustment">
+                               <return-type type="GtkAdjustment*"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="has_tooltip" type="gboolean"/>
+                                       <parameter name="button" type="GtkScaleButton*"/>
                                </parameters>
                        </method>
-                       <method name="set_name" symbol="gtk_status_icon_set_name">
-                               <return-type type="void"/>
+                       <method name="get_minus_button" symbol="gtk_scale_button_get_minus_button">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="button" type="GtkScaleButton*"/>
                                </parameters>
                        </method>
-                       <method name="set_screen" symbol="gtk_status_icon_set_screen">
-                               <return-type type="void"/>
+                       <method name="get_plus_button" symbol="gtk_scale_button_get_plus_button">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="button" type="GtkScaleButton*"/>
                                </parameters>
                        </method>
-                       <method name="set_title" symbol="gtk_status_icon_set_title">
-                               <return-type type="void"/>
+                       <method name="get_popup" symbol="gtk_scale_button_get_popup">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="button" type="GtkScaleButton*"/>
                                </parameters>
                        </method>
-                       <method name="set_tooltip_markup" symbol="gtk_status_icon_set_tooltip_markup">
-                               <return-type type="void"/>
+                       <method name="get_value" symbol="gtk_scale_button_get_value">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="markup" type="gchar*"/>
+                                       <parameter name="button" type="GtkScaleButton*"/>
                                </parameters>
                        </method>
-                       <method name="set_tooltip_text" symbol="gtk_status_icon_set_tooltip_text">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_scale_button_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="min" type="gdouble"/>
+                                       <parameter name="max" type="gdouble"/>
+                                       <parameter name="step" type="gdouble"/>
+                                       <parameter name="icons" type="gchar**"/>
                                </parameters>
-                       </method>
-                       <method name="set_visible" symbol="gtk_status_icon_set_visible">
+                       </constructor>
+                       <method name="set_adjustment" symbol="gtk_scale_button_set_adjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="visible" type="gboolean"/>
+                                       <parameter name="button" type="GtkScaleButton*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <property name="embedded" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="file" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="has-tooltip" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="orientation" type="GtkOrientation" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="pixbuf" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <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"/>
-                       <signal name="activate" when="FIRST">
+                       <method name="set_icons" symbol="gtk_scale_button_set_icons">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="button-press-event" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="button" type="GtkScaleButton*"/>
+                                       <parameter name="icons" type="gchar**"/>
                                </parameters>
-                       </signal>
-                       <signal name="button-release-event" when="LAST">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <method name="set_value" symbol="gtk_scale_button_set_value">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="button" type="GtkScaleButton*"/>
+                                       <parameter name="value" type="gdouble"/>
                                </parameters>
-                       </signal>
-                       <signal name="popup-menu" when="FIRST">
+                       </method>
+                       <property name="adjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="icons" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="size" type="GtkIconSize" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="value" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="popdown" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="button" type="guint"/>
-                                       <parameter name="activate_time" type="guint"/>
+                                       <parameter name="object" type="GtkScaleButton*"/>
                                </parameters>
                        </signal>
-                       <signal name="query-tooltip" when="LAST">
-                               <return-type type="gboolean"/>
+                       <signal name="popup" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="keyboard_mode" type="gboolean"/>
-                                       <parameter name="tooltip" type="GtkTooltip*"/>
+                                       <parameter name="object" type="GtkScaleButton*"/>
                                </parameters>
                        </signal>
-                       <signal name="scroll-event" when="LAST">
-                               <return-type type="gboolean"/>
+                       <signal name="value-changed" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="button" type="GtkScaleButton*"/>
+                                       <parameter name="value" type="gdouble"/>
                                </parameters>
                        </signal>
-                       <signal name="size-changed" when="LAST">
-                               <return-type type="gboolean"/>
+               </object>
+               <object name="GtkScrollbar" parent="GtkRange" type-name="GtkScrollbar" get-type="gtk_scrollbar_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_scrollbar_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
-                                       <parameter name="size" type="gint"/>
+                                       <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </signal>
+                       </constructor>
                </object>
-               <object name="GtkStatusbar" parent="GtkHBox" type-name="GtkStatusbar" get-type="gtk_statusbar_get_type">
+               <object name="GtkScrolledWindow" parent="GtkBin" type-name="GtkScrolledWindow" get-type="gtk_scrolled_window_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
                        </implements>
-                       <method name="get_context_id" symbol="gtk_statusbar_get_context_id">
-                               <return-type type="guint"/>
+                       <method name="add_with_viewport" symbol="gtk_scrolled_window_add_with_viewport">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="statusbar" type="GtkStatusbar*"/>
-                                       <parameter name="context_description" type="gchar*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_message_area" symbol="gtk_statusbar_get_message_area">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_hadjustment" symbol="gtk_scrolled_window_get_hadjustment">
+                               <return-type type="GtkAdjustment*"/>
                                <parameters>
-                                       <parameter name="statusbar" type="GtkStatusbar*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_statusbar_new">
+                       <method name="get_hscrollbar" symbol="gtk_scrolled_window_get_hscrollbar">
                                <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="pop" symbol="gtk_statusbar_pop">
-                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="statusbar" type="GtkStatusbar*"/>
-                                       <parameter name="context_id" type="guint"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
                                </parameters>
                        </method>
-                       <method name="push" symbol="gtk_statusbar_push">
-                               <return-type type="guint"/>
+                       <method name="get_min_content_height" symbol="gtk_scrolled_window_get_min_content_height">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="statusbar" type="GtkStatusbar*"/>
-                                       <parameter name="context_id" type="guint"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
                                </parameters>
                        </method>
-                       <method name="remove" symbol="gtk_statusbar_remove">
-                               <return-type type="void"/>
+                       <method name="get_min_content_width" symbol="gtk_scrolled_window_get_min_content_width">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="statusbar" type="GtkStatusbar*"/>
-                                       <parameter name="context_id" type="guint"/>
-                                       <parameter name="message_id" type="guint"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
                                </parameters>
                        </method>
-                       <method name="remove_all" symbol="gtk_statusbar_remove_all">
-                               <return-type type="void"/>
+                       <method name="get_placement" symbol="gtk_scrolled_window_get_placement">
+                               <return-type type="GtkCornerType"/>
                                <parameters>
-                                       <parameter name="statusbar" type="GtkStatusbar*"/>
-                                       <parameter name="context_id" type="guint"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
                                </parameters>
                        </method>
-                       <signal name="text-popped" when="LAST">
+                       <method name="get_policy" symbol="gtk_scrolled_window_get_policy">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="statusbar" type="GtkStatusbar*"/>
-                                       <parameter name="context_id" type="guint"/>
-                                       <parameter name="text" type="char*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="hscrollbar_policy" type="GtkPolicyType*"/>
+                                       <parameter name="vscrollbar_policy" type="GtkPolicyType*"/>
                                </parameters>
-                       </signal>
-                       <signal name="text-pushed" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_shadow_type" symbol="gtk_scrolled_window_get_shadow_type">
+                               <return-type type="GtkShadowType"/>
                                <parameters>
-                                       <parameter name="statusbar" type="GtkStatusbar*"/>
-                                       <parameter name="context_id" type="guint"/>
-                                       <parameter name="text" type="char*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkStyle" parent="GObject" type-name="GtkStyle" get-type="gtk_style_get_type">
-                       <method name="apply_default_background" symbol="gtk_style_apply_default_background">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_vadjustment" symbol="gtk_scrolled_window_get_vadjustment">
+                               <return-type type="GtkAdjustment*"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="window" type="GdkWindow*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
                                </parameters>
                        </method>
-                       <method name="attach" symbol="gtk_style_attach">
-                               <return-type type="GtkStyle*"/>
+                       <method name="get_vscrollbar" symbol="gtk_scrolled_window_get_vscrollbar">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
                                </parameters>
                        </method>
-                       <method name="copy" symbol="gtk_style_copy">
-                               <return-type type="GtkStyle*"/>
+                       <constructor name="new" symbol="gtk_scrolled_window_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="hadjustment" type="GtkAdjustment*"/>
+                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </method>
-                       <method name="detach" symbol="gtk_style_detach">
+                       </constructor>
+                       <method name="set_hadjustment" symbol="gtk_scrolled_window_set_hadjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="hadjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <method name="get" symbol="gtk_style_get">
+                       <method name="set_min_content_height" symbol="gtk_scrolled_window_set_min_content_height">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="widget_type" type="GType"/>
-                                       <parameter name="first_property_name" type="gchar*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="height" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_style_property" symbol="gtk_style_get_style_property">
+                       <method name="set_min_content_width" symbol="gtk_scrolled_window_set_min_content_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="widget_type" type="GType"/>
-                                       <parameter name="property_name" type="gchar*"/>
-                                       <parameter name="value" type="GValue*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="width" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_valist" symbol="gtk_style_get_valist">
+                       <method name="set_placement" symbol="gtk_scrolled_window_set_placement">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="widget_type" type="GType"/>
-                                       <parameter name="first_property_name" type="gchar*"/>
-                                       <parameter name="var_args" type="va_list"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="window_placement" type="GtkCornerType"/>
                                </parameters>
                        </method>
-                       <method name="lookup_color" symbol="gtk_style_lookup_color">
-                               <return-type type="gboolean"/>
+                       <method name="set_policy" symbol="gtk_scrolled_window_set_policy">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="color_name" type="gchar*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="hscrollbar_policy" type="GtkPolicyType"/>
+                                       <parameter name="vscrollbar_policy" type="GtkPolicyType"/>
                                </parameters>
                        </method>
-                       <method name="lookup_icon_set" symbol="gtk_style_lookup_icon_set">
-                               <return-type type="GtkIconSet*"/>
+                       <method name="set_shadow_type" symbol="gtk_scrolled_window_set_shadow_type">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="type" type="GtkShadowType"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_style_new">
-                               <return-type type="GtkStyle*"/>
-                       </constructor>
-                       <method name="render_icon" symbol="gtk_style_render_icon">
-                               <return-type type="GdkPixbuf*"/>
+                       <method name="set_vadjustment" symbol="gtk_scrolled_window_set_vadjustment">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                                       <parameter name="direction" type="GtkTextDirection"/>
-                                       <parameter name="state" type="GtkStateType"/>
-                                       <parameter name="size" type="GtkIconSize"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <method name="set_background" symbol="gtk_style_set_background">
+                       <method name="unset_placement" symbol="gtk_scrolled_window_unset_placement">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="window" type="GdkWindow*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
                                </parameters>
                        </method>
-                       <signal name="realize" when="FIRST">
-                               <return-type type="void"/>
+                       <property name="hadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="hscrollbar-policy" type="GtkPolicyType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="min-content-height" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="min-content-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="vadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="vscrollbar-policy" type="GtkPolicyType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="window-placement" type="GtkCornerType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="window-placement-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="move-focus-out" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="direction" type="GtkDirectionType"/>
+                               </parameters>
+                       </signal>
+                       <signal name="scroll-child" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+                                       <parameter name="scroll" type="GtkScrollType"/>
+                                       <parameter name="horizontal" type="gboolean"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GtkSeparator" parent="GtkWidget" type-name="GtkSeparator" get-type="gtk_separator_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_separator_new">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="orientation" type="GtkOrientation"/>
+                               </parameters>
+                       </constructor>
+               </object>
+               <object name="GtkSeparatorMenuItem" parent="GtkMenuItem" type-name="GtkSeparatorMenuItem" get-type="gtk_separator_menu_item_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkActivatable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_separator_menu_item_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+               </object>
+               <object name="GtkSeparatorToolItem" parent="GtkToolItem" type-name="GtkSeparatorToolItem" get-type="gtk_separator_tool_item_get_type">
+                       <implements>
+                               <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"/>
+                               <parameters>
+                                       <parameter name="item" type="GtkSeparatorToolItem*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_separator_tool_item_new">
+                               <return-type type="GtkToolItem*"/>
+                       </constructor>
+                       <method name="set_draw" symbol="gtk_separator_tool_item_set_draw">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="item" type="GtkSeparatorToolItem*"/>
+                                       <parameter name="draw" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <property name="draw" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkSettings" parent="GObject" type-name="GtkSettings" get-type="gtk_settings_get_type">
+                       <implements>
+                               <interface name="GtkStyleProvider"/>
+                       </implements>
+                       <method name="get_default" symbol="gtk_settings_get_default">
+                               <return-type type="GtkSettings*"/>
+                       </method>
+                       <method name="get_for_screen" symbol="gtk_settings_get_for_screen">
+                               <return-type type="GtkSettings*"/>
+                               <parameters>
+                                       <parameter name="screen" type="GdkScreen*"/>
+                               </parameters>
+                       </method>
+                       <method name="install_property" symbol="gtk_settings_install_property">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="pspec" type="GParamSpec*"/>
+                               </parameters>
+                       </method>
+                       <method name="install_property_parser" symbol="gtk_settings_install_property_parser">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="parser" type="GtkRcPropertyParser"/>
+                               </parameters>
+                       </method>
+                       <method name="set_double_property" symbol="gtk_settings_set_double_property">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="settings" type="GtkSettings*"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="v_double" type="gdouble"/>
+                                       <parameter name="origin" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_long_property" symbol="gtk_settings_set_long_property">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="settings" type="GtkSettings*"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="v_long" type="glong"/>
+                                       <parameter name="origin" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_property_value" symbol="gtk_settings_set_property_value">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="settings" type="GtkSettings*"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="svalue" type="GtkSettingsValue*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_string_property" symbol="gtk_settings_set_string_property">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="settings" type="GtkSettings*"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="v_string" type="gchar*"/>
+                                       <parameter name="origin" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <property name="color-hash" type="GHashTable*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="gtk-alternative-button-order" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-alternative-sort-arrows" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-application-prefer-dark-theme" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-auto-mnemonics" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-button-images" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-can-change-accels" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-color-palette" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-color-scheme" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-cursor-blink" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-cursor-blink-time" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-cursor-blink-timeout" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-cursor-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-cursor-theme-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-dnd-drag-threshold" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-double-click-distance" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-double-click-time" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-enable-accels" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-enable-animations" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-enable-event-sounds" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-enable-input-feedback-sounds" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-enable-mnemonics" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-enable-tooltips" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-entry-password-hint-timeout" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-entry-select-on-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-error-bell" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-fallback-icon-theme" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-file-chooser-backend" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-font-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-fontconfig-timestamp" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-icon-sizes" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-icon-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-im-module" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-im-preedit-style" type="GtkIMPreeditStyle" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-im-status-style" type="GtkIMStatusStyle" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-key-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-keynav-cursor-only" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-keynav-wrap-around" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-label-select-on-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-menu-bar-accel" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-menu-bar-popup-delay" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-menu-images" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-menu-popdown-delay" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-menu-popup-delay" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-modules" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-print-backends" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-print-preview-command" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-recent-files-limit" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-recent-files-max-age" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-scrolled-window-placement" type="GtkCornerType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-show-input-method-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-show-unicode-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-sound-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-split-cursor" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-timeout-expand" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-timeout-initial" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-timeout-repeat" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-toolbar-icon-size" type="GtkIconSize" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-toolbar-style" type="GtkToolbarStyle" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-tooltip-browse-mode-timeout" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-tooltip-browse-timeout" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-tooltip-timeout" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-touchscreen-mode" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-xft-antialias" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-xft-dpi" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-xft-hinting" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-xft-hintstyle" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-xft-rgba" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkSizeGroup" parent="GObject" type-name="GtkSizeGroup" get-type="gtk_size_group_get_type">
+                       <implements>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="add_widget" symbol="gtk_size_group_add_widget">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="size_group" type="GtkSizeGroup*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_ignore_hidden" symbol="gtk_size_group_get_ignore_hidden">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="size_group" type="GtkSizeGroup*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_mode" symbol="gtk_size_group_get_mode">
+                               <return-type type="GtkSizeGroupMode"/>
+                               <parameters>
+                                       <parameter name="size_group" type="GtkSizeGroup*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_widgets" symbol="gtk_size_group_get_widgets">
+                               <return-type type="GSList*"/>
+                               <parameters>
+                                       <parameter name="size_group" type="GtkSizeGroup*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_size_group_new">
+                               <return-type type="GtkSizeGroup*"/>
+                               <parameters>
+                                       <parameter name="mode" type="GtkSizeGroupMode"/>
+                               </parameters>
+                       </constructor>
+                       <method name="remove_widget" symbol="gtk_size_group_remove_widget">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="size_group" type="GtkSizeGroup*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_ignore_hidden" symbol="gtk_size_group_set_ignore_hidden">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="size_group" type="GtkSizeGroup*"/>
+                                       <parameter name="ignore_hidden" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_mode" symbol="gtk_size_group_set_mode">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="size_group" type="GtkSizeGroup*"/>
+                                       <parameter name="mode" type="GtkSizeGroupMode"/>
+                               </parameters>
+                       </method>
+                       <property name="ignore-hidden" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="mode" type="GtkSizeGroupMode" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkSocket" parent="GtkContainer" type-name="GtkSocket" get-type="gtk_socket_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="add_id" symbol="gtk_socket_add_id">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="socket_" type="GtkSocket*"/>
+                                       <parameter name="window_id" type="GdkNativeWindow"/>
+                               </parameters>
+                       </method>
+                       <method name="get_id" symbol="gtk_socket_get_id">
+                               <return-type type="GdkNativeWindow"/>
+                               <parameters>
+                                       <parameter name="socket_" type="GtkSocket*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_plug_window" symbol="gtk_socket_get_plug_window">
+                               <return-type type="GdkWindow*"/>
+                               <parameters>
+                                       <parameter name="socket_" type="GtkSocket*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_socket_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <signal name="plug-added" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="socket_" type="GtkSocket*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="plug-removed" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="socket_" type="GtkSocket*"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GtkSpinButton" parent="GtkEntry" type-name="GtkSpinButton" get-type="gtk_spin_button_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkEditable"/>
+                               <interface name="GtkCellEditable"/>
+                       </implements>
+                       <method name="configure" symbol="gtk_spin_button_configure">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="climb_rate" type="gdouble"/>
+                                       <parameter name="digits" type="guint"/>
+                               </parameters>
+                       </method>
+                       <method name="get_adjustment" symbol="gtk_spin_button_get_adjustment">
+                               <return-type type="GtkAdjustment*"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_digits" symbol="gtk_spin_button_get_digits">
+                               <return-type type="guint"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_increments" symbol="gtk_spin_button_get_increments">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="step" type="gdouble*"/>
+                                       <parameter name="page" type="gdouble*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_numeric" symbol="gtk_spin_button_get_numeric">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_range" symbol="gtk_spin_button_get_range">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="min" type="gdouble*"/>
+                                       <parameter name="max" type="gdouble*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_snap_to_ticks" symbol="gtk_spin_button_get_snap_to_ticks">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_update_policy" symbol="gtk_spin_button_get_update_policy">
+                               <return-type type="GtkSpinButtonUpdatePolicy"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_value" symbol="gtk_spin_button_get_value">
+                               <return-type type="gdouble"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_value_as_int" symbol="gtk_spin_button_get_value_as_int">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_wrap" symbol="gtk_spin_button_get_wrap">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_spin_button_new">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="climb_rate" type="gdouble"/>
+                                       <parameter name="digits" type="guint"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_with_range" symbol="gtk_spin_button_new_with_range">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="min" type="gdouble"/>
+                                       <parameter name="max" type="gdouble"/>
+                                       <parameter name="step" type="gdouble"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_adjustment" symbol="gtk_spin_button_set_adjustment">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_digits" symbol="gtk_spin_button_set_digits">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="digits" type="guint"/>
+                               </parameters>
+                       </method>
+                       <method name="set_increments" symbol="gtk_spin_button_set_increments">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="step" type="gdouble"/>
+                                       <parameter name="page" type="gdouble"/>
+                               </parameters>
+                       </method>
+                       <method name="set_numeric" symbol="gtk_spin_button_set_numeric">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="numeric" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_range" symbol="gtk_spin_button_set_range">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="min" type="gdouble"/>
+                                       <parameter name="max" type="gdouble"/>
+                               </parameters>
+                       </method>
+                       <method name="set_snap_to_ticks" symbol="gtk_spin_button_set_snap_to_ticks">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="snap_to_ticks" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_update_policy" symbol="gtk_spin_button_set_update_policy">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="policy" type="GtkSpinButtonUpdatePolicy"/>
+                               </parameters>
+                       </method>
+                       <method name="set_value" symbol="gtk_spin_button_set_value">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="value" type="gdouble"/>
+                               </parameters>
+                       </method>
+                       <method name="set_wrap" symbol="gtk_spin_button_set_wrap">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="wrap" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="spin" symbol="gtk_spin_button_spin">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="direction" type="GtkSpinType"/>
+                                       <parameter name="increment" type="gdouble"/>
+                               </parameters>
+                       </method>
+                       <method name="update" symbol="gtk_spin_button_update">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </method>
+                       <property name="adjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="climb-rate" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="digits" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="numeric" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="snap-to-ticks" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="update-policy" type="GtkSpinButtonUpdatePolicy" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="value" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="wrap" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="change-value" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="scroll" type="GtkScrollType"/>
+                               </parameters>
+                       </signal>
+                       <signal name="input" when="LAST">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                                       <parameter name="new_value" type="gpointer"/>
+                               </parameters>
+                       </signal>
+                       <signal name="output" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="value-changed" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="wrapped" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spin_button" type="GtkSpinButton*"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GtkSpinner" parent="GtkWidget" type-name="GtkSpinner" get-type="gtk_spinner_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_spinner_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="start" symbol="gtk_spinner_start">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spinner" type="GtkSpinner*"/>
+                               </parameters>
+                       </method>
+                       <method name="stop" symbol="gtk_spinner_stop">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="spinner" type="GtkSpinner*"/>
+                               </parameters>
+                       </method>
+                       <property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkStatusIcon" parent="GObject" type-name="GtkStatusIcon" get-type="gtk_status_icon_get_type">
+                       <method name="get_geometry" symbol="gtk_status_icon_get_geometry">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="screen" type="GdkScreen**"/>
+                                       <parameter name="area" type="GdkRectangle*"/>
+                                       <parameter name="orientation" type="GtkOrientation*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_gicon" symbol="gtk_status_icon_get_gicon">
+                               <return-type type="GIcon*"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_has_tooltip" symbol="gtk_status_icon_get_has_tooltip">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_icon_name" symbol="gtk_status_icon_get_icon_name">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_pixbuf" symbol="gtk_status_icon_get_pixbuf">
+                               <return-type type="GdkPixbuf*"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_screen" symbol="gtk_status_icon_get_screen">
+                               <return-type type="GdkScreen*"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_size" symbol="gtk_status_icon_get_size">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_stock" symbol="gtk_status_icon_get_stock">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_storage_type" symbol="gtk_status_icon_get_storage_type">
+                               <return-type type="GtkImageType"/>
+                               <parameters>
+                                       <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>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_tooltip_text" symbol="gtk_status_icon_get_tooltip_text">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_visible" symbol="gtk_status_icon_get_visible">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_x11_window_id" symbol="gtk_status_icon_get_x11_window_id">
+                               <return-type type="guint32"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="is_embedded" symbol="gtk_status_icon_is_embedded">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_status_icon_new">
+                               <return-type type="GtkStatusIcon*"/>
+                       </constructor>
+                       <constructor name="new_from_file" symbol="gtk_status_icon_new_from_file">
+                               <return-type type="GtkStatusIcon*"/>
+                               <parameters>
+                                       <parameter name="filename" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_from_gicon" symbol="gtk_status_icon_new_from_gicon">
+                               <return-type type="GtkStatusIcon*"/>
+                               <parameters>
+                                       <parameter name="icon" type="GIcon*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_from_icon_name" symbol="gtk_status_icon_new_from_icon_name">
+                               <return-type type="GtkStatusIcon*"/>
+                               <parameters>
+                                       <parameter name="icon_name" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_from_pixbuf" symbol="gtk_status_icon_new_from_pixbuf">
+                               <return-type type="GtkStatusIcon*"/>
+                               <parameters>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_from_stock" symbol="gtk_status_icon_new_from_stock">
+                               <return-type type="GtkStatusIcon*"/>
+                               <parameters>
+                                       <parameter name="stock_id" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="position_menu" symbol="gtk_status_icon_position_menu">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="x" type="gint*"/>
+                                       <parameter name="y" type="gint*"/>
+                                       <parameter name="push_in" type="gboolean*"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                               </parameters>
+                       </method>
+                       <method name="set_from_file" symbol="gtk_status_icon_set_from_file">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="filename" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_from_gicon" symbol="gtk_status_icon_set_from_gicon">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="icon" type="GIcon*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_from_icon_name" symbol="gtk_status_icon_set_from_icon_name">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_from_pixbuf" symbol="gtk_status_icon_set_from_pixbuf">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_from_stock" symbol="gtk_status_icon_set_from_stock">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_has_tooltip" symbol="gtk_status_icon_set_has_tooltip">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="has_tooltip" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_name" symbol="gtk_status_icon_set_name">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_screen" symbol="gtk_status_icon_set_screen">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <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>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="markup" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_tooltip_text" symbol="gtk_status_icon_set_tooltip_text">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="text" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_visible" symbol="gtk_status_icon_set_visible">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="visible" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <property name="embedded" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="file" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <property name="gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="has-tooltip" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="orientation" type="GtkOrientation" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="pixbuf" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <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"/>
+                       <signal name="activate" when="FIRST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="button-press-event" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="event" type="GdkEvent*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="button-release-event" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="event" type="GdkEvent*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="popup-menu" when="FIRST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="button" type="guint"/>
+                                       <parameter name="activate_time" type="guint"/>
+                               </parameters>
+                       </signal>
+                       <signal name="query-tooltip" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="keyboard_mode" type="gboolean"/>
+                                       <parameter name="tooltip" type="GtkTooltip*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="scroll-event" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="event" type="GdkEvent*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="size-changed" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="status_icon" type="GtkStatusIcon*"/>
+                                       <parameter name="size" type="gint"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GtkStatusbar" parent="GtkHBox" type-name="GtkStatusbar" get-type="gtk_statusbar_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkOrientable"/>
+                       </implements>
+                       <method name="get_context_id" symbol="gtk_statusbar_get_context_id">
+                               <return-type type="guint"/>
+                               <parameters>
+                                       <parameter name="statusbar" type="GtkStatusbar*"/>
+                                       <parameter name="context_description" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_message_area" symbol="gtk_statusbar_get_message_area">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="statusbar" type="GtkStatusbar*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_statusbar_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="pop" symbol="gtk_statusbar_pop">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="statusbar" type="GtkStatusbar*"/>
+                                       <parameter name="context_id" type="guint"/>
+                               </parameters>
+                       </method>
+                       <method name="push" symbol="gtk_statusbar_push">
+                               <return-type type="guint"/>
+                               <parameters>
+                                       <parameter name="statusbar" type="GtkStatusbar*"/>
+                                       <parameter name="context_id" type="guint"/>
+                                       <parameter name="text" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="remove" symbol="gtk_statusbar_remove">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="statusbar" type="GtkStatusbar*"/>
+                                       <parameter name="context_id" type="guint"/>
+                                       <parameter name="message_id" type="guint"/>
+                               </parameters>
+                       </method>
+                       <method name="remove_all" symbol="gtk_statusbar_remove_all">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="statusbar" type="GtkStatusbar*"/>
+                                       <parameter name="context_id" type="guint"/>
+                               </parameters>
+                       </method>
+                       <signal name="text-popped" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="statusbar" type="GtkStatusbar*"/>
+                                       <parameter name="context_id" type="guint"/>
+                                       <parameter name="text" type="char*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="text-pushed" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="statusbar" type="GtkStatusbar*"/>
+                                       <parameter name="context_id" type="guint"/>
+                                       <parameter name="text" type="char*"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GtkStyle" parent="GObject" type-name="GtkStyle" get-type="gtk_style_get_type">
+                       <method name="apply_default_background" symbol="gtk_style_apply_default_background">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                               </parameters>
+                       </method>
+                       <method name="attach" symbol="gtk_style_attach">
+                               <return-type type="GtkStyle*"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
+                               </parameters>
+                       </method>
+                       <method name="copy" symbol="gtk_style_copy">
+                               <return-type type="GtkStyle*"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                               </parameters>
+                       </method>
+                       <method name="detach" symbol="gtk_style_detach">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                               </parameters>
+                       </method>
+                       <method name="get" symbol="gtk_style_get">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="widget_type" type="GType"/>
+                                       <parameter name="first_property_name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_style_property" symbol="gtk_style_get_style_property">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="widget_type" type="GType"/>
+                                       <parameter name="property_name" type="gchar*"/>
+                                       <parameter name="value" type="GValue*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_valist" symbol="gtk_style_get_valist">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="widget_type" type="GType"/>
+                                       <parameter name="first_property_name" type="gchar*"/>
+                                       <parameter name="var_args" type="va_list"/>
+                               </parameters>
+                       </method>
+                       <method name="has_context" symbol="gtk_style_has_context">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                               </parameters>
+                       </method>
+                       <method name="lookup_color" symbol="gtk_style_lookup_color">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="color_name" type="gchar*"/>
+                                       <parameter name="color" type="GdkColor*"/>
+                               </parameters>
+                       </method>
+                       <method name="lookup_icon_set" symbol="gtk_style_lookup_icon_set">
+                               <return-type type="GtkIconSet*"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_style_new">
+                               <return-type type="GtkStyle*"/>
+                       </constructor>
+                       <method name="render_icon" symbol="gtk_style_render_icon">
+                               <return-type type="GdkPixbuf*"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="direction" type="GtkTextDirection"/>
+                                       <parameter name="state" type="GtkStateType"/>
+                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_background" symbol="gtk_style_set_background">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                               </parameters>
+                       </method>
+                       <property name="context" type="GtkStyleContext*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <signal name="realize" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
                                        <parameter name="style" type="GtkStyle*"/>
                                </parameters>
@@ -17408,10 +19041,254 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="src" type="GtkStyle*"/>
+                                       <parameter name="src" type="GtkStyle*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_arrow">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="arrow_type" type="GtkArrowType"/>
+                                       <parameter name="fill" type="gboolean"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_box">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_box_gap">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                                       <parameter name="gap_side" type="GtkPositionType"/>
+                                       <parameter name="gap_x" type="gint"/>
+                                       <parameter name="gap_width" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_check">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_diamond">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_expander">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="expander_style" type="GtkExpanderStyle"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_extension">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                                       <parameter name="gap_side" type="GtkPositionType"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_flat_box">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_focus">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_handle">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                                       <parameter name="orientation" type="GtkOrientation"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_hline">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x1" type="gint"/>
+                                       <parameter name="x2" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_layout">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="use_text" type="gboolean"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="layout" type="PangoLayout*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_option">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_resize_grip">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="edge" type="GdkWindowEdge"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_shadow">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="draw_shadow_gap">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
+                                       <parameter name="gap_side" type="GtkPositionType"/>
+                                       <parameter name="gap_x" type="gint"/>
+                                       <parameter name="gap_width" type="gint"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="draw_arrow">
+                       <vfunc name="draw_slider">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="style" type="GtkStyle*"/>
@@ -17420,30 +19297,29 @@
                                        <parameter name="shadow_type" type="GtkShadowType"/>
                                        <parameter name="widget" type="GtkWidget*"/>
                                        <parameter name="detail" type="gchar*"/>
-                                       <parameter name="arrow_type" type="GtkArrowType"/>
-                                       <parameter name="fill" type="gboolean"/>
                                        <parameter name="x" type="gint"/>
                                        <parameter name="y" type="gint"/>
                                        <parameter name="width" type="gint"/>
                                        <parameter name="height" type="gint"/>
+                                       <parameter name="orientation" type="GtkOrientation"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="draw_box">
+                       <vfunc name="draw_spinner">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="style" type="GtkStyle*"/>
                                        <parameter name="cr" type="cairo_t*"/>
                                        <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
                                        <parameter name="widget" type="GtkWidget*"/>
                                        <parameter name="detail" type="gchar*"/>
+                                       <parameter name="step" type="guint"/>
                                        <parameter name="x" type="gint"/>
                                        <parameter name="y" type="gint"/>
                                        <parameter name="width" type="gint"/>
                                        <parameter name="height" type="gint"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="draw_box_gap">
+                       <vfunc name="draw_tab">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="style" type="GtkStyle*"/>
@@ -17456,311 +19332,557 @@
                                        <parameter name="y" type="gint"/>
                                        <parameter name="width" type="gint"/>
                                        <parameter name="height" type="gint"/>
-                                       <parameter name="gap_side" type="GtkPositionType"/>
-                                       <parameter name="gap_x" type="gint"/>
-                                       <parameter name="gap_width" type="gint"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_check">
+                       </vfunc>
+                       <vfunc name="draw_vline">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="y1_" type="gint"/>
+                                       <parameter name="y2_" type="gint"/>
+                                       <parameter name="x" type="gint"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="init_from_rc">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="rc_style" type="GtkRcStyle*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_icon">
+                               <return-type type="GdkPixbuf*"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="direction" type="GtkTextDirection"/>
+                                       <parameter name="state" type="GtkStateType"/>
+                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="gchar*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="set_background">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="state_type" type="GtkStateType"/>
+                               </parameters>
+                       </vfunc>
+                       <field name="fg" type="GdkColor[]"/>
+                       <field name="bg" type="GdkColor[]"/>
+                       <field name="light" type="GdkColor[]"/>
+                       <field name="dark" type="GdkColor[]"/>
+                       <field name="mid" type="GdkColor[]"/>
+                       <field name="text" type="GdkColor[]"/>
+                       <field name="base" type="GdkColor[]"/>
+                       <field name="text_aa" type="GdkColor[]"/>
+                       <field name="black" type="GdkColor"/>
+                       <field name="white" type="GdkColor"/>
+                       <field name="font_desc" type="PangoFontDescription*"/>
+                       <field name="xthickness" type="gint"/>
+                       <field name="ythickness" type="gint"/>
+                       <field name="background" type="cairo_pattern_t*[]"/>
+                       <field name="attach_count" type="gint"/>
+                       <field name="visual" type="GdkVisual*"/>
+                       <field name="rc_style" type="GtkRcStyle*"/>
+                       <field name="styles" type="GSList*"/>
+                       <field name="property_cache" type="GArray*"/>
+                       <field name="icon_factories" type="GSList*"/>
+               </object>
+               <object name="GtkStyleContext" parent="GObject" type-name="GtkStyleContext" get-type="gtk_style_context_get_type">
+                       <method name="add_class" symbol="gtk_style_context_add_class">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="class_name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="add_provider" symbol="gtk_style_context_add_provider">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="provider" type="GtkStyleProvider*"/>
+                                       <parameter name="priority" type="guint"/>
+                               </parameters>
+                       </method>
+                       <method name="add_provider_for_screen" symbol="gtk_style_context_add_provider_for_screen">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="provider" type="GtkStyleProvider*"/>
+                                       <parameter name="priority" type="guint"/>
+                               </parameters>
+                       </method>
+                       <method name="add_region" symbol="gtk_style_context_add_region">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="region_name" type="gchar*"/>
+                                       <parameter name="flags" type="GtkRegionFlags"/>
+                               </parameters>
+                       </method>
+                       <method name="cancel_animations" symbol="gtk_style_context_cancel_animations">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="region_id" type="gpointer"/>
+                               </parameters>
+                       </method>
+                       <method name="get" symbol="gtk_style_context_get">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                               </parameters>
+                       </method>
+                       <method name="get_background_color" symbol="gtk_style_context_get_background_color">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_border" symbol="gtk_style_context_get_border">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="border" type="GtkBorder*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_border_color" symbol="gtk_style_context_get_border_color">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_color" symbol="gtk_style_context_get_color">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_direction" symbol="gtk_style_context_get_direction">
+                               <return-type type="GtkTextDirection"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_font" symbol="gtk_style_context_get_font">
+                               <return-type type="PangoFontDescription*"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                               </parameters>
+                       </method>
+                       <method name="get_junction_sides" symbol="gtk_style_context_get_junction_sides">
+                               <return-type type="GtkJunctionSides"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_margin" symbol="gtk_style_context_get_margin">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="margin" type="GtkBorder*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_padding" symbol="gtk_style_context_get_padding">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="padding" type="GtkBorder*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_path" symbol="gtk_style_context_get_path">
+                               <return-type type="GtkWidgetPath*"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_property" symbol="gtk_style_context_get_property">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="property" type="gchar*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="value" type="GValue*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_screen" symbol="gtk_style_context_get_screen">
+                               <return-type type="GdkScreen*"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_state" symbol="gtk_style_context_get_state">
+                               <return-type type="GtkStateFlags"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_style" symbol="gtk_style_context_get_style">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_style_property" symbol="gtk_style_context_get_style_property">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="property_name" type="gchar*"/>
+                                       <parameter name="value" type="GValue*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_style_valist" symbol="gtk_style_context_get_style_valist">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="args" type="va_list"/>
+                               </parameters>
+                       </method>
+                       <method name="get_valist" symbol="gtk_style_context_get_valist">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="args" type="va_list"/>
+                               </parameters>
+                       </method>
+                       <method name="has_class" symbol="gtk_style_context_has_class">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="class_name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="has_region" symbol="gtk_style_context_has_region">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="region_name" type="gchar*"/>
+                                       <parameter name="flags_return" type="GtkRegionFlags*"/>
+                               </parameters>
+                       </method>
+                       <method name="invalidate" symbol="gtk_style_context_invalidate">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="list_classes" symbol="gtk_style_context_list_classes">
+                               <return-type type="GList*"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="list_regions" symbol="gtk_style_context_list_regions">
+                               <return-type type="GList*"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="lookup_color" symbol="gtk_style_context_lookup_color">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="color_name" type="gchar*"/>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="lookup_icon_set" symbol="gtk_style_context_lookup_icon_set">
+                               <return-type type="GtkIconSet*"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_style_context_new">
+                               <return-type type="GtkStyleContext*"/>
+                       </constructor>
+                       <method name="notify_state_change" symbol="gtk_style_context_notify_state_change">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="region_id" type="gpointer"/>
+                                       <parameter name="state" type="GtkStateType"/>
+                                       <parameter name="state_value" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="pop_animatable_region" symbol="gtk_style_context_pop_animatable_region">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="push_animatable_region" symbol="gtk_style_context_push_animatable_region">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="region_id" type="gpointer"/>
+                               </parameters>
+                       </method>
+                       <method name="remove_class" symbol="gtk_style_context_remove_class">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="class_name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="remove_provider" symbol="gtk_style_context_remove_provider">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="provider" type="GtkStyleProvider*"/>
+                               </parameters>
+                       </method>
+                       <method name="remove_provider_for_screen" symbol="gtk_style_context_remove_provider_for_screen">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="provider" type="GtkStyleProvider*"/>
+                               </parameters>
+                       </method>
+                       <method name="remove_region" symbol="gtk_style_context_remove_region">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="region_name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="reset_widgets" symbol="gtk_style_context_reset_widgets">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="screen" type="GdkScreen*"/>
+                               </parameters>
+                       </method>
+                       <method name="restore" symbol="gtk_style_context_restore">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="save" symbol="gtk_style_context_save">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                               </parameters>
+                       </method>
+                       <method name="scroll_animations" symbol="gtk_style_context_scroll_animations">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="dx" type="gint"/>
+                                       <parameter name="dy" type="gint"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_diamond">
+                       </method>
+                       <method name="set_background" symbol="gtk_style_context_set_background">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_expander">
+                       </method>
+                       <method name="set_direction" symbol="gtk_style_context_set_direction">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="expander_style" type="GtkExpanderStyle"/>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="direction" type="GtkTextDirection"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_extension">
+                       </method>
+                       <method name="set_junction_sides" symbol="gtk_style_context_set_junction_sides">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
-                                       <parameter name="gap_side" type="GtkPositionType"/>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="sides" type="GtkJunctionSides"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_flat_box">
+                       </method>
+                       <method name="set_path" symbol="gtk_style_context_set_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_focus">
+                       </method>
+                       <method name="set_screen" symbol="gtk_style_context_set_screen">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_handle">
+                       </method>
+                       <method name="set_state" symbol="gtk_style_context_set_state">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
-                                       <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="flags" type="GtkStateFlags"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_hline">
+                       </method>
+                       <method name="state_is_running" symbol="gtk_style_context_state_is_running">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkStyleContext*"/>
+                                       <parameter name="state" type="GtkStateType"/>
+                                       <parameter name="progress" type="gdouble*"/>
+                               </parameters>
+                       </method>
+                       <property name="direction" type="GtkTextDirection" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="changed" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x1" type="gint"/>
-                                       <parameter name="x2" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="context" type="GtkStyleContext*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_layout">
+                       </signal>
+               </object>
+               <object name="GtkStyleProperties" parent="GObject" type-name="GtkStyleProperties" get-type="gtk_style_properties_get_type">
+                       <implements>
+                               <interface name="GtkStyleProvider"/>
+                       </implements>
+                       <method name="clear" symbol="gtk_style_properties_clear">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="use_text" type="gboolean"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="layout" type="PangoLayout*"/>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_option">
+                       </method>
+                       <method name="get" symbol="gtk_style_properties_get">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_resize_grip">
+                       </method>
+                       <method name="get_property" symbol="gtk_style_properties_get_property">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="property" type="gchar*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="value" type="GValue*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_valist" symbol="gtk_style_properties_get_valist">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="edge" type="GdkWindowEdge"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="args" type="va_list"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_shadow">
+                       </method>
+                       <method name="lookup_color" symbol="gtk_style_properties_lookup_color">
+                               <return-type type="GtkSymbolicColor*"/>
+                               <parameters>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="lookup_property" symbol="gtk_style_properties_lookup_property">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="property_name" type="gchar*"/>
+                                       <parameter name="parse_func" type="GtkStylePropertyParser*"/>
+                                       <parameter name="pspec" type="GParamSpec**"/>
+                               </parameters>
+                       </method>
+                       <method name="map_color" symbol="gtk_style_properties_map_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="color" type="GtkSymbolicColor*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_shadow_gap">
+                       </method>
+                       <method name="merge" symbol="gtk_style_properties_merge">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
-                                       <parameter name="gap_side" type="GtkPositionType"/>
-                                       <parameter name="gap_x" type="gint"/>
-                                       <parameter name="gap_width" type="gint"/>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="props_to_merge" type="GtkStyleProperties*"/>
+                                       <parameter name="replace" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_slider">
+                       </method>
+                       <constructor name="new" symbol="gtk_style_properties_new">
+                               <return-type type="GtkStyleProperties*"/>
+                       </constructor>
+                       <method name="register_property" symbol="gtk_style_properties_register_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
-                                       <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="parse_func" type="GtkStylePropertyParser"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_spinner">
+                       </method>
+                       <method name="set" symbol="gtk_style_properties_set">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="step" type="guint"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_tab">
+                       </method>
+                       <method name="set_property" symbol="gtk_style_properties_set_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="property" type="gchar*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="value" type="GValue*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_vline">
+                       </method>
+                       <method name="set_valist" symbol="gtk_style_properties_set_valist">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="cr" type="cairo_t*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
-                                       <parameter name="y1_" type="gint"/>
-                                       <parameter name="y2_" type="gint"/>
-                                       <parameter name="x" type="gint"/>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="args" type="va_list"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="init_from_rc">
+                       </method>
+                       <method name="unset_property" symbol="gtk_style_properties_unset_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="rc_style" type="GtkRcStyle*"/>
+                                       <parameter name="props" type="GtkStyleProperties*"/>
+                                       <parameter name="property" type="gchar*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="render_icon">
-                               <return-type type="GdkPixbuf*"/>
+                       </method>
+               </object>
+               <object name="GtkSwitch" parent="GtkWidget" type-name="GtkSwitch" get-type="gtk_switch_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkActivatable"/>
+                       </implements>
+                       <method name="get_active" symbol="gtk_switch_get_active">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                                       <parameter name="direction" type="GtkTextDirection"/>
-                                       <parameter name="state" type="GtkStateType"/>
-                                       <parameter name="size" type="GtkIconSize"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="gchar*"/>
+                                       <parameter name="sw" type="GtkSwitch*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_background">
+                       </method>
+                       <constructor name="new" symbol="gtk_switch_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="set_active" symbol="gtk_switch_set_active">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="window" type="GdkWindow*"/>
-                                       <parameter name="state_type" type="GtkStateType"/>
+                                       <parameter name="sw" type="GtkSwitch*"/>
+                                       <parameter name="is_active" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-                       <field name="fg" type="GdkColor[]"/>
-                       <field name="bg" type="GdkColor[]"/>
-                       <field name="light" type="GdkColor[]"/>
-                       <field name="dark" type="GdkColor[]"/>
-                       <field name="mid" type="GdkColor[]"/>
-                       <field name="text" type="GdkColor[]"/>
-                       <field name="base" type="GdkColor[]"/>
-                       <field name="text_aa" type="GdkColor[]"/>
-                       <field name="black" type="GdkColor"/>
-                       <field name="white" type="GdkColor"/>
-                       <field name="font_desc" type="PangoFontDescription*"/>
-                       <field name="xthickness" type="gint"/>
-                       <field name="ythickness" type="gint"/>
-                       <field name="background" type="cairo_pattern_t*[]"/>
-                       <field name="attach_count" type="gint"/>
-                       <field name="visual" type="GdkVisual*"/>
-                       <field name="rc_style" type="GtkRcStyle*"/>
-                       <field name="styles" type="GSList*"/>
-                       <field name="property_cache" type="GArray*"/>
-                       <field name="icon_factories" type="GSList*"/>
+                       </method>
+                       <property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
                <object name="GtkTable" parent="GtkContainer" type-name="GtkTable" get-type="gtk_table_get_type">
                        <implements>
@@ -18599,6 +20721,7 @@
                        <constructor name="new" symbol="gtk_text_child_anchor_new">
                                <return-type type="GtkTextChildAnchor*"/>
                        </constructor>
+                       <field name="segment" type="gpointer"/>
                </object>
                <object name="GtkTextMark" parent="GObject" type-name="GtkTextMark" get-type="gtk_text_mark_get_type">
                        <method name="get_buffer" symbol="gtk_text_mark_get_buffer">
@@ -18647,6 +20770,7 @@
                        </method>
                        <property name="left-gravity" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
                        <property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <field name="segment" type="gpointer"/>
                </object>
                <object name="GtkTextTag" parent="GObject" type-name="GtkTextTag" get-type="gtk_text_tag_get_type">
                        <method name="event" symbol="gtk_text_tag_event">
@@ -18749,6 +20873,9 @@
                        </signal>
                </object>
                <object name="GtkTextTagTable" parent="GObject" type-name="GtkTextTagTable" get-type="gtk_text_tag_table_get_type">
+                       <implements>
+                               <interface name="GtkBuildable"/>
+                       </implements>
                        <method name="add" symbol="gtk_text_tag_table_add">
                                <return-type type="void"/>
                                <parameters>
@@ -19338,19 +21465,363 @@
                                <parameters>
                                        <parameter name="text_view" type="GtkTextView*"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-cursor-visible" when="LAST">
+                       </signal>
+                       <signal name="toggle-cursor-visible" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="object" type="GtkTextView*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="toggle-overwrite" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="text_view" type="GtkTextView*"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GtkThemingEngine" parent="GObject" type-name="GtkThemingEngine" get-type="gtk_theming_engine_get_type">
+                       <method name="get" symbol="gtk_theming_engine_get">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                               </parameters>
+                       </method>
+                       <method name="get_background_color" symbol="gtk_theming_engine_get_background_color">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_border" symbol="gtk_theming_engine_get_border">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="border" type="GtkBorder*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_border_color" symbol="gtk_theming_engine_get_border_color">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_color" symbol="gtk_theming_engine_get_color">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_direction" symbol="gtk_theming_engine_get_direction">
+                               <return-type type="GtkTextDirection"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_font" symbol="gtk_theming_engine_get_font">
+                               <return-type type="PangoFontDescription*"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                               </parameters>
+                       </method>
+                       <method name="get_junction_sides" symbol="gtk_theming_engine_get_junction_sides">
+                               <return-type type="GtkJunctionSides"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_margin" symbol="gtk_theming_engine_get_margin">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="margin" type="GtkBorder*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_padding" symbol="gtk_theming_engine_get_padding">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="padding" type="GtkBorder*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_path" symbol="gtk_theming_engine_get_path">
+                               <return-type type="GtkWidgetPath*"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_property" symbol="gtk_theming_engine_get_property">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="property" type="gchar*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="value" type="GValue*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_screen" symbol="gtk_theming_engine_get_screen">
+                               <return-type type="GdkScreen*"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_state" symbol="gtk_theming_engine_get_state">
+                               <return-type type="GtkStateFlags"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_style" symbol="gtk_theming_engine_get_style">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_style_property" symbol="gtk_theming_engine_get_style_property">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="property_name" type="gchar*"/>
+                                       <parameter name="value" type="GValue*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_style_valist" symbol="gtk_theming_engine_get_style_valist">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="args" type="va_list"/>
+                               </parameters>
+                       </method>
+                       <method name="get_valist" symbol="gtk_theming_engine_get_valist">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="args" type="va_list"/>
+                               </parameters>
+                       </method>
+                       <method name="has_class" symbol="gtk_theming_engine_has_class">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="style_class" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="has_region" symbol="gtk_theming_engine_has_region">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="style_region" type="gchar*"/>
+                                       <parameter name="flags" type="GtkRegionFlags*"/>
+                               </parameters>
+                       </method>
+                       <method name="load" symbol="gtk_theming_engine_load">
+                               <return-type type="GtkThemingEngine*"/>
+                               <parameters>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="lookup_color" symbol="gtk_theming_engine_lookup_color">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="color_name" type="gchar*"/>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="register_property" symbol="gtk_theming_engine_register_property">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="name_space" type="gchar*"/>
+                                       <parameter name="parse_func" type="GtkStylePropertyParser"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
+                               </parameters>
+                       </method>
+                       <method name="state_is_running" symbol="gtk_theming_engine_state_is_running">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="state" type="GtkStateType"/>
+                                       <parameter name="progress" type="gdouble*"/>
+                               </parameters>
+                       </method>
+                       <property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <vfunc name="render_activity">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_arrow">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="angle" type="gdouble"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="size" type="gdouble"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_background">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_check">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_expander">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_extension">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                                       <parameter name="gap_side" type="GtkPositionType"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_focus">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_frame">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_frame_gap">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                                       <parameter name="gap_side" type="GtkPositionType"/>
+                                       <parameter name="xy0_gap" type="gdouble"/>
+                                       <parameter name="xy1_gap" type="gdouble"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_handle">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_icon_pixbuf">
+                               <return-type type="GdkPixbuf*"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_layout">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="layout" type="PangoLayout*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_line">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x0" type="gdouble"/>
+                                       <parameter name="y0" type="gdouble"/>
+                                       <parameter name="x1" type="gdouble"/>
+                                       <parameter name="y1" type="gdouble"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="render_option">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkTextView*"/>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-overwrite" when="LAST">
+                       </vfunc>
+                       <vfunc name="render_slider">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="text_view" type="GtkTextView*"/>
+                                       <parameter name="engine" type="GtkThemingEngine*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="x" type="gdouble"/>
+                                       <parameter name="y" type="gdouble"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                                       <parameter name="orientation" type="GtkOrientation"/>
                                </parameters>
-                       </signal>
+                       </vfunc>
                </object>
                <object name="GtkToggleAction" parent="GtkAction" type-name="GtkToggleAction" get-type="gtk_toggle_action_get_type">
                        <implements>
@@ -21177,6 +23648,18 @@
                                        <parameter name="dnotify" type="GDestroyNotify"/>
                                </parameters>
                        </method>
+                       <method name="is_blank_at_pos" symbol="gtk_tree_view_is_blank_at_pos">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="tree_view" type="GtkTreeView*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
+                                       <parameter name="path" type="GtkTreePath**"/>
+                                       <parameter name="column" type="GtkTreeViewColumn**"/>
+                                       <parameter name="cell_x" type="gint*"/>
+                                       <parameter name="cell_y" type="gint*"/>
+                               </parameters>
+                       </method>
                        <method name="is_rubber_banding_active" symbol="gtk_tree_view_is_rubber_banding_active">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -21620,7 +24103,7 @@
                                <parameters>
                                        <parameter name="tree_column" type="GtkTreeViewColumn*"/>
                                        <parameter name="cell_renderer" type="GtkCellRenderer*"/>
-                                       <parameter name="start_pos" type="gint*"/>
+                                       <parameter name="x_offset" type="gint*"/>
                                        <parameter name="width" type="gint*"/>
                                </parameters>
                        </method>
@@ -21683,6 +24166,12 @@
                                        <parameter name="tree_column" type="GtkTreeViewColumn*"/>
                                </parameters>
                        </method>
+                       <method name="get_button" symbol="gtk_tree_view_column_get_button">
+                               <return-type type="GtkWidget*"/>
+                               <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>
@@ -21788,6 +24277,12 @@
                        <constructor name="new" symbol="gtk_tree_view_column_new">
                                <return-type type="GtkTreeViewColumn*"/>
                        </constructor>
+                       <constructor name="new_with_area" symbol="gtk_tree_view_column_new_with_area">
+                               <return-type type="GtkTreeViewColumn*"/>
+                               <parameters>
+                                       <parameter name="area" type="GtkCellArea*"/>
+                               </parameters>
+                       </constructor>
                        <constructor name="new_with_attributes" symbol="gtk_tree_view_column_new_with_attributes">
                                <return-type type="GtkTreeViewColumn*"/>
                                <parameters>
@@ -21947,6 +24442,7 @@
                                </parameters>
                        </method>
                        <property name="alignment" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="cell-area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
                        <property name="clickable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="expand" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="fixed-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -22186,16 +24682,6 @@
                                <return-type type="GtkWidget*"/>
                        </constructor>
                </object>
-               <object name="GtkVRuler" parent="GtkRuler" type-name="GtkVRuler" get-type="gtk_vruler_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkOrientable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_vruler_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-               </object>
                <object name="GtkVScale" parent="GtkScale" type-name="GtkVScale" get-type="gtk_vscale_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
@@ -22316,6 +24802,7 @@
                        <constructor name="new" symbol="gtk_volume_button_new">
                                <return-type type="GtkWidget*"/>
                        </constructor>
+                       <property name="use-symbolic" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
                <object name="GtkWidget" parent="GInitiallyUnowned" type-name="GtkWidget" get-type="gtk_widget_get_type">
                        <implements>
@@ -22567,6 +25054,13 @@
                        <method name="get_default_style" symbol="gtk_widget_get_default_style">
                                <return-type type="GtkStyle*"/>
                        </method>
+                       <method name="get_device_enabled" symbol="gtk_widget_get_device_enabled">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="device" type="GdkDevice*"/>
+                               </parameters>
+                       </method>
                        <method name="get_device_events" symbol="gtk_widget_get_device_events">
                                <return-type type="GdkEventMask"/>
                                <parameters>
@@ -22598,12 +25092,6 @@
                                        <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_extension_events" symbol="gtk_widget_get_extension_events">
-                               <return-type type="GdkExtensionMode"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
                        <method name="get_halign" symbol="gtk_widget_get_halign">
                                <return-type type="GtkAlign"/>
                                <parameters>
@@ -22700,6 +25188,12 @@
                                        <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
+                       <method name="get_path" symbol="gtk_widget_get_path">
+                               <return-type type="GtkWidgetPath*"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                               </parameters>
+                       </method>
                        <method name="get_pointer" symbol="gtk_widget_get_pointer">
                                <return-type type="void"/>
                                <parameters>
@@ -22813,12 +25307,24 @@
                                        <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
+                       <method name="get_state_flags" symbol="gtk_widget_get_state_flags">
+                               <return-type type="GtkStateFlags"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                               </parameters>
+                       </method>
                        <method name="get_style" symbol="gtk_widget_get_style">
                                <return-type type="GtkStyle*"/>
                                <parameters>
                                        <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
+                       <method name="get_style_context" symbol="gtk_widget_get_style_context">
+                               <return-type type="GtkStyleContext*"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                               </parameters>
+                       </method>
                        <method name="get_support_multidevice" symbol="gtk_widget_get_support_multidevice">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -23075,14 +25581,6 @@
                                        <parameter name="style" type="GtkRcStyle*"/>
                                </parameters>
                        </method>
-                       <method name="modify_symbolic_color" symbol="gtk_widget_modify_symbolic_color">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
                        <method name="modify_text" symbol="gtk_widget_modify_text">
                                <return-type type="void"/>
                                <parameters>
@@ -23098,6 +25596,45 @@
                                        <parameter name="first_property_name" type="gchar*"/>
                                </parameters>
                        </constructor>
+                       <method name="override_background_color" symbol="gtk_widget_override_background_color">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="override_color" symbol="gtk_widget_override_color">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="override_cursor" symbol="gtk_widget_override_cursor">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="cursor" type="GdkRGBA*"/>
+                                       <parameter name="secondary_cursor" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
+                       <method name="override_font" symbol="gtk_widget_override_font">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="font_desc" type="PangoFontDescription*"/>
+                               </parameters>
+                       </method>
+                       <method name="override_symbolic_color" symbol="gtk_widget_override_symbolic_color">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="color" type="GdkRGBA*"/>
+                               </parameters>
+                       </method>
                        <method name="path" symbol="gtk_widget_path">
                                <return-type type="void"/>
                                <parameters>
@@ -23192,6 +25729,14 @@
                                        <parameter name="detail" type="gchar*"/>
                                </parameters>
                        </method>
+                       <method name="render_icon_pixbuf" symbol="gtk_widget_render_icon_pixbuf">
+                               <return-type type="GdkPixbuf*"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
+                               </parameters>
+                       </method>
                        <method name="reparent" symbol="gtk_widget_reparent">
                                <return-type type="void"/>
                                <parameters>
@@ -23205,7 +25750,7 @@
                                        <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="reset_shapes" symbol="gtk_widget_reset_shapes">
+                       <method name="reset_style" symbol="gtk_widget_reset_style">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="widget" type="GtkWidget*"/>
@@ -23281,6 +25826,14 @@
                                        <parameter name="dir" type="GtkTextDirection"/>
                                </parameters>
                        </method>
+                       <method name="set_device_enabled" symbol="gtk_widget_set_device_enabled">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="device" type="GdkDevice*"/>
+                                       <parameter name="enabled" type="gboolean"/>
+                               </parameters>
+                       </method>
                        <method name="set_device_events" symbol="gtk_widget_set_device_events">
                                <return-type type="void"/>
                                <parameters>
@@ -23310,13 +25863,6 @@
                                        <parameter name="events" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_extension_events" symbol="gtk_widget_set_extension_events">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="mode" type="GdkExtensionMode"/>
-                               </parameters>
-                       </method>
                        <method name="set_halign" symbol="gtk_widget_set_halign">
                                <return-type type="void"/>
                                <parameters>
@@ -23458,6 +26004,14 @@
                                        <parameter name="state" type="GtkStateType"/>
                                </parameters>
                        </method>
+                       <method name="set_state_flags" symbol="gtk_widget_set_state_flags">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="flags" type="GtkStateFlags"/>
+                                       <parameter name="clear" type="gboolean"/>
+                               </parameters>
+                       </method>
                        <method name="set_style" symbol="gtk_widget_set_style">
                                <return-type type="void"/>
                                <parameters>
@@ -23637,6 +26191,13 @@
                                        <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
+                       <method name="unset_state_flags" symbol="gtk_widget_unset_state_flags">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="flags" type="GtkStateFlags"/>
+                               </parameters>
+                       </method>
                        <property name="app-paintable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                        <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"/>
@@ -23644,7 +26205,6 @@
                        <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="expand" type="gboolean" 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="halign" type="GtkAlign" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="has-default" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="has-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -23816,9 +26376,9 @@
                        <signal name="drag-failed" when="LAST">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="object" type="GtkWidget*"/>
-                                       <parameter name="p0" type="GdkDragContext*"/>
-                                       <parameter name="p1" type="GtkDragResult"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="context" type="GdkDragContext*"/>
+                                       <parameter name="result" type="GtkDragResult"/>
                                </parameters>
                        </signal>
                        <signal name="drag-leave" when="LAST">
@@ -23983,13 +26543,6 @@
                                        <parameter name="direction" type="GtkDirectionType"/>
                                </parameters>
                        </signal>
-                       <signal name="no-expose-event" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="event" type="GdkEvent*"/>
-                               </parameters>
-                       </signal>
                        <signal name="parent-set" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
@@ -24112,18 +26665,18 @@
                                        <parameter name="allocation" type="GdkRectangle*"/>
                                </parameters>
                        </signal>
-                       <signal name="size-request" when="FIRST">
+                       <signal name="state-changed" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="requisition" type="GtkRequisition*"/>
+                                       <parameter name="previous_state" type="GtkStateType"/>
                                </parameters>
                        </signal>
-                       <signal name="state-changed" when="FIRST">
+                       <signal name="state-flags-changed" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="previous_state" type="GtkStateType"/>
+                                       <parameter name="previous_state_flags" type="GtkStateFlags"/>
                                </parameters>
                        </signal>
                        <signal name="style-set" when="FIRST">
@@ -24133,6 +26686,12 @@
                                        <parameter name="previous_style" type="GtkStyle*"/>
                                </parameters>
                        </signal>
+                       <signal name="style-updated" when="FIRST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                               </parameters>
+                       </signal>
                        <signal name="unmap" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
@@ -24171,6 +26730,7 @@
                                <parameters>
                                        <parameter name="widget" type="GtkWidget*"/>
                                        <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="minimum_size" type="gint*"/>
                                        <parameter name="natural_size" type="gint*"/>
                                        <parameter name="allocated_pos" type="gint*"/>
                                        <parameter name="allocated_size" type="gint*"/>
@@ -24285,13 +26845,6 @@
                                        <parameter name="accel_group" type="GtkAccelGroup*"/>
                                </parameters>
                        </method>
-                       <method name="add_embedded_xid" symbol="gtk_window_add_embedded_xid">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="window" type="GtkWindow*"/>
-                                       <parameter name="xid" type="GdkNativeWindow"/>
-                               </parameters>
-                       </method>
                        <method name="add_mnemonic" symbol="gtk_window_add_mnemonic">
                                <return-type type="void"/>
                                <parameters>
@@ -24395,16 +26948,6 @@
                                        <parameter name="window" type="GtkWindow*"/>
                                </parameters>
                        </method>
-                       <method name="get_frame_dimensions" symbol="gtk_window_get_frame_dimensions">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="window" type="GtkWindow*"/>
-                                       <parameter name="left" type="gint*"/>
-                                       <parameter name="top" type="gint*"/>
-                                       <parameter name="right" type="gint*"/>
-                                       <parameter name="bottom" type="gint*"/>
-                               </parameters>
-                       </method>
                        <method name="get_gravity" symbol="gtk_window_get_gravity">
                                <return-type type="GdkGravity"/>
                                <parameters>
@@ -24417,12 +26960,6 @@
                                        <parameter name="window" type="GtkWindow*"/>
                                </parameters>
                        </method>
-                       <method name="get_has_frame" symbol="gtk_window_get_has_frame">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="window" type="GtkWindow*"/>
-                               </parameters>
-                       </method>
                        <method name="get_has_resize_grip" symbol="gtk_window_get_has_resize_grip">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -24643,13 +27180,6 @@
                                        <parameter name="accel_group" type="GtkAccelGroup*"/>
                                </parameters>
                        </method>
-                       <method name="remove_embedded_xid" symbol="gtk_window_remove_embedded_xid">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="window" type="GtkWindow*"/>
-                                       <parameter name="xid" type="GdkNativeWindow"/>
-                               </parameters>
-                       </method>
                        <method name="remove_mnemonic" symbol="gtk_window_remove_mnemonic">
                                <return-type type="void"/>
                                <parameters>
@@ -24789,16 +27319,6 @@
                                        <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_frame_dimensions" symbol="gtk_window_set_frame_dimensions">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="window" type="GtkWindow*"/>
-                                       <parameter name="left" type="gint"/>
-                                       <parameter name="top" type="gint"/>
-                                       <parameter name="right" type="gint"/>
-                                       <parameter name="bottom" type="gint"/>
-                               </parameters>
-                       </method>
                        <method name="set_geometry_hints" symbol="gtk_window_set_geometry_hints">
                                <return-type type="void"/>
                                <parameters>
@@ -24815,18 +27335,18 @@
                                        <parameter name="gravity" type="GdkGravity"/>
                                </parameters>
                        </method>
-                       <method name="set_has_frame" symbol="gtk_window_set_has_frame">
+                       <method name="set_has_resize_grip" symbol="gtk_window_set_has_resize_grip">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="window" type="GtkWindow*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="value" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_has_resize_grip" symbol="gtk_window_set_has_resize_grip">
+                       <method name="set_has_user_ref_count" symbol="gtk_window_set_has_user_ref_count">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="window" type="GtkWindow*"/>
-                                       <parameter name="value" type="gboolean"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
                        <method name="set_icon" symbol="gtk_window_set_icon">
@@ -25051,13 +27571,6 @@
                                        <parameter name="window" type="GtkWindow*"/>
                                </parameters>
                        </signal>
-                       <signal name="frame-event" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="window" type="GtkWindow*"/>
-                                       <parameter name="event" type="GdkEvent*"/>
-                               </parameters>
-                       </signal>
                        <signal name="keys-changed" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
@@ -25172,6 +27685,30 @@
                                </parameters>
                        </vfunc>
                </interface>
+               <interface name="GtkAppChooser" type-name="GtkAppChooser" get-type="gtk_app_chooser_get_type">
+                       <requires>
+                               <interface name="GtkWidget"/>
+                       </requires>
+                       <method name="get_app_info" symbol="gtk_app_chooser_get_app_info">
+                               <return-type type="GAppInfo*"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooser*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_content_type" symbol="gtk_app_chooser_get_content_type">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooser*"/>
+                               </parameters>
+                       </method>
+                       <method name="refresh" symbol="gtk_app_chooser_refresh">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="self" type="GtkAppChooser*"/>
+                               </parameters>
+                       </method>
+                       <property name="content-type" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+               </interface>
                <interface name="GtkBuildable" type-name="GtkBuildable" get-type="gtk_buildable_get_type">
                        <requires>
                                <interface name="GObject"/>
@@ -25417,6 +27954,12 @@
                                        <parameter name="cell" type="GtkCellRenderer*"/>
                                </parameters>
                        </method>
+                       <method name="get_area" symbol="gtk_cell_layout_get_area">
+                               <return-type type="GtkCellArea*"/>
+                               <parameters>
+                                       <parameter name="cell_layout" type="GtkCellLayout*"/>
+                               </parameters>
+                       </method>
                        <method name="get_cells" symbol="gtk_cell_layout_get_cells">
                                <return-type type="GList*"/>
                                <parameters>
@@ -25486,6 +28029,12 @@
                                        <parameter name="cell" type="GtkCellRenderer*"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="get_area">
+                               <return-type type="GtkCellArea*"/>
+                               <parameters>
+                                       <parameter name="cell_layout" type="GtkCellLayout*"/>
+                               </parameters>
+                       </vfunc>
                        <vfunc name="get_cells">
                                <return-type type="GList*"/>
                                <parameters>
@@ -26589,6 +29138,56 @@
                        <property name="vadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
                        <property name="vscroll-policy" type="GtkScrollablePolicy" readable="1" writable="1" construct="0" construct-only="0"/>
                </interface>
+               <interface name="GtkStyleProvider" type-name="GtkStyleProvider" get-type="gtk_style_provider_get_type">
+                       <method name="get_icon_factory" symbol="gtk_style_provider_get_icon_factory">
+                               <return-type type="GtkIconFactory*"/>
+                               <parameters>
+                                       <parameter name="provider" type="GtkStyleProvider*"/>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_style" symbol="gtk_style_provider_get_style">
+                               <return-type type="GtkStyleProperties*"/>
+                               <parameters>
+                                       <parameter name="provider" type="GtkStyleProvider*"/>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_style_property" symbol="gtk_style_provider_get_style_property">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="provider" type="GtkStyleProvider*"/>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="value" type="GValue*"/>
+                               </parameters>
+                       </method>
+                       <vfunc name="get_icon_factory">
+                               <return-type type="GtkIconFactory*"/>
+                               <parameters>
+                                       <parameter name="provider" type="GtkStyleProvider*"/>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="get_style">
+                               <return-type type="GtkStyleProperties*"/>
+                               <parameters>
+                                       <parameter name="provider" type="GtkStyleProvider*"/>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="get_style_property">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="provider" type="GtkStyleProvider*"/>
+                                       <parameter name="path" type="GtkWidgetPath*"/>
+                                       <parameter name="state" type="GtkStateFlags"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="value" type="GValue*"/>
+                               </parameters>
+                       </vfunc>
+               </interface>
                <interface name="GtkToolShell" type-name="GtkToolShell" get-type="gtk_tool_shell_get_type">
                        <requires>
                                <interface name="GtkWidget"/>
@@ -26920,6 +29519,13 @@
                                        <parameter name="child" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
+                       <method name="iter_previous" symbol="gtk_tree_model_iter_previous">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="tree_model" type="GtkTreeModel*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                               </parameters>
+                       </method>
                        <method name="ref_node" symbol="gtk_tree_model_ref_node">
                                <return-type type="void"/>
                                <parameters>
@@ -27103,6 +29709,13 @@
                                        <parameter name="child" type="GtkTreeIter*"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="iter_previous">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="tree_model" type="GtkTreeModel*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                               </parameters>
+                       </vfunc>
                        <vfunc name="ref_node">
                                <return-type type="void"/>
                                <parameters>
@@ -27218,13 +29831,13 @@
                                </parameters>
                        </vfunc>
                </interface>
-               <constant name="GTK_BINARY_AGE" type="int" value="9103"/>
+               <constant name="GTK_BINARY_AGE" type="int" value="9902"/>
                <constant name="GTK_INPUT_ERROR" type="int" value="-1"/>
                <constant name="GTK_INTERFACE_AGE" type="int" value="0"/>
                <constant name="GTK_MAJOR_VERSION" type="int" value="2"/>
                <constant name="GTK_MAX_COMPOSE_LEN" type="int" value="7"/>
-               <constant name="GTK_MICRO_VERSION" type="int" value="3"/>
-               <constant name="GTK_MINOR_VERSION" type="int" value="91"/>
+               <constant name="GTK_MICRO_VERSION" type="int" value="2"/>
+               <constant name="GTK_MINOR_VERSION" type="int" value="99"/>
                <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"/>
@@ -27369,6 +29982,64 @@
                <constant name="GTK_STOCK_ZOOM_FIT" type="char*" value="gtk-zoom-fit"/>
                <constant name="GTK_STOCK_ZOOM_IN" type="char*" value="gtk-zoom-in"/>
                <constant name="GTK_STOCK_ZOOM_OUT" type="char*" value="gtk-zoom-out"/>
+               <constant name="GTK_STYLE_CLASS_ACCELERATOR" type="char*" value="accelerator"/>
+               <constant name="GTK_STYLE_CLASS_BACKGROUND" type="char*" value="background"/>
+               <constant name="GTK_STYLE_CLASS_BUTTON" type="char*" value="button"/>
+               <constant name="GTK_STYLE_CLASS_CALENDAR" type="char*" value="calendar"/>
+               <constant name="GTK_STYLE_CLASS_CELL" type="char*" value="cell"/>
+               <constant name="GTK_STYLE_CLASS_CHECK" type="char*" value="check"/>
+               <constant name="GTK_STYLE_CLASS_DEFAULT" type="char*" value="default"/>
+               <constant name="GTK_STYLE_CLASS_DND" type="char*" value="dnd"/>
+               <constant name="GTK_STYLE_CLASS_DOCK" type="char*" value="dock"/>
+               <constant name="GTK_STYLE_CLASS_ENTRY" type="char*" value="entry"/>
+               <constant name="GTK_STYLE_CLASS_ERROR" type="char*" value="error"/>
+               <constant name="GTK_STYLE_CLASS_EXPANDER" type="char*" value="expander"/>
+               <constant name="GTK_STYLE_CLASS_FRAME" type="char*" value="frame"/>
+               <constant name="GTK_STYLE_CLASS_GRIP" type="char*" value="grip"/>
+               <constant name="GTK_STYLE_CLASS_HEADER" type="char*" value="header"/>
+               <constant name="GTK_STYLE_CLASS_HIGHLIGHT" type="char*" value="highlight"/>
+               <constant name="GTK_STYLE_CLASS_HORIZONTAL" type="char*" value="horizontal"/>
+               <constant name="GTK_STYLE_CLASS_INFO" type="char*" value="info"/>
+               <constant name="GTK_STYLE_CLASS_MARK" type="char*" value="mark"/>
+               <constant name="GTK_STYLE_CLASS_MENU" type="char*" value="menu"/>
+               <constant name="GTK_STYLE_CLASS_MENUBAR" type="char*" value="menubar"/>
+               <constant name="GTK_STYLE_CLASS_MENUITEM" type="char*" value="menuitem"/>
+               <constant name="GTK_STYLE_CLASS_NOTEBOOK" type="char*" value="notebook"/>
+               <constant name="GTK_STYLE_CLASS_PANE_SEPARATOR" type="char*" value="pane-separator"/>
+               <constant name="GTK_STYLE_CLASS_PROGRESSBAR" type="char*" value="progressbar"/>
+               <constant name="GTK_STYLE_CLASS_QUESTION" type="char*" value="question"/>
+               <constant name="GTK_STYLE_CLASS_RADIO" type="char*" value="radio"/>
+               <constant name="GTK_STYLE_CLASS_RUBBERBAND" type="char*" value="rubberband"/>
+               <constant name="GTK_STYLE_CLASS_SCALE" type="char*" value="scale"/>
+               <constant name="GTK_STYLE_CLASS_SCROLLBAR" type="char*" value="scrollbar"/>
+               <constant name="GTK_STYLE_CLASS_SLIDER" type="char*" value="slider"/>
+               <constant name="GTK_STYLE_CLASS_SPINBUTTON" type="char*" value="spinbutton"/>
+               <constant name="GTK_STYLE_CLASS_SPINNER" type="char*" value="spinner"/>
+               <constant name="GTK_STYLE_CLASS_TOOLBAR" type="char*" value="toolbar"/>
+               <constant name="GTK_STYLE_CLASS_TOOLTIP" type="char*" value="tooltip"/>
+               <constant name="GTK_STYLE_CLASS_TROUGH" type="char*" value="trough"/>
+               <constant name="GTK_STYLE_CLASS_VERTICAL" type="char*" value="vertical"/>
+               <constant name="GTK_STYLE_CLASS_VIEW" type="char*" value="view"/>
+               <constant name="GTK_STYLE_CLASS_WARNING" type="char*" value="warning"/>
+               <constant name="GTK_STYLE_PROPERTY_BACKGROUND_COLOR" type="char*" value="background-color"/>
+               <constant name="GTK_STYLE_PROPERTY_BACKGROUND_IMAGE" type="char*" value="background-image"/>
+               <constant name="GTK_STYLE_PROPERTY_BORDER_COLOR" type="char*" value="border-color"/>
+               <constant name="GTK_STYLE_PROPERTY_BORDER_RADIUS" type="char*" value="border-radius"/>
+               <constant name="GTK_STYLE_PROPERTY_BORDER_STYLE" type="char*" value="border-style"/>
+               <constant name="GTK_STYLE_PROPERTY_BORDER_WIDTH" type="char*" value="border-width"/>
+               <constant name="GTK_STYLE_PROPERTY_COLOR" type="char*" value="color"/>
+               <constant name="GTK_STYLE_PROPERTY_FONT" type="char*" value="font"/>
+               <constant name="GTK_STYLE_PROPERTY_MARGIN" type="char*" value="margin"/>
+               <constant name="GTK_STYLE_PROPERTY_PADDING" type="char*" value="padding"/>
+               <constant name="GTK_STYLE_PROVIDER_PRIORITY_APPLICATION" type="int" value="600"/>
+               <constant name="GTK_STYLE_PROVIDER_PRIORITY_FALLBACK" type="int" value="1"/>
+               <constant name="GTK_STYLE_PROVIDER_PRIORITY_SETTINGS" type="int" value="400"/>
+               <constant name="GTK_STYLE_PROVIDER_PRIORITY_THEME" type="int" value="200"/>
+               <constant name="GTK_STYLE_PROVIDER_PRIORITY_USER" type="int" value="800"/>
+               <constant name="GTK_STYLE_REGION_COLUMN" type="char*" value="column"/>
+               <constant name="GTK_STYLE_REGION_COLUMN_HEADER" type="char*" value="column-header"/>
+               <constant name="GTK_STYLE_REGION_ROW" type="char*" value="row"/>
+               <constant name="GTK_STYLE_REGION_TAB" type="char*" value="tab"/>
                <constant name="GTK_TEXT_VIEW_PRIORITY_VALIDATE" type="int" value="5"/>
        </namespace>
 </api>

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 7f3999a464f8cbfb78ad61bb2327c4553e5fb17d..2de6e729dc29569896a2106f7cb78654684dbbac 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -100,6 +100,9 @@ gtk_calendar_set_detail_func.destroy hidden="1"
 GtkCalendarDetailFunc hidden="1"
 GtkCallbackMarshal hidden="1"
 GtkCell.u hidden="1"
+GtkCellArea::apply_attributes has_emitter="1"
+gtk_cell_area_box_pack_start hidden="1"
+gtk_cell_area_box_pack_end hidden="1"
 GtkCellEditable::editing_done has_emitter="1"
 GtkCellEditable::remove_widget has_emitter="1"
 gtk_cell_layout_get_cells transfer_ownership="1" type_arguments="unowned CellRenderer"