remove bindings for deprecated functions

2007-12-09  Juerg Billeter  <j@bitron.ch>

	* vapi/packages/gdk-2.0/, vapi/packages/gtk+-2.0/,
	  vapi/packages/gtk+-2.0/, vapi/packages/pango/: remove bindings for
	  deprecated functions

	* vapi/atk.vapi, vapi/gdk-2.0.vapi, vapi/gtk+-2.0.vapi, vapi/pango.vapi:
	  regenerated

svn path=/trunk/; revision=760

diff --git a/ChangeLog b/ChangeLog
index cd4b76f..cc672e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2007-12-09  Jürg Billeter  <j@bitron.ch>
 
+       * vapi/packages/gdk-2.0/, vapi/packages/gtk+-2.0/,
+         vapi/packages/gtk+-2.0/, vapi/packages/pango/: remove bindings for
+         deprecated functions
+
+       * vapi/atk.vapi, vapi/gdk-2.0.vapi, vapi/gtk+-2.0.vapi, vapi/pango.vapi:
+         regenerated
+
+2007-12-09  Jürg Billeter  <j@bitron.ch>
+
        * vapi/glib-2.0.vapi: add GTimer and g_list_insert_sorted,
          patch by Mikael Hermansson
 

diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index a6d5d65..f8b3626 100644 (file)
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -578,7 +578,7 @@ namespace Atk {
                public static weak string attribute_get_name (Atk.TextAttribute attr);
                public static weak string attribute_get_value (Atk.TextAttribute attr, int index_);
                public static Atk.TextAttribute attribute_register (string name);
-               public static void free_ranges (out Atk.TextRange ranges);
+               public static void free_ranges (out weak Atk.TextRange ranges);
                public abstract weak Atk.TextRange get_bounded_ranges (Atk.TextRectangle rect, Atk.CoordType coord_type, Atk.TextClipType x_clip_type, Atk.TextClipType y_clip_type);
                public abstract int get_caret_offset ();
                public abstract unichar get_character_at_offset (int offset);

diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index fa59e45..e599648 100644 (file)
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -811,6 +811,9 @@ namespace Gdk {
                public Gdk.WindowState new_window_state;
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
+       public class Font {
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
        public class GCValues {
                public Gdk.Color foreground;
                public Gdk.Color background;
@@ -960,30 +963,12 @@ namespace Gdk {
                public int y2;
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public class Selection {
-               public static void convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint time_);
-               public static weak Gdk.Window owner_get (Gdk.Atom selection);
-               public static weak Gdk.Window owner_get_for_display (Gdk.Display display, Gdk.Atom selection);
-               public static bool owner_set (Gdk.Window owner, Gdk.Atom selection, uint time_, bool send_event);
-               public static bool owner_set_for_display (Gdk.Display display, Gdk.Window owner, Gdk.Atom selection, uint time_, bool send_event);
-               [NoArrayLength]
-               public static bool property_get (Gdk.Window requestor, uchar[] data, out Gdk.Atom prop_type, int prop_format);
-               public static void send_notify (uint requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint time_);
-               public static void send_notify_for_display (Gdk.Display display, uint requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint time_);
-       }
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class SelectionType {
-       }
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public class Span {
                public int x;
                public int y;
                public int width;
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public class Target {
-       }
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public class TimeCoord {
                public uint time;
                public weak double[] axes;
@@ -1095,19 +1080,6 @@ namespace Gdk {
                public void send_clientmessage_toall ();
                public void set_screen (Gdk.Screen screen);
        }
-       [CCode (ref_function = "gdk_font_ref", unref_function = "gdk_font_unref", cheader_filename = "gdk/gdk.h")]
-       public class Font : GLib.Boxed {
-               public Gdk.FontType type;
-               public int ascent;
-               public int descent;
-               public bool equal (Gdk.Font fontb);
-               public static weak Gdk.Font from_description (Pango.FontDescription font_desc);
-               public static weak Gdk.Font from_description_for_display (Gdk.Display display, Pango.FontDescription font_desc);
-               public weak Gdk.Display get_display ();
-               public int id ();
-               public static weak Gdk.Font load (string font_name);
-               public static weak Gdk.Font load_for_display (Gdk.Display display, string font_name);
-       }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Colormap : GLib.Object {
                public int size;
@@ -1116,16 +1088,12 @@ namespace Gdk {
                public pointer windowing_data;
                public bool alloc_color (out Gdk.Color color, bool writeable, bool best_match);
                public int alloc_colors (out Gdk.Color colors, int ncolors, bool writeable, bool best_match, bool success);
-               public void change (int ncolors);
                public void free_colors (out Gdk.Color colors, int ncolors);
                public weak Gdk.Screen get_screen ();
                public static weak Gdk.Colormap get_system ();
-               public static int get_system_size ();
                public weak Gdk.Visual get_visual ();
                public Colormap (Gdk.Visual visual, bool allocate);
                public void query_color (ulong pixel, out Gdk.Color result);
-               public weak Gdk.Colormap @ref ();
-               public void unref ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Device : GLib.Object {
@@ -1175,7 +1143,7 @@ namespace Gdk {
                public void get_maximal_cursor_size (uint width, uint height);
                public virtual int get_n_screens ();
                public weak string get_name ();
-               public void get_pointer (out Gdk.Screen screen, int x, int y, Gdk.ModifierType mask);
+               public void get_pointer (out weak Gdk.Screen screen, int x, int y, Gdk.ModifierType mask);
                public virtual weak Gdk.Screen get_screen (int screen_num);
                public weak Gdk.Window get_window_at_pointer (int win_x, int win_y);
                public void keyboard_ungrab (uint time_);
@@ -1225,15 +1193,12 @@ namespace Gdk {
                public uint start_time;
                public pointer windowing_data;
                public DragContext ();
-               public void @ref ();
-               public void unref ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Drawable : GLib.Object {
                public weak Gdk.Image copy_to_image (Gdk.Image image, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
                public virtual weak Gdk.Region get_clip_region ();
                public virtual weak Gdk.Colormap get_colormap ();
-               public pointer get_data (string key);
                public virtual int get_depth ();
                public weak Gdk.Display get_display ();
                public virtual weak Gdk.Image get_image (int x, int y, int width, int height);
@@ -1241,10 +1206,7 @@ namespace Gdk {
                public virtual void get_size (int width, int height);
                public virtual weak Gdk.Region get_visible_region ();
                public virtual weak Gdk.Visual get_visual ();
-               public weak Gdk.Drawable @ref ();
                public virtual void set_colormap (Gdk.Colormap colormap);
-               public void set_data (string key, pointer data, GLib.DestroyNotify destroy_func);
-               public void unref ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class GC : GLib.Object {
@@ -1260,7 +1222,6 @@ namespace Gdk {
                public GC (Gdk.Drawable drawable);
                public GC.with_values (Gdk.Drawable drawable, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
                public void offset (int x_offset, int y_offset);
-               public weak Gdk.GC @ref ();
                public void set_background (out Gdk.Color color);
                public void set_clip_mask (Gdk.Bitmap mask);
                public void set_clip_origin (int x, int y);
@@ -1271,7 +1232,6 @@ namespace Gdk {
                public virtual void set_dashes (int dash_offset, char[] dash_list, int n);
                public void set_exposures (bool exposures);
                public void set_fill (Gdk.Fill fill);
-               public void set_font (Gdk.Font font);
                public void set_foreground (out Gdk.Color color);
                public void set_function (Gdk.Function function);
                public void set_line_attributes (int line_width, Gdk.LineStyle line_style, Gdk.CapStyle cap_style, Gdk.JoinStyle join_style);
@@ -1282,7 +1242,6 @@ namespace Gdk {
                public void set_tile (Gdk.Pixmap tile);
                public void set_ts_origin (int x, int y);
                public virtual void set_values (Gdk.GCValues values, Gdk.GCValuesMask values_mask);
-               public void unref ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Image : GLib.Object {
@@ -1298,21 +1257,18 @@ namespace Gdk {
                public pointer mem;
                public weak Gdk.Colormap colormap;
                public pointer windowing_data;
-               public static weak Gdk.Image get (Gdk.Drawable drawable, int x, int y, int width, int height);
                public weak Gdk.Colormap get_colormap ();
                public uint get_pixel (int x, int y);
                public Image (Gdk.ImageType type, Gdk.Visual visual, int width, int height);
                public void put_pixel (int x, int y, uint pixel);
-               public weak Gdk.Image @ref ();
                public void set_colormap (Gdk.Colormap colormap);
-               public void unref ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Keymap : GLib.Object {
                public weak Gdk.Display display;
                public static weak Gdk.Keymap get_default ();
                public Pango.Direction get_direction ();
-               public bool get_entries_for_keycode (uint hardware_keycode, out Gdk.KeymapKey keys, uint keyvals, int n_entries);
+               public bool get_entries_for_keycode (uint hardware_keycode, out weak Gdk.KeymapKey keys, uint keyvals, int n_entries);
                [NoArrayLength]
                public bool get_entries_for_keyval (uint keyval, Gdk.KeymapKey[] keys, int n_keys);
                public static weak Gdk.Keymap get_for_display (Gdk.Display display);
@@ -1370,12 +1326,9 @@ namespace Gdk {
                [NoArrayLength]
                public Pixbuf.from_xpm_data (string[] data);
                public Pixbuf.subpixbuf (Gdk.Pixbuf src_pixbuf, int src_x, int src_y, int width, int height);
-               public weak Gdk.Pixbuf @ref ();
-               public void render_pixmap_and_mask (out Gdk.Pixmap pixmap_return, out Gdk.Bitmap mask_return, int alpha_threshold);
-               public void render_pixmap_and_mask_for_colormap (Gdk.Colormap colormap, out Gdk.Pixmap pixmap_return, out Gdk.Bitmap mask_return, int alpha_threshold);
+               public void render_pixmap_and_mask (out weak Gdk.Pixmap pixmap_return, out weak Gdk.Bitmap mask_return, int alpha_threshold);
+               public void render_pixmap_and_mask_for_colormap (Gdk.Colormap colormap, out weak Gdk.Pixmap pixmap_return, out weak Gdk.Bitmap mask_return, int alpha_threshold);
                public void render_threshold_alpha (Gdk.Bitmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold);
-               public void render_to_drawable (Gdk.Drawable drawable, Gdk.GC gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither);
-               public void render_to_drawable_alpha (Gdk.Drawable drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.PixbufAlphaMode alpha_mode, int alpha_threshold, Gdk.RgbDither dither, int x_dither, int y_dither);
                public weak Gdk.Pixbuf rotate_simple (Gdk.PixbufRotation angle);
                public void saturate_and_pixelate (Gdk.Pixbuf dest, float saturation, bool pixelate);
                public bool save (string filename, string type) throws GLib.Error;
@@ -1385,10 +1338,9 @@ namespace Gdk {
                public bool save_to_callback (Gdk.PixbufSaveFunc save_func, pointer user_data, string type) throws GLib.Error;
                [NoArrayLength]
                public bool save_to_callbackv (Gdk.PixbufSaveFunc save_func, pointer user_data, string type, string[] option_keys, string[] option_values) throws GLib.Error;
-               public bool savev (string filename, string type, out string option_keys, out string option_values) throws GLib.Error;
+               public bool savev (string filename, string type, out weak string option_keys, out weak string option_values) throws GLib.Error;
                public void scale (Gdk.Pixbuf dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, Gdk.InterpType interp_type);
                public weak Gdk.Pixbuf scale_simple (int dest_width, int dest_height, Gdk.InterpType interp_type);
-               public void unref ();
                [NoAccessorMethod]
                public weak int bits_per_sample { get; construct; }
                [NoAccessorMethod]
@@ -1414,8 +1366,6 @@ namespace Gdk {
                public int get_width ();
                public bool is_static_image ();
                public PixbufAnimation.from_file (string filename) throws GLib.Error;
-               public weak Gdk.PixbufAnimation @ref ();
-               public void unref ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class PixbufAnimationIter : GLib.Object {
@@ -1451,11 +1401,11 @@ namespace Gdk {
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Pixmap : Gdk.Drawable {
-               public static weak Gdk.Pixmap colormap_create_from_xpm (Gdk.Drawable drawable, Gdk.Colormap colormap, out Gdk.Bitmap mask, out Gdk.Color transparent_color, string filename);
-               public static weak Gdk.Pixmap colormap_create_from_xpm_d (Gdk.Drawable drawable, Gdk.Colormap colormap, out Gdk.Bitmap mask, out Gdk.Color transparent_color, string data);
+               public static weak Gdk.Pixmap colormap_create_from_xpm (Gdk.Drawable drawable, Gdk.Colormap colormap, out weak Gdk.Bitmap mask, out Gdk.Color transparent_color, string filename);
+               public static weak Gdk.Pixmap colormap_create_from_xpm_d (Gdk.Drawable drawable, Gdk.Colormap colormap, out weak Gdk.Bitmap mask, out Gdk.Color transparent_color, string data);
                public static weak Gdk.Pixmap create_from_data (Gdk.Drawable drawable, string data, int width, int height, int depth, out Gdk.Color fg, out Gdk.Color bg);
-               public static weak Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, out Gdk.Bitmap mask, out Gdk.Color transparent_color, string filename);
-               public static weak Gdk.Pixmap create_from_xpm_d (Gdk.Drawable drawable, out Gdk.Bitmap mask, out Gdk.Color transparent_color, string data);
+               public static weak Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, out weak Gdk.Bitmap mask, out Gdk.Color transparent_color, string filename);
+               public static weak Gdk.Pixmap create_from_xpm_d (Gdk.Drawable drawable, out weak Gdk.Bitmap mask, out Gdk.Color transparent_color, string data);
                public static weak Gdk.Pixmap foreign_new (pointer anid);
                public static weak Gdk.Pixmap foreign_new_for_display (Gdk.Display display, pointer anid);
                public static weak Gdk.Pixmap foreign_new_for_screen (Gdk.Screen screen, pointer anid, int width, int height, int depth);
@@ -1561,12 +1511,11 @@ namespace Gdk {
                public void fullscreen ();
                public weak GLib.List get_children ();
                public bool get_decorations (Gdk.WMDecoration decorations);
-               public bool get_deskrelative_origin (int x, int y);
                public Gdk.EventMask get_events ();
                public void get_frame_extents (out Gdk.Rectangle rect);
                public void get_geometry (int x, int y, int width, int height, int depth);
                public weak Gdk.Window get_group ();
-               public void get_internal_paint_info (out Gdk.Drawable real_drawable, int x_offset, int y_offset);
+               public void get_internal_paint_info (out weak Gdk.Drawable real_drawable, int x_offset, int y_offset);
                public int get_origin (int x, int y);
                public weak Gdk.Window get_parent ();
                public weak Gdk.Window get_pointer (int x, int y, Gdk.ModifierType mask);
@@ -1621,7 +1570,6 @@ namespace Gdk {
                public void set_functions (Gdk.WMFunction functions);
                public void set_geometry_hints (Gdk.Geometry geometry, Gdk.WindowHints geom_mask);
                public void set_group (Gdk.Window leader);
-               public void set_hints (int x, int y, int min_width, int min_height, int max_width, int max_height, int flags);
                public void set_icon (Gdk.Window icon_window, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
                public void set_icon_list (GLib.List pixbufs);
                public void set_icon_name (string name);
@@ -1682,16 +1630,12 @@ namespace Gdk {
                public ushort red;
                public ushort green;
                public ushort blue;
-               public static int alloc (Gdk.Colormap colormap, out Gdk.Color color);
-               public static int black (Gdk.Colormap colormap, out Gdk.Color color);
-               public static int change (Gdk.Colormap colormap, out Gdk.Color color);
                public Gdk.Color copy ();
                public bool equal (out Gdk.Color colorb);
                public void free ();
                public uint hash ();
                public static bool parse (string spec, out Gdk.Color color);
                public weak string to_string ();
-               public static int white (Gdk.Colormap colormap, out Gdk.Color color);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public struct Rectangle {
@@ -1729,20 +1673,13 @@ namespace Gdk {
        public static void cairo_set_source_color (Cairo.Context cr, out Gdk.Color color);
        public static void cairo_set_source_pixbuf (Cairo.Context cr, Gdk.Pixbuf pixbuf, double pixbuf_x, double pixbuf_y);
        public static void cairo_set_source_pixmap (Cairo.Context cr, Gdk.Pixmap pixmap, double pixmap_x, double pixmap_y);
-       public static int char_height (Gdk.Font font, char character);
-       public static int char_measure (Gdk.Font font, char character);
-       public static int char_width (Gdk.Font font, char character);
-       public static int char_width_wc (Gdk.Font font, Gdk.WChar character);
-       public static int colors_alloc (Gdk.Colormap colormap, bool contiguous, ulong planes, int nplanes, ulong pixels, int npixels);
-       public static void colors_free (Gdk.Colormap colormap, ulong pixels, int npixels, ulong planes);
-       public static void colors_store (Gdk.Colormap colormap, out Gdk.Color colors, int ncolors);
        public static weak GLib.List devices_list ();
        public static void drag_abort (Gdk.DragContext context, uint time_);
        public static weak Gdk.DragContext drag_begin (Gdk.Window window, GLib.List targets);
        public static void drag_drop (Gdk.DragContext context, uint time_);
        public static bool drag_drop_succeeded (Gdk.DragContext context);
-       public static void drag_find_window (Gdk.DragContext context, Gdk.Window drag_window, int x_root, int y_root, out Gdk.Window dest_window, Gdk.DragProtocol protocol);
-       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 Gdk.Window dest_window, Gdk.DragProtocol protocol);
+       public static void drag_find_window (Gdk.DragContext context, Gdk.Window drag_window, int x_root, int y_root, out weak Gdk.Window dest_window, Gdk.DragProtocol protocol);
+       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 weak Gdk.Window dest_window, Gdk.DragProtocol protocol);
        public static uint drag_get_protocol (uint xid, Gdk.DragProtocol protocol);
        public static uint drag_get_protocol_for_display (Gdk.Display display, uint xid, Gdk.DragProtocol protocol);
        public static Gdk.Atom drag_get_selection (Gdk.DragContext context);
@@ -1777,9 +1714,6 @@ namespace Gdk {
        [NoArrayLength]
        public static void draw_rgb_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, uchar[] rgb_buf, int rowstride, int xdith, int ydith);
        public static void draw_segments (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Segment segs, int nsegs);
-       public static void draw_string (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, string string);
-       public static void draw_text (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length);
-       public static void draw_text_wc (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length);
        [NoArrayLength]
        public static void draw_trapezoids (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Trapezoid[] trapezoids, int n_trapezoids);
        public static void drop_finish (Gdk.DragContext context, bool success, uint time_);
@@ -1787,10 +1721,7 @@ namespace Gdk {
        public static int error_trap_pop ();
        public static void error_trap_push ();
        public static bool events_pending ();
-       public static void exit (int error_code);
        public static void flush ();
-       public static weak Gdk.Font fontset_load (string fontset_name);
-       public static weak Gdk.Font fontset_load_for_display (Gdk.Display display, string fontset_name);
        [NoArrayLength]
        public static void free_compound_text (uchar[] ctext);
        public static void free_text_list (string list);
@@ -1799,15 +1730,11 @@ namespace Gdk {
        public static weak string get_display_arg_name ();
        public static weak string get_program_class ();
        public static bool get_show_events ();
-       public static bool get_use_xshm ();
        public static void init (int argc, string argv);
        public static bool init_check (int argc, string argv);
-       public static int input_add (int source, Gdk.InputCondition condition, Gdk.InputFunction function, pointer data);
-       public static int input_add_full (int source, Gdk.InputCondition condition, Gdk.InputFunction function, pointer data, Gdk.DestroyNotify destroy);
-       public static void input_remove (int tag);
        public static void input_set_extension_events (Gdk.Window window, int mask, Gdk.ExtensionMode mode);
        public static Gdk.GrabStatus keyboard_grab (Gdk.Window window, bool owner_events, uint time_);
-       public static bool keyboard_grab_info_libgtk_only (Gdk.Display display, out Gdk.Window grab_window, bool owner_events);
+       public static bool keyboard_grab_info_libgtk_only (Gdk.Display display, out weak Gdk.Window grab_window, bool owner_events);
        public static void keyboard_ungrab (uint time_);
        public static void keyval_convert_case (uint symbol, uint lower, uint upper);
        public static uint keyval_from_name (string keyval_name);
@@ -1818,17 +1745,15 @@ namespace Gdk {
        public static uint keyval_to_unicode (uint keyval);
        public static uint keyval_to_upper (uint keyval);
        public static weak GLib.List list_visuals ();
-       public static int mbstowcs (Gdk.WChar dest, string src, int dest_max);
        public static void notify_startup_complete ();
        public static void notify_startup_complete_with_id (string startup_id);
        public static weak Pango.Context pango_context_get ();
        public static weak Pango.Context pango_context_get_for_screen (Gdk.Screen screen);
-       public static void pango_context_set_colormap (Pango.Context context, Gdk.Colormap colormap);
        public static weak Gdk.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges);
        public static weak Gdk.Region pango_layout_line_get_clip_region (Pango.LayoutLine line, int x_origin, int y_origin, int index_ranges, int n_ranges);
        public static void parse_args (int argc, string argv);
        public static Gdk.GrabStatus pointer_grab (Gdk.Window window, bool owner_events, Gdk.EventMask event_mask, Gdk.Window confine_to, Gdk.Cursor cursor, uint time_);
-       public static bool pointer_grab_info_libgtk_only (Gdk.Display display, out Gdk.Window grab_window, bool owner_events);
+       public static bool pointer_grab_info_libgtk_only (Gdk.Display display, out weak Gdk.Window grab_window, bool owner_events);
        public static bool pointer_is_grabbed ();
        public static void pointer_ungrab (uint time_);
        public static void pre_parse_libgtk_only ();
@@ -1842,39 +1767,35 @@ namespace Gdk {
        public static bool rgb_colormap_ditherable (Gdk.Colormap cmap);
        public static bool rgb_ditherable ();
        public static void rgb_find_color (Gdk.Colormap colormap, out Gdk.Color color);
-       public static void rgb_gc_set_background (Gdk.GC gc, uint rgb);
-       public static void rgb_gc_set_foreground (Gdk.GC gc, uint rgb);
        public static weak Gdk.Colormap rgb_get_colormap ();
        public static weak Gdk.Visual rgb_get_visual ();
-       public static void rgb_init ();
        public static void rgb_set_install (bool install);
        public static void rgb_set_min_colors (int min_colors);
        public static void rgb_set_verbose (bool verbose);
-       public static ulong rgb_xpixel_from_rgb (uint rgb);
+       public static void selection_convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint time_);
+       public static weak Gdk.Window selection_owner_get (Gdk.Atom selection);
+       public static weak Gdk.Window selection_owner_get_for_display (Gdk.Display display, Gdk.Atom selection);
+       public static bool selection_owner_set (Gdk.Window owner, Gdk.Atom selection, uint time_, bool send_event);
+       public static bool selection_owner_set_for_display (Gdk.Display display, Gdk.Window owner, Gdk.Atom selection, uint time_, bool send_event);
+       [NoArrayLength]
+       public static bool selection_property_get (Gdk.Window requestor, uchar[] data, out Gdk.Atom prop_type, int prop_format);
+       public static void selection_send_notify (uint requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint time_);
+       public static void selection_send_notify_for_display (Gdk.Display display, uint requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint time_);
        public static void set_double_click_time (uint msec);
        public static weak string set_locale ();
        public static weak Gdk.PointerHooks set_pointer_hooks (Gdk.PointerHooks new_hooks);
        public static void set_program_class (string program_class);
        public static void set_show_events (bool show_events);
        public static void set_sm_client_id (string sm_client_id);
-       public static void set_use_xshm (bool use_xshm);
        public static bool setting_get (string name, GLib.Value value);
        public static bool spawn_command_line_on_screen (Gdk.Screen screen, string command_line) throws GLib.Error;
        public static bool spawn_on_screen (Gdk.Screen screen, string working_directory, string argv, string envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, pointer user_data, int child_pid) throws GLib.Error;
        public static bool spawn_on_screen_with_pipes (Gdk.Screen screen, string working_directory, string argv, string envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, pointer user_data, int child_pid, int standard_input, int standard_output, int standard_error) throws GLib.Error;
-       public static void string_extents (Gdk.Font font, string string, int lbearing, int rbearing, int width, int ascent, int descent);
-       public static int string_height (Gdk.Font font, string string);
-       public static int string_measure (Gdk.Font font, string string);
        [NoArrayLength]
        public static int string_to_compound_text (string str, out Gdk.Atom encoding, int format, uchar[] ctext, int length);
        [NoArrayLength]
        public static int string_to_compound_text_for_display (Gdk.Display display, string str, out Gdk.Atom encoding, int format, uchar[] ctext, int length);
-       public static int string_width (Gdk.Font font, string string);
        public static void synthesize_window_state (Gdk.Window window, Gdk.WindowState unset_flags, Gdk.WindowState set_flags);
-       public static void text_extents (Gdk.Font font, string text, int text_length, int lbearing, int rbearing, int width, int ascent, int descent);
-       public static void text_extents_wc (Gdk.Font font, Gdk.WChar text, int text_length, int lbearing, int rbearing, int width, int ascent, int descent);
-       public static int text_height (Gdk.Font font, string text, int text_length);
-       public static int text_measure (Gdk.Font font, string text, int text_length);
        [NoArrayLength]
        public static int text_property_to_text_list (Gdk.Atom encoding, int format, uchar[] text, int length, string list);
        [NoArrayLength]
@@ -1883,8 +1804,6 @@ namespace Gdk {
        public static int text_property_to_utf8_list (Gdk.Atom encoding, int format, uchar[] text, int length, string list);
        [NoArrayLength]
        public static int text_property_to_utf8_list_for_display (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
-       public static int text_width (Gdk.Font font, string text, int text_length);
-       public static int text_width_wc (Gdk.Font font, Gdk.WChar text, int text_length);
        public static uint threads_add_idle (GLib.SourceFunc function, pointer data);
        public static uint threads_add_idle_full (int priority, GLib.SourceFunc function, pointer data, GLib.DestroyNotify notify);
        public static uint threads_add_timeout (uint interval, GLib.SourceFunc function, pointer data);
@@ -1899,5 +1818,4 @@ namespace Gdk {
        [NoArrayLength]
        public static bool utf8_to_compound_text_for_display (Gdk.Display display, string str, out Gdk.Atom encoding, int format, uchar[] ctext, int length);
        public static weak string utf8_to_string_target (string str);
-       public static weak string wcstombs (Gdk.WChar src);
 }

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 7e0d815..121bb6f 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -953,8 +953,7 @@ namespace Gtk {
                public void class_path (uint path_length, string path, string path_reversed);
                public weak Pango.Context create_pango_context ();
                public weak Pango.Layout create_pango_layout (string text);
-               public void destroyed (out Gtk.Widget widget_pointer);
-               public void draw (out Gdk.Rectangle area);
+               public void destroyed (out weak Gtk.Widget widget_pointer);
                public void ensure_style ();
                public void error_bell ();
                public void freeze_child_notify ();
@@ -1014,13 +1013,10 @@ namespace Gtk {
                public static void pop_composite_child ();
                public static void push_colormap (Gdk.Colormap cmap);
                public static void push_composite_child ();
-               public void queue_clear ();
-               public void queue_clear_area (int x, int y, int width, int height);
                public void queue_draw ();
                public void queue_draw_area (int x, int y, int width, int height);
                public void queue_resize ();
                public void queue_resize_no_redraw ();
-               public weak Gtk.Widget @ref ();
                public weak Gdk.Region region_intersect (Gdk.Region region);
                public bool remove_accelerator (Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods);
                public void remove_mnemonic_label (Gtk.Widget label);
@@ -1029,7 +1025,6 @@ namespace Gtk {
                public void reset_rc_styles ();
                public void reset_shapes ();
                public int send_expose (Gdk.Event event);
-               public void set (...);
                public void set_accel_path (string accel_path, Gtk.AccelGroup accel_group);
                public void set_app_paintable (bool app_paintable);
                public void set_child_visible (bool is_visible);
@@ -1055,8 +1050,6 @@ namespace Gtk {
                public void set_tooltip_markup (string markup);
                public void set_tooltip_text (string text);
                public void set_tooltip_window (Gtk.Window custom_window);
-               public void set_uposition (int x, int y);
-               public void set_usize (int width, int height);
                public void shape_combine_mask (Gdk.Bitmap shape_mask, int offset_x, int offset_y);
                public virtual void show_all ();
                public void show_now ();
@@ -1067,7 +1060,6 @@ namespace Gtk {
                public bool translate_coordinates (Gtk.Widget dest_widget, int src_x, int src_y, int dest_x, int dest_y);
                public void trigger_tooltip_query ();
                public void unparent ();
-               public void unref ();
                [NoAccessorMethod]
                public weak bool app_paintable { get; set; }
                [NoAccessorMethod]
@@ -1200,8 +1192,6 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Arg {
-               public weak Gtk.Type type;
-               public weak string name;
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class BindingArg {
@@ -1219,8 +1209,6 @@ namespace Gtk {
                public weak Gtk.BindingEntry hash_next;
                public weak Gtk.BindingSignal signals;
                public static void add_signal (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers, string signal_name, uint n_args);
-               public static void add_signall (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers, string signal_name, GLib.SList binding_args);
-               public static void clear (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
                public static void remove (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
                public static void skip (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
        }
@@ -1257,142 +1245,6 @@ namespace Gtk {
                public uint is_secondary;
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CListCellInfo {
-               public int row;
-               public int column;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CListColumn {
-               public weak string title;
-               public Gdk.Rectangle area;
-               public weak Gtk.Widget button;
-               public weak Gdk.Window window;
-               public int width;
-               public int min_width;
-               public int max_width;
-               public Gtk.Justification justification;
-               public uint visible;
-               public uint width_set;
-               public uint resizeable;
-               public uint auto_resize;
-               public uint button_passive;
-               public static void title_active (Gtk.CList clist, int column);
-               public static void title_passive (Gtk.CList clist, int column);
-               public static void titles_active (Gtk.CList clist);
-               public static void titles_hide (Gtk.CList clist);
-               public static void titles_passive (Gtk.CList clist);
-               public static void titles_show (Gtk.CList clist);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CListDestInfo {
-               public weak Gtk.CListCellInfo cell;
-               public Gtk.CListDragPos insert_pos;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CListRow {
-               public weak Gtk.Cell cell;
-               public Gtk.StateType state;
-               public Gdk.Color foreground;
-               public Gdk.Color background;
-               public weak Gtk.Style style;
-               public pointer data;
-               public Gtk.DestroyNotify destroy;
-               public uint fg_set;
-               public uint bg_set;
-               public uint selectable;
-               public static Gtk.Visibility is_visible (Gtk.CList clist, int row);
-               public static void move (Gtk.CList clist, int source_row, int dest_row);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CTreeNode {
-               public weak GLib.List list;
-               public static weak Gtk.Style get_cell_style (Gtk.CTree ctree, Gtk.CTreeNode node, int column);
-               public static Gtk.CellType get_cell_type (Gtk.CTree ctree, Gtk.CTreeNode node, int column);
-               public static bool get_pixmap (Gtk.CTree ctree, Gtk.CTreeNode node, int column, out Gdk.Pixmap pixmap, out Gdk.Bitmap mask);
-               public static bool get_pixtext (Gtk.CTree ctree, Gtk.CTreeNode node, int column, string text, uchar spacing, out Gdk.Pixmap pixmap, out Gdk.Bitmap mask);
-               public static pointer get_row_data (Gtk.CTree ctree, Gtk.CTreeNode node);
-               public static weak Gtk.Style get_row_style (Gtk.CTree ctree, Gtk.CTreeNode node);
-               public static bool get_selectable (Gtk.CTree ctree, Gtk.CTreeNode node);
-               public static bool get_text (Gtk.CTree ctree, Gtk.CTreeNode node, int column, string text);
-               public static Gtk.Visibility is_visible (Gtk.CTree ctree, Gtk.CTreeNode node);
-               public static void moveto (Gtk.CTree ctree, Gtk.CTreeNode node, int column, float row_align, float col_align);
-               public static weak Gtk.CTreeNode nth (Gtk.CTree ctree, uint row);
-               public static void set_background (Gtk.CTree ctree, Gtk.CTreeNode node, out Gdk.Color color);
-               public static void set_cell_style (Gtk.CTree ctree, Gtk.CTreeNode node, int column, Gtk.Style style);
-               public static void set_foreground (Gtk.CTree ctree, Gtk.CTreeNode node, out Gdk.Color color);
-               public static void set_pixmap (Gtk.CTree ctree, Gtk.CTreeNode node, int column, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-               public static void set_pixtext (Gtk.CTree ctree, Gtk.CTreeNode node, int column, string text, uchar spacing, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-               public static void set_row_data (Gtk.CTree ctree, Gtk.CTreeNode node, pointer data);
-               public static void set_row_data_full (Gtk.CTree ctree, Gtk.CTreeNode node, pointer data, Gtk.DestroyNotify destroy);
-               public static void set_row_style (Gtk.CTree ctree, Gtk.CTreeNode node, Gtk.Style style);
-               public static void set_selectable (Gtk.CTree ctree, Gtk.CTreeNode node, bool selectable);
-               public static void set_shift (Gtk.CTree ctree, Gtk.CTreeNode node, int column, int vertical, int horizontal);
-               public static void set_text (Gtk.CTree ctree, Gtk.CTreeNode node, int column, string text);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CTreeRow {
-               public weak Gtk.CListRow row;
-               public weak Gtk.CTreeNode parent;
-               public weak Gtk.CTreeNode sibling;
-               public weak Gtk.CTreeNode children;
-               public weak Gdk.Pixmap pixmap_closed;
-               public weak Gdk.Bitmap mask_closed;
-               public weak Gdk.Pixmap pixmap_opened;
-               public weak Gdk.Bitmap mask_opened;
-               public ushort level;
-               public uint is_leaf;
-               public uint expanded;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Cell {
-               public Gtk.CellType type;
-               public short vertical;
-               public short horizontal;
-               public weak Gtk.Style style;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CellPixText {
-               public Gtk.CellType type;
-               public short vertical;
-               public short horizontal;
-               public weak Gtk.Style style;
-               public weak string text;
-               public uchar spacing;
-               public weak Gdk.Pixmap pixmap;
-               public weak Gdk.Bitmap mask;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CellPixmap {
-               public Gtk.CellType type;
-               public short vertical;
-               public short horizontal;
-               public weak Gtk.Style style;
-               public weak Gdk.Pixmap pixmap;
-               public weak Gdk.Bitmap mask;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CellText {
-               public Gtk.CellType type;
-               public short vertical;
-               public short horizontal;
-               public weak Gtk.Style style;
-               public weak string text;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CellWidget {
-               public Gtk.CellType type;
-               public short vertical;
-               public short horizontal;
-               public weak Gtk.Style style;
-               public weak Gtk.Widget widget;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class ClassInitFunc {
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class EnumValue {
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class FileFilterInfo {
                public Gtk.FileFilterFlags contains;
                public weak string filename;
@@ -1407,12 +1259,6 @@ namespace Gtk {
                public int y;
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class FlagValue {
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class FundamentalType {
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class IMContextInfo {
                public weak string context_id;
                public weak string context_name;
@@ -1453,46 +1299,39 @@ namespace Gtk {
                public weak string stock_id;
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class ItemFactoryEntry {
-               public weak string path;
-               public weak string accelerator;
-               public Gtk.ItemFactoryCallback callback;
-               public uint callback_action;
-               public weak string item_type;
-               public pointer extra_data;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class ItemFactoryItem {
-               public weak string path;
-               public weak GLib.SList widgets;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class LabelSelectionInfo {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class MenuEntry {
-               public weak string path;
-               public weak string accelerator;
-               public Gtk.MenuCallback callback;
-               public pointer callback_data;
-               public weak Gtk.Widget widget;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class NotebookPage {
                public static int num (Gtk.Notebook notebook, Gtk.Widget child);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class ObjectInitFunc {
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class PageRange {
                public int start;
                public int end;
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class PreviewInfo {
-               public weak uchar[] lookup;
-               public double gamma;
+       public class Progress {
+               public weak Gtk.Widget widget;
+               public weak Gtk.Adjustment adjustment;
+               public weak Gdk.Pixmap offscreen_pixmap;
+               public weak string format;
+               public float x_align;
+               public float y_align;
+               public uint show_text;
+               public uint activity_mode;
+               public uint use_text_format;
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public class ProgressClass {
+               public pointer parent_class;
+               public GLib.Callback paint;
+               public GLib.Callback update;
+               public GLib.Callback act_mode_enter;
+               public GLib.Callback _gtk_reserved1;
+               public GLib.Callback _gtk_reserved2;
+               public GLib.Callback _gtk_reserved3;
+               public GLib.Callback _gtk_reserved4;
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class RangeLayout {
@@ -1551,9 +1390,6 @@ namespace Gtk {
                public weak string origin;
                public weak GLib.Value value;
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class SignalMarshaller {
-       }
        [CCode (copy_function = "gtk_stock_item_copy", cheader_filename = "gtk/gtk.h")]
        public class StockItem {
                public weak string stock_id;
@@ -1630,47 +1466,8 @@ namespace Gtk {
        public class ThemeEngine {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class ToolbarChild {
-               public Gtk.ToolbarChildType type;
-               public weak Gtk.Widget widget;
-               public weak Gtk.Widget icon;
-               public weak Gtk.Widget label;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class TooltipsData {
-               public weak Gtk.Tooltips tooltips;
-               public weak Gtk.Widget widget;
-               public weak string tip_text;
-               public weak string tip_private;
-               public static weak Gtk.TooltipsData get (Gtk.Widget widget);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class Type {
                public pointer @class ();
-               public weak Gtk.EnumValue enum_find_value (string value_name);
-               public weak Gtk.EnumValue enum_get_values ();
-               public weak Gtk.FlagValue flags_find_value (string value_name);
-               public weak Gtk.FlagValue flags_get_values ();
-               public static void init (GLib.TypeDebugFlags debug_flags);
-               public Type (Gtk.Type type);
-               public weak Gtk.Type unique (Gtk.TypeInfo gtkinfo);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class TypeClass {
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class TypeInfo {
-               public weak string type_name;
-               public uint object_size;
-               public uint class_size;
-               public weak Gtk.ClassInitFunc class_init_func;
-               public weak Gtk.ObjectInitFunc object_init_func;
-               public pointer reserved_1;
-               public pointer reserved_2;
-               public weak Gtk.ClassInitFunc base_class_init_func;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class TypeObject {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class WidgetAuxInfo {
@@ -1898,7 +1695,6 @@ namespace Gtk {
                public weak string get_license ();
                public weak Gdk.Pixbuf get_logo ();
                public weak string get_logo_icon_name ();
-               public weak string get_name ();
                public weak string get_program_name ();
                public weak string get_translator_credits ();
                public weak string get_version ();
@@ -1918,7 +1714,6 @@ namespace Gtk {
                public void set_license (string license);
                public void set_logo (Gdk.Pixbuf logo);
                public void set_logo_icon_name (string icon_name);
-               public void set_name (string name);
                public void set_program_name (string name);
                public void set_translator_credits (string translator_credits);
                public static Gtk.AboutDialogActivateLinkFunc set_url_hook (Gtk.AboutDialogActivateLinkFunc func, pointer data, GLib.DestroyNotify destroy);
@@ -2290,238 +2085,14 @@ namespace Gtk {
                public int child_min_height;
                public int child_ipad_x;
                public int child_ipad_y;
-               public void get_child_ipadding (int ipad_x, int ipad_y);
                public bool get_child_secondary (Gtk.Widget child);
-               public void get_child_size (int min_width, int min_height);
                public Gtk.ButtonBoxStyle get_layout ();
-               public void set_child_ipadding (int ipad_x, int ipad_y);
                public void set_child_secondary (Gtk.Widget child, bool is_secondary);
-               public void set_child_size (int min_width, int min_height);
                public void set_layout (Gtk.ButtonBoxStyle layout_style);
                [NoAccessorMethod]
                public weak Gtk.ButtonBoxStyle layout_style { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CList : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-               public ushort flags;
-               public pointer reserved1;
-               public pointer reserved2;
-               public uint freeze_count;
-               public Gdk.Rectangle internal_allocation;
-               public int rows;
-               public weak GLib.List row_list;
-               public weak GLib.List row_list_end;
-               public int columns;
-               public Gdk.Rectangle column_title_area;
-               public weak Gdk.Window title_window;
-               public weak Gtk.CListColumn column;
-               public weak Gdk.Window clist_window;
-               public int clist_window_width;
-               public int clist_window_height;
-               public int hoffset;
-               public int voffset;
-               public weak GLib.List selection;
-               public weak GLib.List selection_end;
-               public weak GLib.List undo_unselection;
-               public int undo_anchor;
-               public weak uchar[] button_actions;
-               public uchar drag_button;
-               public weak Gtk.CListCellInfo click_cell;
-               public weak Gtk.Adjustment hadjustment;
-               public weak Gtk.Adjustment vadjustment;
-               public weak Gdk.GC xor_gc;
-               public weak Gdk.GC fg_gc;
-               public weak Gdk.GC bg_gc;
-               public weak Gdk.Cursor cursor_drag;
-               public int x_drag;
-               public int focus_row;
-               public int focus_header_column;
-               public int anchor;
-               public Gtk.StateType anchor_state;
-               public int drag_pos;
-               public int htimer;
-               public int vtimer;
-               public Gtk.CListCompareFunc compare;
-               public int sort_column;
-               public int drag_highlight_row;
-               public Gtk.CListDragPos drag_highlight_pos;
-               [NoArrayLength]
-               public int append (string[] text);
-               public virtual void clear ();
-               public int columns_autosize ();
-               public int find_row_from_data (pointer data);
-               public void freeze ();
-               public weak Gtk.Style get_cell_style (int row, int column);
-               public Gtk.CellType get_cell_type (int row, int column);
-               public weak string get_column_title (int column);
-               public weak Gtk.Widget get_column_widget (int column);
-               public weak Gtk.Adjustment get_hadjustment ();
-               public int get_pixmap (int row, int column, out Gdk.Pixmap pixmap, out Gdk.Bitmap mask);
-               public int get_pixtext (int row, int column, string text, uchar spacing, out Gdk.Pixmap pixmap, out Gdk.Bitmap mask);
-               public pointer get_row_data (int row);
-               public weak Gtk.Style get_row_style (int row);
-               public bool get_selectable (int row);
-               public int get_selection_info (int x, int y, int row, int column);
-               public int get_text (int row, int column, string text);
-               public weak Gtk.Adjustment get_vadjustment ();
-               [NoArrayLength]
-               public int insert (int row, string[] text);
-               public void moveto (int row, int column, float row_align, float col_align);
-               public CList (int columns);
-               [NoArrayLength]
-               public CList.with_titles (int columns, string[] titles);
-               public int optimal_column_width (int column);
-               [NoArrayLength]
-               public int prepend (string[] text);
-               public void remove (int row);
-               public void set_auto_sort (bool auto_sort);
-               public void set_background (int row, out Gdk.Color color);
-               public void set_button_actions (uint button, uchar button_actions);
-               public void set_cell_style (int row, int column, Gtk.Style style);
-               public void set_column_auto_resize (int column, bool auto_resize);
-               public void set_column_justification (int column, Gtk.Justification justification);
-               public void set_column_max_width (int column, int max_width);
-               public void set_column_min_width (int column, int min_width);
-               public void set_column_resizeable (int column, bool resizeable);
-               public void set_column_title (int column, string title);
-               public void set_column_visibility (int column, bool visible);
-               public void set_column_widget (int column, Gtk.Widget widget);
-               public void set_column_width (int column, int width);
-               public void set_compare_func (Gtk.CListCompareFunc cmp_func);
-               public void set_foreground (int row, out Gdk.Color color);
-               public void set_hadjustment (Gtk.Adjustment adjustment);
-               public void set_pixmap (int row, int column, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-               public void set_pixtext (int row, int column, string text, uchar spacing, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-               public void set_reorderable (bool reorderable);
-               public void set_row_data (int row, pointer data);
-               public void set_row_data_full (int row, pointer data, Gtk.DestroyNotify destroy);
-               public void set_row_height (uint height);
-               public void set_row_style (int row, Gtk.Style style);
-               public void set_selectable (int row, bool selectable);
-               public void set_selection_mode (Gtk.SelectionMode mode);
-               public void set_shadow_type (Gtk.ShadowType type);
-               public void set_shift (int row, int column, int vertical, int horizontal);
-               public void set_sort_column (int column);
-               public void set_sort_type (Gtk.SortType sort_type);
-               public void set_text (int row, int column, string text);
-               public void set_use_drag_icons (bool use_icons);
-               public void set_vadjustment (Gtk.Adjustment adjustment);
-               public void sort ();
-               public void swap_rows (int row1, int row2);
-               public void thaw ();
-               [NoAccessorMethod]
-               public weak uint n_columns { get; construct; }
-               [NoAccessorMethod]
-               public weak bool reorderable { get; set; }
-               [NoAccessorMethod]
-               public weak uint row_height { get; set; }
-               [NoAccessorMethod]
-               public weak Gtk.SelectionMode selection_mode { get; set; }
-               [NoAccessorMethod]
-               public weak Gtk.ShadowType shadow_type { get; set; }
-               [NoAccessorMethod]
-               public weak Gtk.SortType sort_type { get; set; }
-               [NoAccessorMethod]
-               public weak bool titles_active { get; set; }
-               [NoAccessorMethod]
-               public weak bool use_drag_icons { get; set; }
-               public signal void abort_column_resize ();
-               public signal void click_column (int column);
-               public signal void end_selection ();
-               public signal void extend_selection (Gtk.ScrollType scroll_type, float position, bool auto_start_selection);
-               public signal void resize_column (int column, int width);
-               public signal void row_move (int source_row, int dest_row);
-               public signal void scroll_horizontal (Gtk.ScrollType scroll_type, float position);
-               public signal void scroll_vertical (Gtk.ScrollType scroll_type, float position);
-               [HasEmitter]
-               public signal void select_all ();
-               [HasEmitter]
-               public signal void select_row (int row, int column, Gdk.Event event);
-               public signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
-               public signal void start_selection ();
-               public signal void toggle_add_mode ();
-               public signal void toggle_focus_row ();
-               [HasEmitter]
-               public signal void undo_selection ();
-               [HasEmitter]
-               public signal void unselect_all ();
-               [HasEmitter]
-               public signal void unselect_row (int row, int column, Gdk.Event event);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CTree : Gtk.CList, Atk.Implementor, Gtk.Buildable {
-               public weak Gdk.GC lines_gc;
-               public int tree_indent;
-               public int tree_spacing;
-               public Gtk.CTreeCompareDragFunc drag_compare;
-               public void collapse (Gtk.CTreeNode node);
-               public void collapse_recursive (Gtk.CTreeNode node);
-               public void collapse_to_depth (Gtk.CTreeNode node, int depth);
-               public void expand (Gtk.CTreeNode node);
-               public void expand_recursive (Gtk.CTreeNode node);
-               public void expand_to_depth (Gtk.CTreeNode node, int depth);
-               public weak GLib.Node export_to_gnode (GLib.Node parent, GLib.Node sibling, Gtk.CTreeNode node, Gtk.CTreeGNodeFunc func, pointer data);
-               public bool find (Gtk.CTreeNode node, Gtk.CTreeNode child);
-               public weak GLib.List find_all_by_row_data (Gtk.CTreeNode node, pointer data);
-               public weak GLib.List find_all_by_row_data_custom (Gtk.CTreeNode node, pointer data, GLib.CompareFunc func);
-               public weak Gtk.CTreeNode find_by_row_data (Gtk.CTreeNode node, pointer data);
-               public weak Gtk.CTreeNode find_by_row_data_custom (Gtk.CTreeNode node, pointer data, GLib.CompareFunc func);
-               public weak Gtk.CTreeNode find_node_ptr (Gtk.CTreeRow ctree_row);
-               public bool get_node_info (Gtk.CTreeNode node, string text, uchar spacing, out Gdk.Pixmap pixmap_closed, out Gdk.Bitmap mask_closed, out Gdk.Pixmap pixmap_opened, out Gdk.Bitmap mask_opened, bool is_leaf, bool expanded);
-               public weak Gtk.CTreeNode insert_gnode (Gtk.CTreeNode parent, Gtk.CTreeNode sibling, GLib.Node gnode, Gtk.CTreeGNodeFunc func, pointer data);
-               [NoArrayLength]
-               public weak Gtk.CTreeNode insert_node (Gtk.CTreeNode parent, Gtk.CTreeNode sibling, string[] text, uchar spacing, Gdk.Pixmap pixmap_closed, Gdk.Bitmap mask_closed, Gdk.Pixmap pixmap_opened, Gdk.Bitmap mask_opened, bool is_leaf, bool expanded);
-               public bool is_ancestor (Gtk.CTreeNode node, Gtk.CTreeNode child);
-               public bool is_hot_spot (int x, int y);
-               public bool is_viewable (Gtk.CTreeNode node);
-               public weak Gtk.CTreeNode last (Gtk.CTreeNode node);
-               public void move (Gtk.CTreeNode node, Gtk.CTreeNode new_parent, Gtk.CTreeNode new_sibling);
-               public CTree (int columns, int tree_column);
-               [NoArrayLength]
-               public CTree.with_titles (int columns, int tree_column, string[] titles);
-               public void post_recursive (Gtk.CTreeNode node, Gtk.CTreeFunc func, pointer data);
-               public void post_recursive_to_depth (Gtk.CTreeNode node, int depth, Gtk.CTreeFunc func, pointer data);
-               public void pre_recursive (Gtk.CTreeNode node, Gtk.CTreeFunc func, pointer data);
-               public void pre_recursive_to_depth (Gtk.CTreeNode node, int depth, Gtk.CTreeFunc func, pointer data);
-               public void real_select_recursive (Gtk.CTreeNode node, int state);
-               public void remove_node (Gtk.CTreeNode node);
-               public void select (Gtk.CTreeNode node);
-               public void select_recursive (Gtk.CTreeNode node);
-               public void set_drag_compare_func (Gtk.CTreeCompareDragFunc cmp_func);
-               public void set_expander_style (Gtk.CTreeExpanderStyle expander_style);
-               public void set_indent (int indent);
-               public void set_line_style (Gtk.CTreeLineStyle line_style);
-               public void set_node_info (Gtk.CTreeNode node, string text, uchar spacing, Gdk.Pixmap pixmap_closed, Gdk.Bitmap mask_closed, Gdk.Pixmap pixmap_opened, Gdk.Bitmap mask_opened, bool is_leaf, bool expanded);
-               public void set_show_stub (bool show_stub);
-               public void set_spacing (int spacing);
-               public void sort_node (Gtk.CTreeNode node);
-               public void sort_recursive (Gtk.CTreeNode node);
-               public void toggle_expansion (Gtk.CTreeNode node);
-               public void toggle_expansion_recursive (Gtk.CTreeNode node);
-               public void unselect (Gtk.CTreeNode node);
-               public void unselect_recursive (Gtk.CTreeNode node);
-               [NoAccessorMethod]
-               public weak Gtk.CTreeExpanderStyle expander_style { get; set; }
-               [NoAccessorMethod]
-               public weak uint indent { get; set; }
-               [NoAccessorMethod]
-               public weak Gtk.CTreeLineStyle line_style { get; set; }
-               [NoAccessorMethod]
-               public weak uint n_columns { get; construct; }
-               [NoAccessorMethod]
-               public weak bool show_stub { get; set; }
-               [NoAccessorMethod]
-               public weak uint spacing { get; set; }
-               [NoAccessorMethod]
-               public weak uint tree_column { get; construct; }
-               public signal void change_focus_row_expansion (Gtk.CTreeExpansionType action);
-               public signal void tree_collapse (Gtk.CTreeNode node);
-               public signal void tree_expand (Gtk.CTreeNode node);
-               public signal void tree_move (Gtk.CTreeNode node, Gtk.CTreeNode new_parent, Gtk.CTreeNode new_sibling);
-               public signal void tree_select_row (Gtk.CTreeNode row, int column);
-               public signal void tree_unselect_row (Gtk.CTreeNode row, int column);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class Calendar : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
                public weak Gtk.Style header_style;
                public weak Gtk.Style label_style;
@@ -2539,8 +2110,6 @@ namespace Gtk {
                public int highlight_col;
                public weak char[] grow_space;
                public void clear_marks ();
-               public void display_options (Gtk.CalendarDisplayOptions flags);
-               public void freeze ();
                public void get_date (uint year, uint month, uint day);
                public Gtk.CalendarDisplayOptions get_display_options ();
                public bool mark_day (uint day);
@@ -2548,7 +2117,6 @@ namespace Gtk {
                public void select_day (uint day);
                public bool select_month (uint month, uint year);
                public void set_display_options (Gtk.CalendarDisplayOptions flags);
-               public void thaw ();
                public bool unmark_day (uint day);
                [NoAccessorMethod]
                public weak int day { get; set; }
@@ -2843,7 +2411,6 @@ namespace Gtk {
                public void set_active (bool is_active);
                public void set_draw_as_radio (bool draw_as_radio);
                public void set_inconsistent (bool setting);
-               public void set_show_toggle (bool always);
                public weak bool active { get; set; }
                public weak bool draw_as_radio { get; set; }
                public weak bool inconsistent { get; set; }
@@ -2903,7 +2470,6 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ColorSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
-               public void get_color (double color);
                public ushort get_current_alpha ();
                public void get_current_color (out Gdk.Color color);
                public bool get_has_opacity_control ();
@@ -2916,16 +2482,13 @@ namespace Gtk {
                public static bool palette_from_string (string str, Gdk.Color[] colors, int n_colors);
                [NoArrayLength]
                public static weak string palette_to_string (Gdk.Color[] colors, int n_colors);
-               public static Gtk.ColorSelectionChangePaletteFunc set_change_palette_hook (Gtk.ColorSelectionChangePaletteFunc func);
                public static Gtk.ColorSelectionChangePaletteWithScreenFunc set_change_palette_with_screen_hook (Gtk.ColorSelectionChangePaletteWithScreenFunc func);
-               public void set_color (double color);
                public void set_current_alpha (ushort alpha);
                public void set_current_color (out Gdk.Color color);
                public void set_has_opacity_control (bool has_opacity);
                public void set_has_palette (bool has_palette);
                public void set_previous_alpha (ushort alpha);
                public void set_previous_color (out Gdk.Color color);
-               public void set_update_policy (Gtk.UpdateType policy);
                public weak uint current_alpha { get; set; }
                public weak Gdk.Color current_color { get; set; }
                public weak bool has_opacity_control { get; set; }
@@ -2941,39 +2504,6 @@ namespace Gtk {
                public ColorSelectionDialog (string title);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Combo : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
-               public weak Gtk.Widget entry;
-               public weak Gtk.Widget button;
-               public weak Gtk.Widget popup;
-               public weak Gtk.Widget popwin;
-               public weak Gtk.Widget list;
-               public uint entry_change_id;
-               public uint list_change_id;
-               public uint ok_if_empty;
-               public uint use_arrows;
-               public uint use_arrows_always;
-               public ushort current_button;
-               public uint activate_id;
-               public void disable_activate ();
-               public Combo ();
-               public void set_case_sensitive (bool val);
-               public void set_item_string (Gtk.Item item, string item_value);
-               public void set_popdown_strings (GLib.List strings);
-               public void set_use_arrows (bool val);
-               public void set_use_arrows_always (bool val);
-               public void set_value_in_list (bool val, bool ok_if_empty);
-               [NoAccessorMethod]
-               public weak bool allow_empty { get; set; }
-               [NoAccessorMethod]
-               public weak bool case_sensitive { get; set; }
-               [NoAccessorMethod]
-               public weak bool enable_arrow_keys { get; set; }
-               [NoAccessorMethod]
-               public weak bool enable_arrows_always { get; set; }
-               [NoAccessorMethod]
-               public weak bool value_in_list { get; set; }
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class ComboBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.CellLayout {
                public void append_text (string text);
                public int get_active ();
@@ -3052,7 +2582,6 @@ namespace Gtk {
                public static weak GLib.ParamSpec class_list_child_properties (GLib.ObjectClass cclass, uint n_properties);
                public virtual void forall (Gtk.Callback callback, pointer callback_data);
                public void @foreach (Gtk.Callback callback, pointer callback_data);
-               public void foreach_full (Gtk.Callback callback, Gtk.CallbackMarshal marshal, pointer callback_data, Gtk.DestroyNotify notify);
                public uint get_border_width ();
                public weak GLib.List get_children ();
                public bool get_focus_chain (GLib.List focusable_widgets);
@@ -3141,7 +2670,6 @@ namespace Gtk {
        public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
                public pointer draw_data;
                public DrawingArea ();
-               public void size (int width, int height);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Entry : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.Editable {
@@ -3177,7 +2705,6 @@ namespace Gtk {
                public int dnd_position;
                public int drag_start_x;
                public int drag_start_y;
-               public void append_text (string text);
                public bool get_activates_default ();
                public float get_alignment ();
                public weak Gtk.EntryCompletion get_completion ();
@@ -3193,19 +2720,14 @@ namespace Gtk {
                public int get_width_chars ();
                public int layout_index_to_text_index (int layout_index);
                public Entry ();
-               public Entry.with_max_length (int max);
-               public void prepend_text (string text);
-               public void select_region (int start, int end);
                public void set_activates_default (bool setting);
                public void set_alignment (float xalign);
                public void set_completion (Gtk.EntryCompletion completion);
                public void set_cursor_hadjustment (Gtk.Adjustment adjustment);
-               public void set_editable (bool editable);
                public void set_has_frame (bool setting);
                public void set_inner_border (out Gtk.Border border);
                public void set_invisible_char (unichar ch);
                public void set_max_length (int max);
-               public void set_position (int position);
                public void set_text (string text);
                public void set_visibility (bool visible);
                public void set_width_chars (int n_chars);
@@ -3358,44 +2880,6 @@ namespace Gtk {
                public void set_name (string name);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class FileSelection : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-               public weak Gtk.Widget dir_list;
-               public weak Gtk.Widget file_list;
-               public weak Gtk.Widget selection_entry;
-               public weak Gtk.Widget selection_text;
-               public weak Gtk.Widget main_vbox;
-               public weak Gtk.Widget ok_button;
-               public weak Gtk.Widget cancel_button;
-               public weak Gtk.Widget help_button;
-               public weak Gtk.Widget history_pulldown;
-               public weak Gtk.Widget history_menu;
-               public weak GLib.List history_list;
-               public weak Gtk.Widget fileop_dialog;
-               public weak Gtk.Widget fileop_entry;
-               public weak string fileop_file;
-               public pointer cmpl_state;
-               public weak Gtk.Widget fileop_c_dir;
-               public weak Gtk.Widget fileop_del_file;
-               public weak Gtk.Widget fileop_ren_file;
-               public weak Gtk.Widget button_area;
-               public weak Gtk.Widget action_area;
-               public weak GLib.PtrArray selected_names;
-               public weak string last_selected;
-               public void complete (string pattern);
-               public weak string get_filename ();
-               public bool get_select_multiple ();
-               public weak string get_selections ();
-               public void hide_fileop_buttons ();
-               public FileSelection (string title);
-               public void set_filename (string filename);
-               public void set_select_multiple (bool select_multiple);
-               public void show_fileop_buttons ();
-               public weak string filename { get; set; }
-               public weak bool select_multiple { get; set; }
-               [NoAccessorMethod]
-               public weak bool show_fileops { get; set; }
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class Fixed : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                public weak GLib.List children;
                public bool get_has_window ();
@@ -3443,12 +2927,12 @@ namespace Gtk {
                public weak Pango.FontFamily family;
                public weak Pango.FontFace face;
                public int size;
-               public weak Gdk.Font get_font ();
                public weak string get_font_name ();
                public weak string get_preview_text ();
                public FontSelection ();
                public bool set_font_name (string fontname);
                public void set_preview_text (string text);
+               [NoAccessorMethod]
                public weak Gdk.Font font { get; }
                public weak string font_name { get; set; }
                public weak string preview_text { get; set; }
@@ -3463,7 +2947,6 @@ namespace Gtk {
                public weak Gtk.Widget cancel_button;
                public int dialog_width;
                public bool auto_resize;
-               public weak Gdk.Font get_font ();
                public weak string get_font_name ();
                public weak string get_preview_text ();
                public FontSelectionDialog (string title);
@@ -3508,11 +2991,7 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class HButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable {
-               public static Gtk.ButtonBoxStyle get_layout_default ();
-               public static int get_spacing_default ();
                public HButtonBox ();
-               public static void set_layout_default (Gtk.ButtonBoxStyle layout);
-               public static void set_spacing_default (int spacing);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class HPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable {
@@ -3568,7 +3047,7 @@ namespace Gtk {
                public virtual bool filter_keypress (Gdk.EventKey event);
                public virtual void focus_in ();
                public virtual void focus_out ();
-               public virtual void get_preedit_string (string str, out Pango.AttrList attrs, int cursor_pos);
+               public virtual void get_preedit_string (string str, out weak Pango.AttrList attrs, int cursor_pos);
                public virtual bool get_surrounding (string text, int cursor_index);
                public virtual void reset ();
                public virtual void set_client_window (Gdk.Window window);
@@ -3647,10 +3126,10 @@ namespace Gtk {
                public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, int n_targets, Gdk.DragAction actions);
                public int get_column_spacing ();
                public int get_columns ();
-               public bool get_cursor (out Gtk.TreePath path, out Gtk.CellRenderer cell);
-               public bool get_dest_item_at_pos (int drag_x, int drag_y, out Gtk.TreePath path, Gtk.IconViewDropPosition pos);
-               public void get_drag_dest_item (out Gtk.TreePath path, Gtk.IconViewDropPosition pos);
-               public bool get_item_at_pos (int x, int y, out Gtk.TreePath path, out Gtk.CellRenderer cell);
+               public bool get_cursor (out weak Gtk.TreePath path, out weak Gtk.CellRenderer cell);
+               public bool get_dest_item_at_pos (int drag_x, int drag_y, out weak Gtk.TreePath path, Gtk.IconViewDropPosition pos);
+               public void get_drag_dest_item (out weak Gtk.TreePath path, Gtk.IconViewDropPosition pos);
+               public bool get_item_at_pos (int x, int y, out weak Gtk.TreePath path, out weak Gtk.CellRenderer cell);
                public int get_item_width ();
                public int get_margin ();
                public int get_markup_column ();
@@ -3665,8 +3144,8 @@ namespace Gtk {
                public int get_spacing ();
                public int get_text_column ();
                public int get_tooltip_column ();
-               public bool get_tooltip_context (int x, int y, bool keyboard_tip, out Gtk.TreeModel model, out Gtk.TreePath path, out Gtk.TreeIter iter);
-               public bool get_visible_range (out Gtk.TreePath start_path, out Gtk.TreePath end_path);
+               public bool get_tooltip_context (int x, int y, bool keyboard_tip, out weak Gtk.TreeModel model, out weak Gtk.TreePath path, out Gtk.TreeIter iter);
+               public bool get_visible_range (out weak Gtk.TreePath start_path, out weak Gtk.TreePath end_path);
                public IconView ();
                public IconView.with_model (Gtk.TreeModel model);
                public bool path_is_selected (Gtk.TreePath path);
@@ -3722,14 +3201,13 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Image : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
                public void clear ();
-               public void get (out Gdk.Image val, out Gdk.Bitmap mask);
                public weak Gdk.PixbufAnimation get_animation ();
                public void get_icon_name (string icon_name, Gtk.IconSize size);
-               public void get_icon_set (out Gtk.IconSet icon_set, Gtk.IconSize size);
-               public void get_image (out Gdk.Image gdk_image, out Gdk.Bitmap mask);
+               public void get_icon_set (out weak Gtk.IconSet icon_set, Gtk.IconSize size);
+               public void get_image (out weak Gdk.Image gdk_image, out weak Gdk.Bitmap mask);
                public weak Gdk.Pixbuf get_pixbuf ();
                public int get_pixel_size ();
-               public void get_pixmap (out Gdk.Pixmap pixmap, out Gdk.Bitmap mask);
+               public void get_pixmap (out weak Gdk.Pixmap pixmap, out weak Gdk.Bitmap mask);
                public void get_stock (string stock_id, Gtk.IconSize size);
                public Gtk.ImageType get_storage_type ();
                public Image ();
@@ -3741,7 +3219,6 @@ namespace Gtk {
                public Image.from_pixbuf (Gdk.Pixbuf pixbuf);
                public Image.from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
                public Image.from_stock (string stock_id, Gtk.IconSize size);
-               public void set (Gdk.Image val, Gdk.Bitmap mask);
                public void set_from_animation (Gdk.PixbufAnimation animation);
                public void set_from_file (string filename);
                public void set_from_icon_name (string icon_name, Gtk.IconSize size);
@@ -3810,7 +3287,6 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Item : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-               public static void factories_path_delete (string ifactory_path, string path);
                [HasEmitter]
                public signal void deselect ();
                [HasEmitter]
@@ -3819,38 +3295,6 @@ namespace Gtk {
                public signal void toggle ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class ItemFactory : Gtk.Object {
-               public weak string path;
-               public weak Gtk.AccelGroup accel_group;
-               public weak Gtk.Widget widget;
-               public weak GLib.SList items;
-               public Gtk.TranslateFunc translate_func;
-               public pointer translate_data;
-               public Gtk.DestroyNotify translate_notify;
-               public static void add_foreign (Gtk.Widget accel_widget, string full_path, Gtk.AccelGroup accel_group, uint keyval, Gdk.ModifierType modifiers);
-               public void @construct (GLib.Type container_type, string path, Gtk.AccelGroup accel_group);
-               public void create_item (Gtk.ItemFactoryEntry entry, pointer callback_data, uint callback_type);
-               public void create_items (uint n_entries, Gtk.ItemFactoryEntry entries, pointer callback_data);
-               public void create_items_ac (uint n_entries, Gtk.ItemFactoryEntry entries, pointer callback_data, uint callback_type);
-               public static void create_menu_entries (uint n_entries, Gtk.MenuEntry entries);
-               public void delete_entries (uint n_entries, Gtk.ItemFactoryEntry entries);
-               public void delete_entry (Gtk.ItemFactoryEntry entry);
-               public void delete_item (string path);
-               public static weak Gtk.ItemFactory from_path (string path);
-               public static weak Gtk.ItemFactory from_widget (Gtk.Widget widget);
-               public weak Gtk.Widget get_item (string path);
-               public weak Gtk.Widget get_item_by_action (uint action);
-               public weak Gtk.Widget get_widget (string path);
-               public weak Gtk.Widget get_widget_by_action (uint action);
-               public ItemFactory (GLib.Type container_type, string path, Gtk.AccelGroup accel_group);
-               public static weak string path_from_widget (Gtk.Widget widget);
-               public void popup (uint x, uint y, uint mouse_button, uint time_);
-               public pointer popup_data ();
-               public static pointer popup_data_from_widget (Gtk.Widget widget);
-               public void popup_with_data (pointer popup_data, Gtk.DestroyNotify destroy, uint x, uint y, uint mouse_button, uint time_);
-               public void set_translate_func (Gtk.TranslateFunc func, pointer data, Gtk.DestroyNotify notify);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class Label : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
                public uint jtype;
                public uint have_transform;
@@ -3862,7 +3306,6 @@ namespace Gtk {
                public weak Pango.Layout layout;
                public weak Gtk.Window mnemonic_window;
                public weak Gtk.LabelSelectionInfo select_info;
-               public void get (string str);
                public double get_angle ();
                public weak Pango.AttrList get_attributes ();
                public Pango.EllipsizeMode get_ellipsize ();
@@ -3884,7 +3327,6 @@ namespace Gtk {
                public int get_width_chars ();
                public Label (string str);
                public Label.with_mnemonic (string str);
-               public uint parse_uline (string string);
                public void select_region (int start_offset, int end_offset);
                public void set_angle (double angle);
                public void set_attributes (Pango.AttrList attrs);
@@ -3939,7 +3381,6 @@ namespace Gtk {
                public int scroll_x;
                public int scroll_y;
                public uint freeze_count;
-               public void freeze ();
                public weak Gtk.Adjustment get_hadjustment ();
                public void get_size (uint width, uint height);
                public weak Gtk.Adjustment get_vadjustment ();
@@ -3949,7 +3390,6 @@ namespace Gtk {
                public void set_hadjustment (Gtk.Adjustment adjustment);
                public void set_size (uint width, uint height);
                public void set_vadjustment (Gtk.Adjustment adjustment);
-               public void thaw ();
                public weak Gtk.Adjustment hadjustment { get; set; }
                [NoAccessorMethod]
                public weak uint height { get; set; }
@@ -3968,68 +3408,6 @@ namespace Gtk {
                public weak string uri { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class List : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-               public weak GLib.List children;
-               public weak GLib.List selection;
-               public weak GLib.List undo_unselection;
-               public weak Gtk.Widget last_focus_child;
-               public weak Gtk.Widget undo_focus_child;
-               public uint htimer;
-               public uint vtimer;
-               public int anchor;
-               public int drag_pos;
-               public Gtk.StateType anchor_state;
-               public uint drag_selection;
-               public uint add_mode;
-               public void append_items (GLib.List items);
-               public int child_position (Gtk.Widget child);
-               public void clear_items (int start, int end);
-               public void end_drag_selection ();
-               public void end_selection ();
-               public void extend_selection (Gtk.ScrollType scroll_type, float position, bool auto_start_selection);
-               public void insert_items (GLib.List items, int position);
-               public List ();
-               public void prepend_items (GLib.List items);
-               public void remove_items (GLib.List items);
-               public void remove_items_no_unref (GLib.List items);
-               public void scroll_horizontal (Gtk.ScrollType scroll_type, float position);
-               public void scroll_vertical (Gtk.ScrollType scroll_type, float position);
-               public void select_all ();
-               public void select_item (int item);
-               public void set_selection_mode (Gtk.SelectionMode mode);
-               public void start_selection ();
-               public void toggle_add_mode ();
-               public void toggle_focus_row ();
-               public void toggle_row (Gtk.Widget item);
-               public void undo_selection ();
-               public void unselect_all ();
-               public void unselect_item (int item);
-               [NoAccessorMethod]
-               public weak Gtk.SelectionMode selection_mode { get; set; }
-               [HasEmitter]
-               public signal void select_child (Gtk.Widget child);
-               public signal void selection_changed ();
-               [HasEmitter]
-               public signal void unselect_child (Gtk.Widget child);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class ListItem : Gtk.Item, Atk.Implementor, Gtk.Buildable {
-               public void deselect ();
-               public ListItem ();
-               public ListItem.with_label (string label);
-               public void select ();
-               public signal void end_selection ();
-               public signal void extend_selection (Gtk.ScrollType scroll_type, float position, bool auto_start_selection);
-               public signal void scroll_horizontal (Gtk.ScrollType scroll_type, float position);
-               public signal void scroll_vertical (Gtk.ScrollType scroll_type, float position);
-               public signal void select_all ();
-               public signal void start_selection ();
-               public signal void toggle_add_mode ();
-               public signal void toggle_focus_row ();
-               public signal void undo_selection ();
-               public signal void unselect_all ();
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class ListStore : GLib.Object, Gtk.Buildable, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource, Gtk.TreeDragDest {
                public int stamp;
                public pointer seq;
@@ -4157,7 +3535,6 @@ namespace Gtk {
                public MenuItem ();
                public MenuItem.with_label (string label);
                public MenuItem.with_mnemonic (string label);
-               public void remove_submenu ();
                public void select ();
                public void set_accel_path (string accel_path);
                public void set_right_justified (bool right_justified);
@@ -4209,7 +3586,6 @@ namespace Gtk {
                public weak Gtk.Widget get_menu ();
                public MenuToolButton (Gtk.Widget icon_widget, string label);
                public MenuToolButton.from_stock (string stock_id);
-               public void set_arrow_tooltip (Gtk.Tooltips tooltips, string tip_text, string tip_private);
                public void set_arrow_tooltip_markup (string markup);
                public void set_arrow_tooltip_text (string text);
                public void set_menu (Gtk.Widget menu);
@@ -4278,7 +3654,6 @@ namespace Gtk {
                public int append_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label);
                public int get_current_page ();
                public pointer get_group ();
-               public int get_group_id ();
                public weak Gtk.Widget get_menu_label (Gtk.Widget child);
                public weak string get_menu_label_text (Gtk.Widget child);
                public int get_n_pages ();
@@ -4305,26 +3680,22 @@ namespace Gtk {
                public void reorder_child (Gtk.Widget child, int position);
                public void set_current_page (int page_num);
                public void set_group (pointer group);
-               public void set_group_id (int group_id);
-               public void set_homogeneous_tabs (bool homogeneous);
                public void set_menu_label (Gtk.Widget child, Gtk.Widget menu_label);
                public void set_menu_label_text (Gtk.Widget child, string menu_text);
                public void set_scrollable (bool scrollable);
                public void set_show_border (bool show_border);
                public void set_show_tabs (bool show_tabs);
-               public void set_tab_border (uint border_width);
                public void set_tab_detachable (Gtk.Widget child, bool detachable);
-               public void set_tab_hborder (uint tab_hborder);
                public void set_tab_label (Gtk.Widget child, Gtk.Widget tab_label);
                public void set_tab_label_packing (Gtk.Widget child, bool expand, bool fill, Gtk.PackType pack_type);
                public void set_tab_label_text (Gtk.Widget child, string tab_text);
                public void set_tab_pos (Gtk.PositionType pos);
                public void set_tab_reorderable (Gtk.Widget child, bool reorderable);
-               public void set_tab_vborder (uint tab_vborder);
                public static void set_window_creation_hook (Gtk.NotebookWindowCreationFunc func, pointer data, GLib.DestroyNotify destroy);
                [NoAccessorMethod]
                public weak bool enable_popup { get; set; }
                public weak pointer group { get; set; }
+               [NoAccessorMethod]
                public weak int group_id { get; set; }
                [NoAccessorMethod]
                public weak bool homogeneous { get; set; }
@@ -4333,6 +3704,7 @@ namespace Gtk {
                public weak bool scrollable { get; set; }
                public weak bool show_border { get; set; }
                public weak bool show_tabs { get; set; }
+               [NoAccessorMethod]
                public weak uint tab_border { set; }
                [NoAccessorMethod]
                public weak uint tab_hborder { get; set; }
@@ -4353,74 +3725,12 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Object : GLib.InitiallyUnowned {
                public uint flags;
-               public static void add_arg_type (string arg_name, Gtk.Type arg_type, uint arg_flags, uint arg_id);
-               public void get (...);
-               public pointer get_data (string key);
-               public pointer get_data_by_id (GLib.Quark data_id);
-               public pointer get_user_data ();
-               public Object (Gtk.Type type, ...);
-               public weak Gtk.Object @ref ();
-               public void remove_data (string key);
-               public void remove_data_by_id (GLib.Quark data_id);
-               public void remove_no_notify (string key);
-               public void remove_no_notify_by_id (GLib.Quark key_id);
-               public void set (...);
-               public void set_data (string key, pointer data);
-               public void set_data_by_id (GLib.Quark data_id, pointer data);
-               public void set_data_by_id_full (GLib.Quark data_id, pointer data, Gtk.DestroyNotify destroy);
-               public void set_data_full (string key, pointer data, Gtk.DestroyNotify destroy);
-               public void set_user_data (pointer data);
-               public void sink ();
-               public void unref ();
-               public void weakref (Gtk.DestroyNotify notify, pointer data);
-               public void weakunref (Gtk.DestroyNotify notify, pointer data);
+               [NoAccessorMethod]
                public weak pointer user_data { get; set; }
                [HasEmitter]
                public signal void destroy ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class OldEditable : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Editable {
-               public uint current_pos;
-               public uint selection_start_pos;
-               public uint selection_end_pos;
-               public uint has_selection;
-               public uint visible;
-               public weak string clipboard_text;
-               public void changed ();
-               public void claim_selection (bool claim, uint time_);
-               [NoAccessorMethod]
-               public weak bool editable { get; set; }
-               [NoAccessorMethod]
-               public weak int text_position { get; set; }
-               public signal void activate ();
-               public signal void copy_clipboard ();
-               public signal void cut_clipboard ();
-               public signal void kill_char (int direction);
-               public signal void kill_line (int direction);
-               public signal void kill_word (int direction);
-               public signal void move_cursor (int x, int y);
-               public signal void move_page (int x, int y);
-               public signal void move_to_column (int row);
-               public signal void move_to_row (int row);
-               public signal void move_word (int n);
-               public signal void paste_clipboard ();
-               public signal void set_editable (bool is_editable);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class OptionMenu : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-               public weak Gtk.Widget menu_item;
-               public ushort width;
-               public ushort height;
-               public int get_history ();
-               public weak Gtk.Widget get_menu ();
-               public OptionMenu ();
-               public void remove_menu ();
-               public void set_history (uint index_);
-               public void set_menu (Gtk.Widget menu);
-               public weak Gtk.Menu menu { get; set; }
-               public signal void changed ();
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class PageSetup : GLib.Object {
                public weak Gtk.PageSetup copy ();
                public double get_bottom_margin (Gtk.Unit unit);
@@ -4470,7 +3780,6 @@ namespace Gtk {
                public int original_position;
                public void add1 (Gtk.Widget child);
                public void add2 (Gtk.Widget child);
-               public void compute_position (int allocation, int child1_req, int child2_req);
                public weak Gtk.Widget get_child1 ();
                public weak Gtk.Widget get_child2 ();
                public int get_position ();
@@ -4492,17 +3801,6 @@ namespace Gtk {
                public signal bool toggle_handle_focus ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Pixmap : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
-               public weak Gdk.Pixmap pixmap;
-               public weak Gdk.Bitmap mask;
-               public weak Gdk.Pixmap pixmap_insensitive;
-               public uint build_insensitive;
-               public void get (out Gdk.Pixmap val, out Gdk.Bitmap mask);
-               public Pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-               public void set (Gdk.Pixmap val, Gdk.Bitmap mask);
-               public void set_build_insensitive (bool build);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class Plug : Gtk.Window, Atk.Implementor, Gtk.Buildable {
                public weak Gdk.Window socket_window;
                public weak Gtk.Widget modality_window;
@@ -4518,34 +3816,6 @@ namespace Gtk {
                public weak bool embedded { get; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Preview : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-               public weak uchar[] buffer;
-               public ushort buffer_width;
-               public ushort buffer_height;
-               public ushort bpp;
-               public ushort rowstride;
-               public Gdk.RgbDither dither;
-               public uint type;
-               [NoArrayLength]
-               public void draw_row (uchar[] data, int x, int y, int w);
-               public static weak Gdk.Colormap get_cmap ();
-               public static weak Gtk.PreviewInfo get_info ();
-               public static weak Gdk.Visual get_visual ();
-               public Preview (Gtk.PreviewType type);
-               public void put (Gdk.Window window, Gdk.GC gc, int srcx, int srcy, int destx, int desty, int width, int height);
-               public static void reset ();
-               public static void set_color_cube (uint nred_shades, uint ngreen_shades, uint nblue_shades, uint ngray_shades);
-               public void set_dither (Gdk.RgbDither dither);
-               public void set_expand (bool expand);
-               public static void set_gamma (double gamma_);
-               public static void set_install_cmap (int install_cmap);
-               public static void set_reserved (int nreserved);
-               public void size (int width, int height);
-               public static void uninit ();
-               [NoAccessorMethod]
-               public weak bool expand { get; set; }
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class PrintContext : GLib.Object {
                public weak Pango.Context create_pango_context ();
                public weak Pango.Layout create_pango_layout ();
@@ -4685,36 +3955,6 @@ namespace Gtk {
                public void unset (string key);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Progress : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-               public weak Gtk.Adjustment adjustment;
-               public weak Gdk.Pixmap offscreen_pixmap;
-               public weak string format;
-               public float x_align;
-               public float y_align;
-               public uint use_text_format;
-               public void configure (double value, double hmin, double max);
-               public double get_current_percentage ();
-               public weak string get_current_text ();
-               public double get_percentage_from_value (double value);
-               public weak string get_text_from_value (double value);
-               public double get_value ();
-               public void set_activity_mode (bool activity_mode);
-               public void set_adjustment (Gtk.Adjustment adjustment);
-               public void set_format_string (string format);
-               public void set_percentage (double percentage);
-               public void set_show_text (bool show_text);
-               public void set_text_alignment (float x_align, float y_align);
-               public void set_value (double value);
-               [NoAccessorMethod]
-               public weak bool activity_mode { get; set; }
-               [NoAccessorMethod]
-               public weak bool show_text { get; set; }
-               [NoAccessorMethod]
-               public weak float text_xalign { get; set; }
-               [NoAccessorMethod]
-               public weak float text_yalign { get; set; }
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class ProgressBar : Gtk.Progress, Atk.Implementor, Gtk.Buildable {
                public uint blocks;
                public int in_block;
@@ -4728,18 +3968,12 @@ namespace Gtk {
                public double get_pulse_step ();
                public weak string get_text ();
                public ProgressBar ();
-               public ProgressBar.with_adjustment (Gtk.Adjustment adjustment);
                public void pulse ();
-               public void set_activity_blocks (uint blocks);
-               public void set_activity_step (uint step);
-               public void set_bar_style (Gtk.ProgressBarStyle style);
-               public void set_discrete_blocks (uint blocks);
                public void set_ellipsize (Pango.EllipsizeMode mode);
                public void set_fraction (double fraction);
                public void set_orientation (Gtk.ProgressBarOrientation orientation);
                public void set_pulse_step (double fraction);
                public void set_text (string text);
-               public void update (double percentage);
                [NoAccessorMethod]
                public weak uint activity_blocks { get; set; }
                [NoAccessorMethod]
@@ -4879,8 +4113,6 @@ namespace Gtk {
                public uint engine_specified;
                public weak Gtk.RcStyle copy ();
                public RcStyle ();
-               public void @ref ();
-               public void unref ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class RecentAction : Gtk.Action, Gtk.Buildable, Gtk.RecentChooser {
@@ -4929,7 +4161,6 @@ namespace Gtk {
                public bool add_item (string uri);
                public static GLib.Quark error_quark ();
                public static weak Gtk.RecentManager get_default ();
-               public static weak Gtk.RecentManager get_for_screen (Gdk.Screen screen);
                public weak GLib.List get_items ();
                public int get_limit ();
                public bool has_item (string uri);
@@ -4939,7 +4170,6 @@ namespace Gtk {
                public int purge_items () throws GLib.Error;
                public bool remove_item (string uri) throws GLib.Error;
                public void set_limit (int limit);
-               public void set_screen (Gdk.Screen screen);
                [NoAccessorMethod]
                public weak string filename { get; construct; }
                public weak int limit { get; set; }
@@ -5202,7 +4432,6 @@ namespace Gtk {
                public void add_id (Gdk.NativeWindow window_id);
                public weak Gdk.NativeWindow get_id ();
                public Socket ();
-               public void steal (Gdk.NativeWindow wid);
                public signal void plug_added ();
                public signal bool plug_removed ();
        }
@@ -5258,7 +4487,7 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class StatusIcon : GLib.Object {
                public bool get_blinking ();
-               public bool get_geometry (out Gdk.Screen screen, out Gdk.Rectangle area, Gtk.Orientation orientation);
+               public bool get_geometry (out weak Gdk.Screen screen, out Gdk.Rectangle area, Gtk.Orientation orientation);
                public weak string get_icon_name ();
                public weak Gdk.Pixbuf get_pixbuf ();
                public weak Gdk.Screen get_screen ();
@@ -5359,15 +4588,11 @@ namespace Gtk {
                public weak Gtk.Style attach (Gdk.Window window);
                public virtual weak Gtk.Style copy ();
                public void detach ();
-               public weak Gdk.Font get_font ();
                public bool lookup_color (string color_name, out Gdk.Color color);
                public weak Gtk.IconSet lookup_icon_set (string stock_id);
                public Style ();
-               public weak Gtk.Style @ref ();
                public virtual weak 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);
-               public void set_font (Gdk.Font font);
-               public void unref ();
                public signal void realize ();
                public signal void unrealize ();
        }
@@ -5818,29 +5043,6 @@ namespace Gtk {
                public signal void toggle_overwrite ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class TipsQuery : Gtk.Label, Atk.Implementor, Gtk.Buildable {
-               public uint in_query;
-               public weak Gtk.Widget last_crossed;
-               public weak Gdk.Cursor query_cursor;
-               public TipsQuery ();
-               public void set_caller (Gtk.Widget caller);
-               public void set_labels (string label_inactive, string label_no_tip);
-               [NoAccessorMethod]
-               public weak Gtk.Widget caller { get; set; }
-               [NoAccessorMethod]
-               public weak bool emit_always { get; set; }
-               [NoAccessorMethod]
-               public weak string label_inactive { get; set; }
-               [NoAccessorMethod]
-               public weak string label_no_tip { get; set; }
-               [HasEmitter]
-               public signal void start_query ();
-               [HasEmitter]
-               public signal void stop_query ();
-               public signal void widget_entered (Gtk.Widget widget, string tip_text, string tip_private);
-               public signal bool widget_selected (Gtk.Widget widget, string tip_text, string tip_private, Gdk.Event event);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class ToggleAction : Gtk.Action, Gtk.Buildable {
                public bool get_active ();
                public bool get_draw_as_radio ();
@@ -5932,8 +5134,6 @@ namespace Gtk {
                public weak bool visible_horizontal { get; set; }
                public weak bool visible_vertical { get; set; }
                public signal bool create_menu_proxy ();
-               [HasEmitter]
-               public signal bool set_tooltip (Gtk.Tooltips tooltips, string tip_text, string tip_private);
                public signal void toolbar_reconfigured ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -5944,10 +5144,6 @@ namespace Gtk {
                public int button_maxw;
                public int button_maxh;
                public uint style_set;
-               public weak Gtk.Widget append_element (Gtk.ToolbarChildType type, Gtk.Widget widget, string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc callback, pointer user_data);
-               public weak Gtk.Widget append_item (string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc callback, pointer user_data);
-               public void append_space ();
-               public void append_widget (Gtk.Widget widget, string tooltip_text, string tooltip_private_text);
                public int get_drop_index (int x, int y);
                public Gtk.IconSize get_icon_size ();
                public int get_item_index (Gtk.ToolItem item);
@@ -5959,17 +5155,7 @@ namespace Gtk {
                public Gtk.ToolbarStyle get_style ();
                public bool get_tooltips ();
                public void insert (Gtk.ToolItem item, int pos);
-               public weak Gtk.Widget insert_element (Gtk.ToolbarChildType type, Gtk.Widget widget, string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc callback, pointer user_data, int position);
-               public weak Gtk.Widget insert_item (string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc callback, pointer user_data, int position);
-               public void insert_space (int position);
-               public weak Gtk.Widget insert_stock (string stock_id, string tooltip_text, string tooltip_private_text, Gtk.SignalFunc callback, pointer user_data, int position);
-               public void insert_widget (Gtk.Widget widget, string tooltip_text, string tooltip_private_text, int position);
                public Toolbar ();
-               public weak Gtk.Widget prepend_element (Gtk.ToolbarChildType type, Gtk.Widget widget, string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc callback, pointer user_data);
-               public weak Gtk.Widget prepend_item (string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc callback, pointer user_data);
-               public void prepend_space ();
-               public void prepend_widget (Gtk.Widget widget, string tooltip_text, string tooltip_private_text);
-               public void remove_space (int position);
                public void set_drop_highlight_item (Gtk.ToolItem tool_item, int index_);
                public void set_icon_size (Gtk.IconSize icon_size);
                public void set_orientation (Gtk.Orientation orientation);
@@ -6002,26 +5188,6 @@ namespace Gtk {
                public static void trigger_tooltip_query (Gdk.Display display);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Tooltips : Gtk.Object {
-               public weak Gtk.Widget tip_window;
-               public weak Gtk.Widget tip_label;
-               public weak Gtk.TooltipsData active_tips_data;
-               public weak GLib.List tips_data_list;
-               public uint delay;
-               public uint enabled;
-               public uint have_grab;
-               public uint use_sticky_delay;
-               public int timer_tag;
-               public GLib.TimeVal last_popdown;
-               public void disable ();
-               public void enable ();
-               public void force_window ();
-               public static bool get_info_from_tip_window (Gtk.Window tip_window, out Gtk.Tooltips tooltips, out Gtk.Widget current_widget);
-               public Tooltips ();
-               public void set_delay (uint delay);
-               public void set_tip (Gtk.Widget widget, string tip_text, string tip_private);
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class TreeModelFilter : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource {
                public void clear_cache ();
                public bool convert_child_iter_to_iter (out Gtk.TreeIter filter_iter, out Gtk.TreeIter child_iter);
@@ -6079,8 +5245,8 @@ namespace Gtk {
                public Gtk.DestroyNotify destroy;
                public int count_selected_rows ();
                public Gtk.SelectionMode get_mode ();
-               public bool get_selected (out Gtk.TreeModel model, out Gtk.TreeIter iter);
-               public weak GLib.List get_selected_rows (out Gtk.TreeModel model);
+               public bool get_selected (out weak Gtk.TreeModel model, out Gtk.TreeIter iter);
+               public weak GLib.List get_selected_rows (out weak Gtk.TreeModel model);
                public weak Gtk.TreeView get_tree_view ();
                public pointer get_user_data ();
                public bool iter_is_selected (out Gtk.TreeIter iter);
@@ -6168,9 +5334,9 @@ namespace Gtk {
                public void get_cell_area (Gtk.TreePath path, Gtk.TreeViewColumn column, out Gdk.Rectangle rect);
                public weak Gtk.TreeViewColumn get_column (int n);
                public weak GLib.List get_columns ();
-               public void get_cursor (out Gtk.TreePath path, out Gtk.TreeViewColumn focus_column);
-               public bool get_dest_row_at_pos (int drag_x, int drag_y, out Gtk.TreePath path, Gtk.TreeViewDropPosition pos);
-               public void get_drag_dest_row (out Gtk.TreePath path, Gtk.TreeViewDropPosition pos);
+               public void get_cursor (out weak Gtk.TreePath path, out weak Gtk.TreeViewColumn focus_column);
+               public bool get_dest_row_at_pos (int drag_x, int drag_y, out weak Gtk.TreePath path, Gtk.TreeViewDropPosition pos);
+               public void get_drag_dest_row (out weak Gtk.TreePath path, Gtk.TreeViewDropPosition pos);
                public bool get_enable_search ();
                public bool get_enable_tree_lines ();
                public weak Gtk.TreeViewColumn get_expander_column ();
@@ -6183,7 +5349,7 @@ namespace Gtk {
                public bool get_hover_selection ();
                public int get_level_indentation ();
                public weak Gtk.TreeModel get_model ();
-               public bool get_path_at_pos (int x, int y, out Gtk.TreePath path, out Gtk.TreeViewColumn column, int cell_x, int cell_y);
+               public bool get_path_at_pos (int x, int y, out weak Gtk.TreePath path, out weak Gtk.TreeViewColumn column, int cell_x, int cell_y);
                public bool get_reorderable ();
                public Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
                public bool get_rubber_banding ();
@@ -6195,9 +5361,9 @@ namespace Gtk {
                public weak Gtk.TreeSelection get_selection ();
                public bool get_show_expanders ();
                public int get_tooltip_column ();
-               public bool get_tooltip_context (int x, int y, bool keyboard_tip, out Gtk.TreeModel model, out Gtk.TreePath path, out Gtk.TreeIter iter);
+               public bool get_tooltip_context (int x, int y, bool keyboard_tip, out weak Gtk.TreeModel model, out weak Gtk.TreePath path, out Gtk.TreeIter iter);
                public weak Gtk.Adjustment get_vadjustment ();
-               public bool get_visible_range (out Gtk.TreePath start_path, out Gtk.TreePath end_path);
+               public bool get_visible_range (out weak Gtk.TreePath start_path, out weak Gtk.TreePath end_path);
                public void get_visible_rect (out Gdk.Rectangle visible_rect);
                public int insert_column (Gtk.TreeViewColumn column, int position);
                public int insert_column_with_attributes (int position, string title, Gtk.CellRenderer cell, ...);
@@ -6240,10 +5406,8 @@ namespace Gtk {
                public void set_tooltip_column (int column);
                public void set_tooltip_row (Gtk.Tooltip tooltip, Gtk.TreePath path);
                public void set_vadjustment (Gtk.Adjustment adjustment);
-               public void tree_to_widget_coords (int tx, int ty, int wx, int wy);
                public void unset_rows_drag_dest ();
                public void unset_rows_drag_source ();
-               public void widget_to_tree_coords (int wx, int wy, int tx, int ty);
                [NoAccessorMethod]
                public weak Gtk.TreeViewGridLines enable_grid_lines { get; set; }
                public weak bool enable_search { get; set; }
@@ -6410,11 +5574,7 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class VButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable {
-               public static Gtk.ButtonBoxStyle get_layout_default ();
-               public static int get_spacing_default ();
                public VButtonBox ();
-               public static void set_layout_default (Gtk.ButtonBoxStyle layout);
-               public static void set_spacing_default (int spacing);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class VPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable {
@@ -6564,7 +5724,6 @@ namespace Gtk {
                public void set_mnemonic_modifier (Gdk.ModifierType modifier);
                public void set_modal (bool modal);
                public void set_opacity (double opacity);
-               public void set_policy (int allow_shrink, int allow_grow, int auto_shrink);
                public void set_position (Gtk.WindowPosition position);
                public void set_resizable (bool resizable);
                public void set_role (string role);
@@ -6763,7 +5922,6 @@ namespace Gtk {
                public bool get_select_multiple ();
                public bool get_show_icons ();
                public bool get_show_not_found ();
-               public bool get_show_numbers ();
                public bool get_show_private ();
                public bool get_show_tips ();
                public Gtk.RecentSortType get_sort_type ();
@@ -6779,7 +5937,6 @@ namespace Gtk {
                public void set_select_multiple (bool select_multiple);
                public void set_show_icons (bool show_icons);
                public void set_show_not_found (bool show_not_found);
-               public void set_show_numbers (bool show_numbers);
                public void set_show_private (bool show_private);
                public void set_show_tips (bool show_tips);
                public abstract void set_sort_func (Gtk.RecentSortFunc sort_func, pointer sort_data, GLib.DestroyNotify data_destroy);
@@ -7024,10 +6181,6 @@ namespace Gtk {
        public static delegate void AccelMapForeach (pointer data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed);
        public static delegate int AssistantPageFunc (int current_page, pointer data);
        public static delegate void BuilderConnectFunc (Gtk.Builder builder, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags flags, pointer user_data);
-       public static delegate int CListCompareFunc (Gtk.CList clist, pointer ptr1, pointer ptr2);
-       public static delegate bool CTreeCompareDragFunc (Gtk.CTree ctree, Gtk.CTreeNode source_node, Gtk.CTreeNode new_parent, Gtk.CTreeNode new_sibling);
-       public static delegate void CTreeFunc (Gtk.CTree ctree, Gtk.CTreeNode node, pointer data);
-       public static delegate bool CTreeGNodeFunc (Gtk.CTree ctree, uint depth, GLib.Node gnode, Gtk.CTreeNode cnode, pointer data);
        public static delegate void Callback (Gtk.Widget widget, pointer data);
        public static delegate void CellLayoutDataFunc (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, out Gtk.TreeIter iter, pointer data);
        public static delegate void ClipboardClearFunc (Gtk.Clipboard clipboard, pointer user_data_or_owner);
@@ -7044,19 +6197,14 @@ namespace Gtk {
        public static delegate bool FileFilterFunc (Gtk.FileFilterInfo filter_info, pointer data);
        public static delegate bool Function (pointer data);
        public static delegate void IconViewForeachFunc (Gtk.IconView icon_view, Gtk.TreePath path, pointer data);
-       public static delegate void ItemFactoryCallback ();
-       public static delegate void ItemFactoryCallback1 (pointer callback_data, uint callback_action, Gtk.Widget widget);
-       public static delegate void ItemFactoryCallback2 (Gtk.Widget widget, pointer callback_data, uint callback_action);
        public static delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, pointer func_data);
        public static delegate void LinkButtonUriFunc (Gtk.LinkButton button, string link_, pointer user_data);
-       public static delegate void MenuCallback (Gtk.Widget widget, pointer user_data);
        public static delegate void MenuDetachFunc (Gtk.Widget attach_widget, Gtk.Menu menu);
        public static delegate void MenuPositionFunc (Gtk.Menu menu, int x, int y, bool push_in, pointer user_data);
        public static delegate void ModuleDisplayInitFunc (Gdk.Display display);
        public static delegate void ModuleInitFunc (int argc, string argv);
        public static delegate weak Gtk.Notebook NotebookWindowCreationFunc (Gtk.Notebook source, Gtk.Widget page, int x, int y, pointer data);
        public static delegate void PageSetupDoneFunc (Gtk.PageSetup page_setup, pointer data);
-       public static delegate void PrintFunc (pointer func_data, string str);
        public static delegate void PrintSettingsFunc (string key, string value, pointer user_data);
        public static delegate bool RcPropertyParser (GLib.ParamSpec pspec, GLib.String rc_string, GLib.Value property_value);
        public static delegate bool RecentFilterFunc (Gtk.RecentFilterInfo filter_info, pointer user_data);
@@ -7065,7 +6213,6 @@ namespace Gtk {
        public static delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, out Gtk.TextIter iter, uchar data, ulong length, bool create_tags, pointer user_data, GLib.Error error);
        public static delegate uchar TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, out Gtk.TextIter start, out Gtk.TextIter end, ulong length, pointer user_data);
        public static delegate bool TextCharPredicate (unichar ch, pointer user_data);
-       public static delegate void TextFunction (Gtk.OldEditable editable, uint time_);
        public static delegate void TextTagTableForeach (Gtk.TextTag tag, pointer data);
        public static delegate weak string TranslateFunc (string path, pointer func_data);
        public static delegate void TreeCellDataFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, out Gtk.TreeIter iter, pointer data);
@@ -7241,7 +6388,6 @@ namespace Gtk {
        public static void accelerator_set_default_mod_mask (Gdk.ModifierType default_mod_mask);
        public static bool accelerator_valid (uint keyval, Gdk.ModifierType modifiers);
        public static bool alternative_dialog_button_order (Gdk.Screen screen);
-       public static uint binding_parse_binding (GLib.Scanner scanner);
        public static bool bindings_activate (Gtk.Object object, uint keyval, Gdk.ModifierType modifiers);
        public static bool bindings_activate_event (Gtk.Object object, Gdk.EventKey event);
        public static weak string check_version (uint required_major, uint required_minor, uint required_micro);
@@ -7264,7 +6410,6 @@ namespace Gtk {
        public static void drag_get_data (Gtk.Widget widget, Gdk.DragContext context, Gdk.Atom target, uint time_);
        public static weak Gtk.Widget drag_get_source_widget (Gdk.DragContext context);
        public static void drag_highlight (Gtk.Widget widget);
-       public static void drag_set_default_icon (Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Bitmap mask, int hot_x, int hot_y);
        public static void drag_set_icon_default (Gdk.DragContext context);
        public static void drag_set_icon_name (Gdk.DragContext context, string icon_name, int hot_x, int hot_y);
        public static void drag_set_icon_pixbuf (Gdk.DragContext context, Gdk.Pixbuf pixbuf, int hot_x, int hot_y);
@@ -7284,30 +6429,8 @@ namespace Gtk {
        public static void drag_source_set_target_list (Gtk.Widget widget, Gtk.TargetList target_list);
        public static void drag_source_unset (Gtk.Widget widget);
        public static void drag_unhighlight (Gtk.Widget widget);
-       public static void draw_arrow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);
-       public static void draw_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height);
-       public static void draw_box_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
-       public static void draw_check (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height);
-       public static void draw_diamond (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height);
-       public static void draw_expander (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, int x, int y, Gtk.ExpanderStyle expander_style);
-       public static void draw_extension (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height, Gtk.PositionType gap_side);
-       public static void draw_flat_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height);
-       public static void draw_focus (Gtk.Style style, Gdk.Window window, int x, int y, int width, int height);
-       public static void draw_handle (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height, Gtk.Orientation orientation);
-       public static void draw_hline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, int x1, int x2, int y);
        public static void draw_insertion_cursor (Gtk.Widget widget, Gdk.Drawable drawable, out Gdk.Rectangle area, out Gdk.Rectangle location, bool is_primary, Gtk.TextDirection direction, bool draw_arrow);
-       public static void draw_layout (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, bool use_text, int x, int y, Pango.Layout layout);
-       public static void draw_option (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height);
-       public static void draw_polygon (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Point points, int npoints, bool fill);
-       public static void draw_resize_grip (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.WindowEdge edge, int x, int y, int width, int height);
-       public static void draw_shadow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height);
-       public static void draw_shadow_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
-       public static void draw_slider (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height, Gtk.Orientation orientation);
-       public static void draw_string (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, int x, int y, string string);
-       public static void draw_tab (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, int x, int y, int width, int height);
-       public static void draw_vline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, int y1_, int y2_, int x);
        public static bool events_pending ();
-       public static void exit (int error_code);
        public static weak Gdk.GC gc_get (int depth, Gdk.Colormap colormap, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
        public static void gc_release (Gdk.GC gc);
        public static weak Gdk.Event get_current_event ();
@@ -7326,18 +6449,11 @@ namespace Gtk {
        public static Gtk.IconSize icon_size_register (string name, int width, int height);
        public static void icon_size_register_alias (string alias, Gtk.IconSize target);
        public static GLib.Type identifier_get_type ();
-       public static uint idle_add (Gtk.Function function, pointer data);
-       public static uint idle_add_full (int priority, Gtk.Function function, Gtk.CallbackMarshal marshal, pointer data, Gtk.DestroyNotify destroy);
-       public static uint idle_add_priority (int priority, Gtk.Function function, pointer data);
-       public static void idle_remove (uint idle_handler_id);
-       public static void idle_remove_by_data (pointer data);
        public static void init_add (Gtk.Function function, pointer data);
        [NoArrayLength]
        public static bool init_check (int argc, string[] argv);
        [NoArrayLength]
        public static bool init_with_args (int argc, string[] argv, string parameter_string, GLib.OptionEntry[] entries, string translation_domain) throws GLib.Error;
-       public static uint input_add_full (int source, Gdk.InputCondition condition, Gdk.InputFunction function, Gtk.CallbackMarshal marshal, pointer data, Gtk.DestroyNotify destroy);
-       public static void input_remove (uint input_handler_id);
        public static uint key_snooper_install (Gtk.KeySnoopFunc snooper, pointer func_data);
        public static void key_snooper_remove (uint snooper_handler_id);
        public static void main ();
@@ -7346,32 +6462,6 @@ namespace Gtk {
        public static bool main_iteration_do (bool blocking);
        public static uint main_level ();
        public static void main_quit ();
-       public static void marshal_BOOLEAN__POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_BOOLEAN__POINTER_INT_INT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_BOOLEAN__POINTER_INT_INT_UINT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_BOOLEAN__POINTER_POINTER_INT_INT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_BOOLEAN__POINTER_STRING_STRING_POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_BOOLEAN__VOID (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_ENUM__ENUM (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_INT__POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_INT__POINTER_CHAR_CHAR (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__ENUM_FLOAT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__ENUM_FLOAT_BOOLEAN (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__INT_INT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__INT_INT_POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__POINTER_INT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__POINTER_POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__POINTER_POINTER_POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__POINTER_POINTER_UINT_UINT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__POINTER_STRING_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__POINTER_UINT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__POINTER_UINT_ENUM (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__POINTER_UINT_UINT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__STRING_INT_POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__UINT_POINTER_UINT_UINT_ENUM (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
-       public static void marshal_VOID__UINT_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
        public static void paint_arrow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, out Gdk.Rectangle area, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);
        public static void paint_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, out Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
        public static void paint_box_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, out Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
@@ -7390,7 +6480,6 @@ namespace Gtk {
        public static void paint_shadow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, out Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
        public static void paint_shadow_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, out Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
        public static void paint_slider (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, out Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);
-       public static void paint_string (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, out Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, string string);
        public static void paint_tab (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, out Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
        public static void paint_vline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, out Gdk.Rectangle area, Gtk.Widget widget, string detail, int y1_, int y2_, int x);
        [NoArrayLength]
@@ -7403,10 +6492,7 @@ namespace Gtk {
        public static void quit_add_destroy (uint main_level, Gtk.Object object);
        public static void quit_remove (uint quit_handler_id);
        public static void quit_remove_by_data (pointer data);
-       public static void rc_add_class_style (Gtk.RcStyle rc_style, string pattern);
        public static void rc_add_default_file (string filename);
-       public static void rc_add_widget_class_style (Gtk.RcStyle rc_style, string pattern);
-       public static void rc_add_widget_name_style (Gtk.RcStyle rc_style, string pattern);
        public static weak string rc_find_module_in_path (string module_file);
        public static weak string rc_find_pixmap_in_path (Gtk.Settings settings, GLib.Scanner scanner, string pixmap_file);
        public static weak string rc_get_default_files ();
@@ -7430,7 +6516,6 @@ namespace Gtk {
        public static void selection_add_target (Gtk.Widget widget, Gdk.Atom selection, Gdk.Atom target, uint info);
        [NoArrayLength]
        public static void selection_add_targets (Gtk.Widget widget, Gdk.Atom selection, Gtk.TargetEntry[] targets, uint ntargets);
-       public static bool selection_clear (Gtk.Widget widget, Gdk.EventSelection event);
        public static void selection_clear_targets (Gtk.Widget widget, Gdk.Atom selection);
        public static bool selection_convert (Gtk.Widget widget, Gdk.Atom selection, Gdk.Atom target, uint time_);
        public static bool selection_owner_set (Gtk.Widget widget, Gdk.Atom selection, uint time_);
@@ -7438,17 +6523,6 @@ namespace Gtk {
        public static void selection_remove_all (Gtk.Widget widget);
        public static weak string set_locale ();
        public static void show_about_dialog (Gtk.Window parent, ...);
-       public static void signal_compat_matched (Gtk.Object object, Gtk.SignalFunc func, pointer data, GLib.SignalMatchType match, uint action);
-       public static ulong signal_connect_full (Gtk.Object object, string name, Gtk.SignalFunc func, Gtk.CallbackMarshal unsupported, pointer data, Gtk.DestroyNotify destroy_func, int object_signal, int after);
-       public static void signal_connect_object_while_alive (Gtk.Object object, string name, Gtk.SignalFunc func, Gtk.Object alive_object);
-       public static void signal_connect_while_alive (Gtk.Object object, string name, Gtk.SignalFunc func, pointer func_data, Gtk.Object alive_object);
-       public static void signal_emit (Gtk.Object object, uint signal_id);
-       public static void signal_emit_by_name (Gtk.Object object, string name);
-       public static void signal_emit_stop_by_name (Gtk.Object object, string name);
-       public static void signal_emitv (Gtk.Object object, uint signal_id, Gtk.Arg args);
-       public static void signal_emitv_by_name (Gtk.Object object, string name, Gtk.Arg args);
-       public static uint signal_new (string name, Gtk.SignalRunType signal_flags, Gtk.Type object_type, uint function_offset, Gtk.SignalMarshaller marshaller, Gtk.Type return_val, uint n_args);
-       public static uint signal_newv (string name, Gtk.SignalRunType signal_flags, Gtk.Type object_type, uint function_offset, Gtk.SignalMarshaller marshaller, Gtk.Type return_val, uint n_args, Gtk.Type args);
        [NoArrayLength]
        public static void stock_add (Gtk.StockItem[] items, uint n_items);
        [NoArrayLength]
@@ -7467,9 +6541,6 @@ namespace Gtk {
        public static bool targets_include_text (Gdk.Atom[] targets, int n_targets);
        [NoArrayLength]
        public static bool targets_include_uri (Gdk.Atom[] targets, int n_targets);
-       public static uint timeout_add (uint interval, Gtk.Function function, pointer data);
-       public static uint timeout_add_full (uint interval, Gtk.Function function, Gtk.CallbackMarshal marshal, pointer data, Gtk.DestroyNotify destroy);
-       public static void timeout_remove (uint timeout_handler_id);
-       public static bool tree_get_row_drag_data (Gtk.SelectionData selection_data, out Gtk.TreeModel tree_model, out Gtk.TreePath path);
+       public static bool tree_get_row_drag_data (Gtk.SelectionData selection_data, out weak Gtk.TreeModel tree_model, out weak Gtk.TreePath path);
        public static bool tree_set_row_drag_data (Gtk.SelectionData selection_data, Gtk.TreeModel tree_model, Gtk.TreePath path);
 }

diff --git a/vapi/packages/gdk-2.0/gdk-2.0.gi b/vapi/packages/gdk-2.0/gdk-2.0.gi
index 86a6463..9f197e1 100644 (file)
--- a/vapi/packages/gdk-2.0/gdk-2.0.gi
+++ b/vapi/packages/gdk-2.0/gdk-2.0.gi
@@ -63,62 +63,6 @@
                                <parameter name="pixmap_y" type="double"/>
                        </parameters>
                </function>
-               <function name="char_height" symbol="gdk_char_height">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="character" type="gchar"/>
-                       </parameters>
-               </function>
-               <function name="char_measure" symbol="gdk_char_measure">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="character" type="gchar"/>
-                       </parameters>
-               </function>
-               <function name="char_width" symbol="gdk_char_width">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="character" type="gchar"/>
-                       </parameters>
-               </function>
-               <function name="char_width_wc" symbol="gdk_char_width_wc">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="character" type="GdkWChar"/>
-                       </parameters>
-               </function>
-               <function name="colors_alloc" symbol="gdk_colors_alloc">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="colormap" type="GdkColormap*"/>
-                               <parameter name="contiguous" type="gboolean"/>
-                               <parameter name="planes" type="gulong*"/>
-                               <parameter name="nplanes" type="gint"/>
-                               <parameter name="pixels" type="gulong*"/>
-                               <parameter name="npixels" type="gint"/>
-                       </parameters>
-               </function>
-               <function name="colors_free" symbol="gdk_colors_free">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="colormap" type="GdkColormap*"/>
-                               <parameter name="pixels" type="gulong*"/>
-                               <parameter name="npixels" type="gint"/>
-                               <parameter name="planes" type="gulong"/>
-                       </parameters>
-               </function>
-               <function name="colors_store" symbol="gdk_colors_store">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="colormap" type="GdkColormap*"/>
-                               <parameter name="colors" type="GdkColor*"/>
-                               <parameter name="ncolors" type="gint"/>
-                       </parameters>
-               </function>
                <function name="devices_list" symbol="gdk_devices_list">
                        <return-type type="GList*"/>
                </function>
@@ -498,41 +442,6 @@
                                <parameter name="nsegs" type="gint"/>
                        </parameters>
                </function>
-               <function name="draw_string" symbol="gdk_draw_string">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="drawable" type="GdkDrawable*"/>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="gc" type="GdkGC*"/>
-                               <parameter name="x" type="gint"/>
-                               <parameter name="y" type="gint"/>
-                               <parameter name="string" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="draw_text" symbol="gdk_draw_text">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="drawable" type="GdkDrawable*"/>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="gc" type="GdkGC*"/>
-                               <parameter name="x" type="gint"/>
-                               <parameter name="y" type="gint"/>
-                               <parameter name="text" type="gchar*"/>
-                               <parameter name="text_length" type="gint"/>
-                       </parameters>
-               </function>
-               <function name="draw_text_wc" symbol="gdk_draw_text_wc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="drawable" type="GdkDrawable*"/>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="gc" type="GdkGC*"/>
-                               <parameter name="x" type="gint"/>
-                               <parameter name="y" type="gint"/>
-                               <parameter name="text" type="GdkWChar*"/>
-                               <parameter name="text_length" type="gint"/>
-                       </parameters>
-               </function>
                <function name="draw_trapezoids" symbol="gdk_draw_trapezoids">
                        <return-type type="void"/>
                        <parameters>
@@ -567,28 +476,9 @@
                <function name="events_pending" symbol="gdk_events_pending">
                        <return-type type="gboolean"/>
                </function>
-               <function name="exit" symbol="gdk_exit">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="error_code" type="gint"/>
-                       </parameters>
-               </function>
                <function name="flush" symbol="gdk_flush">
                        <return-type type="void"/>
                </function>
-               <function name="fontset_load" symbol="gdk_fontset_load">
-                       <return-type type="GdkFont*"/>
-                       <parameters>
-                               <parameter name="fontset_name" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="fontset_load_for_display" symbol="gdk_fontset_load_for_display">
-                       <return-type type="GdkFont*"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                               <parameter name="fontset_name" type="gchar*"/>
-                       </parameters>
-               </function>
                <function name="free_compound_text" symbol="gdk_free_compound_text">
                        <return-type type="void"/>
                        <parameters>
@@ -616,9 +506,6 @@
                <function name="get_show_events" symbol="gdk_get_show_events">
                        <return-type type="gboolean"/>
                </function>
-               <function name="get_use_xshm" symbol="gdk_get_use_xshm">
-                       <return-type type="gboolean"/>
-               </function>
                <function name="init" symbol="gdk_init">
                        <return-type type="void"/>
                        <parameters>
@@ -633,31 +520,6 @@
                                <parameter name="argv" type="gchar***"/>
                        </parameters>
                </function>
-               <function name="input_add" symbol="gdk_input_add">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="source" type="gint"/>
-                               <parameter name="condition" type="GdkInputCondition"/>
-                               <parameter name="function" type="GdkInputFunction"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </function>
-               <function name="input_add_full" symbol="gdk_input_add_full">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="source" type="gint"/>
-                               <parameter name="condition" type="GdkInputCondition"/>
-                               <parameter name="function" type="GdkInputFunction"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="destroy" type="GdkDestroyNotify"/>
-                       </parameters>
-               </function>
-               <function name="input_remove" symbol="gdk_input_remove">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="tag" type="gint"/>
-                       </parameters>
-               </function>
                <function name="input_set_extension_events" symbol="gdk_input_set_extension_events">
                        <return-type type="void"/>
                        <parameters>
@@ -741,14 +603,6 @@
                <function name="list_visuals" symbol="gdk_list_visuals">
                        <return-type type="GList*"/>
                </function>
-               <function name="mbstowcs" symbol="gdk_mbstowcs">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="dest" type="GdkWChar*"/>
-                               <parameter name="src" type="gchar*"/>
-                               <parameter name="dest_max" type="gint"/>
-                       </parameters>
-               </function>
                <function name="notify_startup_complete" symbol="gdk_notify_startup_complete">
                        <return-type type="void"/>
                </function>
@@ -767,13 +621,6 @@
                                <parameter name="screen" type="GdkScreen*"/>
                        </parameters>
                </function>
-               <function name="pango_context_set_colormap" symbol="gdk_pango_context_set_colormap">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="context" type="PangoContext*"/>
-                               <parameter name="colormap" type="GdkColormap*"/>
-                       </parameters>
-               </function>
                <function name="pango_layout_get_clip_region" symbol="gdk_pango_layout_get_clip_region">
                        <return-type type="GdkRegion*"/>
                        <parameters>
@@ -896,29 +743,12 @@
                                <parameter name="color" type="GdkColor*"/>
                        </parameters>
                </function>
-               <function name="rgb_gc_set_background" symbol="gdk_rgb_gc_set_background">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="gc" type="GdkGC*"/>
-                               <parameter name="rgb" type="guint32"/>
-                       </parameters>
-               </function>
-               <function name="rgb_gc_set_foreground" symbol="gdk_rgb_gc_set_foreground">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="gc" type="GdkGC*"/>
-                               <parameter name="rgb" type="guint32"/>
-                       </parameters>
-               </function>
                <function name="rgb_get_colormap" symbol="gdk_rgb_get_colormap">
                        <return-type type="GdkColormap*"/>
                </function>
                <function name="rgb_get_visual" symbol="gdk_rgb_get_visual">
                        <return-type type="GdkVisual*"/>
                </function>
-               <function name="rgb_init" symbol="gdk_rgb_init">
-                       <return-type type="void"/>
-               </function>
                <function name="rgb_set_install" symbol="gdk_rgb_set_install">
                        <return-type type="void"/>
                        <parameters>
@@ -937,10 +767,75 @@
                                <parameter name="verbose" type="gboolean"/>
                        </parameters>
                </function>
-               <function name="rgb_xpixel_from_rgb" symbol="gdk_rgb_xpixel_from_rgb">
-                       <return-type type="gulong"/>
+               <function name="selection_convert" symbol="gdk_selection_convert">
+                       <return-type type="void"/>
                        <parameters>
-                               <parameter name="rgb" type="guint32"/>
+                               <parameter name="requestor" type="GdkWindow*"/>
+                               <parameter name="selection" type="GdkAtom"/>
+                               <parameter name="target" type="GdkAtom"/>
+                               <parameter name="time_" type="guint32"/>
+                       </parameters>
+               </function>
+               <function name="selection_owner_get" symbol="gdk_selection_owner_get">
+                       <return-type type="GdkWindow*"/>
+                       <parameters>
+                               <parameter name="selection" type="GdkAtom"/>
+                       </parameters>
+               </function>
+               <function name="selection_owner_get_for_display" symbol="gdk_selection_owner_get_for_display">
+                       <return-type type="GdkWindow*"/>
+                       <parameters>
+                               <parameter name="display" type="GdkDisplay*"/>
+                               <parameter name="selection" type="GdkAtom"/>
+                       </parameters>
+               </function>
+               <function name="selection_owner_set" symbol="gdk_selection_owner_set">
+                       <return-type type="gboolean"/>
+                       <parameters>
+                               <parameter name="owner" type="GdkWindow*"/>
+                               <parameter name="selection" type="GdkAtom"/>
+                               <parameter name="time_" type="guint32"/>
+                               <parameter name="send_event" type="gboolean"/>
+                       </parameters>
+               </function>
+               <function name="selection_owner_set_for_display" symbol="gdk_selection_owner_set_for_display">
+                       <return-type type="gboolean"/>
+                       <parameters>
+                               <parameter name="display" type="GdkDisplay*"/>
+                               <parameter name="owner" type="GdkWindow*"/>
+                               <parameter name="selection" type="GdkAtom"/>
+                               <parameter name="time_" type="guint32"/>
+                               <parameter name="send_event" type="gboolean"/>
+                       </parameters>
+               </function>
+               <function name="selection_property_get" symbol="gdk_selection_property_get">
+                       <return-type type="gboolean"/>
+                       <parameters>
+                               <parameter name="requestor" type="GdkWindow*"/>
+                               <parameter name="data" type="guchar**"/>
+                               <parameter name="prop_type" type="GdkAtom*"/>
+                               <parameter name="prop_format" type="gint*"/>
+                       </parameters>
+               </function>
+               <function name="selection_send_notify" symbol="gdk_selection_send_notify">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="requestor" type="guint32"/>
+                               <parameter name="selection" type="GdkAtom"/>
+                               <parameter name="target" type="GdkAtom"/>
+                               <parameter name="property" type="GdkAtom"/>
+                               <parameter name="time_" type="guint32"/>
+                       </parameters>
+               </function>
+               <function name="selection_send_notify_for_display" symbol="gdk_selection_send_notify_for_display">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="display" type="GdkDisplay*"/>
+                               <parameter name="requestor" type="guint32"/>
+                               <parameter name="selection" type="GdkAtom"/>
+                               <parameter name="target" type="GdkAtom"/>
+                               <parameter name="property" type="GdkAtom"/>
+                               <parameter name="time_" type="guint32"/>
                        </parameters>
                </function>
                <function name="set_double_click_time" symbol="gdk_set_double_click_time">
@@ -976,12 +871,6 @@
                                <parameter name="sm_client_id" type="gchar*"/>
                        </parameters>
                </function>
-               <function name="set_use_xshm" symbol="gdk_set_use_xshm">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="use_xshm" type="gboolean"/>
-                       </parameters>
-               </function>
                <function name="setting_get" symbol="gdk_setting_get">
                        <return-type type="gboolean"/>
                        <parameters>
@@ -1028,32 +917,6 @@
                                <parameter name="error" type="GError**"/>
                        </parameters>
                </function>
-               <function name="string_extents" symbol="gdk_string_extents">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="string" type="gchar*"/>
-                               <parameter name="lbearing" type="gint*"/>
-                               <parameter name="rbearing" type="gint*"/>
-                               <parameter name="width" type="gint*"/>
-                               <parameter name="ascent" type="gint*"/>
-                               <parameter name="descent" type="gint*"/>
-                       </parameters>
-               </function>
-               <function name="string_height" symbol="gdk_string_height">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="string" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="string_measure" symbol="gdk_string_measure">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="string" type="gchar*"/>
-                       </parameters>
-               </function>
                <function name="string_to_compound_text" symbol="gdk_string_to_compound_text">
                        <return-type type="gint"/>
                        <parameters>
@@ -1075,13 +938,6 @@
                                <parameter name="length" type="gint*"/>
                        </parameters>
                </function>
-               <function name="string_width" symbol="gdk_string_width">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="string" type="gchar*"/>
-                       </parameters>
-               </function>
                <function name="synthesize_window_state" symbol="gdk_synthesize_window_state">
                        <return-type type="void"/>
                        <parameters>
@@ -1090,48 +946,6 @@
                                <parameter name="set_flags" type="GdkWindowState"/>
                        </parameters>
                </function>
-               <function name="text_extents" symbol="gdk_text_extents">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="text" type="gchar*"/>
-                               <parameter name="text_length" type="gint"/>
-                               <parameter name="lbearing" type="gint*"/>
-                               <parameter name="rbearing" type="gint*"/>
-                               <parameter name="width" type="gint*"/>
-                               <parameter name="ascent" type="gint*"/>
-                               <parameter name="descent" type="gint*"/>
-                       </parameters>
-               </function>
-               <function name="text_extents_wc" symbol="gdk_text_extents_wc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="text" type="GdkWChar*"/>
-                               <parameter name="text_length" type="gint"/>
-                               <parameter name="lbearing" type="gint*"/>
-                               <parameter name="rbearing" type="gint*"/>
-                               <parameter name="width" type="gint*"/>
-                               <parameter name="ascent" type="gint*"/>
-                               <parameter name="descent" type="gint*"/>
-                       </parameters>
-               </function>
-               <function name="text_height" symbol="gdk_text_height">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="text" type="gchar*"/>
-                               <parameter name="text_length" type="gint"/>
-                       </parameters>
-               </function>
-               <function name="text_measure" symbol="gdk_text_measure">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="text" type="gchar*"/>
-                               <parameter name="text_length" type="gint"/>
-                       </parameters>
-               </function>
                <function name="text_property_to_text_list" symbol="gdk_text_property_to_text_list">
                        <return-type type="gint"/>
                        <parameters>
@@ -1174,22 +988,6 @@
                                <parameter name="list" type="gchar***"/>
                        </parameters>
                </function>
-               <function name="text_width" symbol="gdk_text_width">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="text" type="gchar*"/>
-                               <parameter name="text_length" type="gint"/>
-                       </parameters>
-               </function>
-               <function name="text_width_wc" symbol="gdk_text_width_wc">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="font" type="GdkFont*"/>
-                               <parameter name="text" type="GdkWChar*"/>
-                               <parameter name="text_length" type="gint"/>
-                       </parameters>
-               </function>
                <function name="threads_add_idle" symbol="gdk_threads_add_idle">
                        <return-type type="guint"/>
                        <parameters>
@@ -1273,12 +1071,6 @@
                                <parameter name="str" type="gchar*"/>
                        </parameters>
                </function>
-               <function name="wcstombs" symbol="gdk_wcstombs">
-                       <return-type type="gchar*"/>
-                       <parameters>
-                               <parameter name="src" type="GdkWChar*"/>
-                       </parameters>
-               </function>
                <callback name="GdkDestroyNotify">
                        <return-type type="void"/>
                        <parameters>
@@ -1562,6 +1354,8 @@
                        <field name="changed_mask" type="GdkWindowState"/>
                        <field name="new_window_state" type="GdkWindowState"/>
                </struct>
+               <struct name="GdkFont">
+               </struct>
                <struct name="GdkGCValues">
                        <field name="foreground" type="GdkColor"/>
                        <field name="background" type="GdkColor"/>
@@ -1908,88 +1702,11 @@
                        <field name="x2" type="gint"/>
                        <field name="y2" type="gint"/>
                </struct>
-               <struct name="GdkSelection">
-                       <method name="convert" symbol="gdk_selection_convert">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="requestor" type="GdkWindow*"/>
-                                       <parameter name="selection" type="GdkAtom"/>
-                                       <parameter name="target" type="GdkAtom"/>
-                                       <parameter name="time_" type="guint32"/>
-                               </parameters>
-                       </method>
-                       <method name="owner_get" symbol="gdk_selection_owner_get">
-                               <return-type type="GdkWindow*"/>
-                               <parameters>
-                                       <parameter name="selection" type="GdkAtom"/>
-                               </parameters>
-                       </method>
-                       <method name="owner_get_for_display" symbol="gdk_selection_owner_get_for_display">
-                               <return-type type="GdkWindow*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="selection" type="GdkAtom"/>
-                               </parameters>
-                       </method>
-                       <method name="owner_set" symbol="gdk_selection_owner_set">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="owner" type="GdkWindow*"/>
-                                       <parameter name="selection" type="GdkAtom"/>
-                                       <parameter name="time_" type="guint32"/>
-                                       <parameter name="send_event" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="owner_set_for_display" symbol="gdk_selection_owner_set_for_display">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="owner" type="GdkWindow*"/>
-                                       <parameter name="selection" type="GdkAtom"/>
-                                       <parameter name="time_" type="guint32"/>
-                                       <parameter name="send_event" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="property_get" symbol="gdk_selection_property_get">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="requestor" type="GdkWindow*"/>
-                                       <parameter name="data" type="guchar**"/>
-                                       <parameter name="prop_type" type="GdkAtom*"/>
-                                       <parameter name="prop_format" type="gint*"/>
-                               </parameters>
-                       </method>
-                       <method name="send_notify" symbol="gdk_selection_send_notify">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="requestor" type="guint32"/>
-                                       <parameter name="selection" type="GdkAtom"/>
-                                       <parameter name="target" type="GdkAtom"/>
-                                       <parameter name="property" type="GdkAtom"/>
-                                       <parameter name="time_" type="guint32"/>
-                               </parameters>
-                       </method>
-                       <method name="send_notify_for_display" symbol="gdk_selection_send_notify_for_display">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="requestor" type="guint32"/>
-                                       <parameter name="selection" type="GdkAtom"/>
-                                       <parameter name="target" type="GdkAtom"/>
-                                       <parameter name="property" type="GdkAtom"/>
-                                       <parameter name="time_" type="guint32"/>
-                               </parameters>
-                       </method>
-               </struct>
-               <struct name="GdkSelectionType">
-               </struct>
                <struct name="GdkSpan">
                        <field name="x" type="gint"/>
                        <field name="y" type="gint"/>
                        <field name="width" type="gint"/>
                </struct>
-               <struct name="GdkTarget">
-               </struct>
                <struct name="GdkTimeCoord">
                        <field name="time" type="guint32"/>
                        <field name="axes" type="gdouble[]"/>
@@ -2059,27 +1776,6 @@
                <struct name="GdkXEvent">
                </struct>
                <boxed name="GdkColor" type-name="GdkColor" get-type="gdk_color_get_type">
-                       <method name="alloc" symbol="gdk_color_alloc">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="colormap" type="GdkColormap*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="black" symbol="gdk_color_black">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="colormap" type="GdkColormap*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="change" symbol="gdk_color_change">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="colormap" type="GdkColormap*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
                        <method name="copy" symbol="gdk_color_copy">
                                <return-type type="GdkColor*"/>
                                <parameters>
@@ -2118,13 +1814,6 @@
                                        <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="white" symbol="gdk_color_white">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="colormap" type="GdkColormap*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
                        <field name="pixel" type="guint32"/>
                        <field name="red" type="guint16"/>
                        <field name="green" type="guint16"/>
@@ -2342,68 +2031,6 @@
                        <field name="setting" type="GdkEventSetting"/>
                        <field name="grab_broken" type="GdkEventGrabBroken"/>
                </boxed>
-               <boxed name="GdkFont" type-name="GdkFont" get-type="gdk_font_get_type">
-                       <method name="equal" symbol="gdk_font_equal">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="fonta" type="GdkFont*"/>
-                                       <parameter name="fontb" type="GdkFont*"/>
-                               </parameters>
-                       </method>
-                       <method name="from_description" symbol="gdk_font_from_description">
-                               <return-type type="GdkFont*"/>
-                               <parameters>
-                                       <parameter name="font_desc" type="PangoFontDescription*"/>
-                               </parameters>
-                       </method>
-                       <method name="from_description_for_display" symbol="gdk_font_from_description_for_display">
-                               <return-type type="GdkFont*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="font_desc" type="PangoFontDescription*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_display" symbol="gdk_font_get_display">
-                               <return-type type="GdkDisplay*"/>
-                               <parameters>
-                                       <parameter name="font" type="GdkFont*"/>
-                               </parameters>
-                       </method>
-                       <method name="id" symbol="gdk_font_id">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="font" type="GdkFont*"/>
-                               </parameters>
-                       </method>
-                       <method name="load" symbol="gdk_font_load">
-                               <return-type type="GdkFont*"/>
-                               <parameters>
-                                       <parameter name="font_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="load_for_display" symbol="gdk_font_load_for_display">
-                               <return-type type="GdkFont*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="font_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="ref" symbol="gdk_font_ref">
-                               <return-type type="GdkFont*"/>
-                               <parameters>
-                                       <parameter name="font" type="GdkFont*"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gdk_font_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="font" type="GdkFont*"/>
-                               </parameters>
-                       </method>
-                       <field name="type" type="GdkFontType"/>
-                       <field name="ascent" type="gint"/>
-                       <field name="descent" type="gint"/>
-               </boxed>
                <boxed name="GdkRectangle" type-name="GdkRectangle" get-type="gdk_rectangle_get_type">
                        <method name="intersect" symbol="gdk_rectangle_intersect">
                                <return-type type="gboolean"/>
@@ -2965,13 +2592,6 @@
                                        <parameter name="success" type="gboolean*"/>
                                </parameters>
                        </method>
-                       <method name="change" symbol="gdk_colormap_change">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="colormap" type="GdkColormap*"/>
-                                       <parameter name="ncolors" type="gint"/>
-                               </parameters>
-                       </method>
                        <method name="free_colors" symbol="gdk_colormap_free_colors">
                                <return-type type="void"/>
                                <parameters>
@@ -2989,9 +2609,6 @@
                        <method name="get_system" symbol="gdk_colormap_get_system">
                                <return-type type="GdkColormap*"/>
                        </method>
-                       <method name="get_system_size" symbol="gdk_colormap_get_system_size">
-                               <return-type type="gint"/>
-                       </method>
                        <method name="get_visual" symbol="gdk_colormap_get_visual">
                                <return-type type="GdkVisual*"/>
                                <parameters>
@@ -3013,18 +2630,6 @@
                                        <parameter name="result" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="ref" symbol="gdk_colormap_ref">
-                               <return-type type="GdkColormap*"/>
-                               <parameters>
-                                       <parameter name="cmap" type="GdkColormap*"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gdk_colormap_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cmap" type="GdkColormap*"/>
-                               </parameters>
-                       </method>
                        <field name="size" type="gint"/>
                        <field name="colors" type="GdkColor*"/>
                        <field name="visual" type="GdkVisual*"/>
@@ -3440,18 +3045,6 @@
                        <constructor name="new" symbol="gdk_drag_context_new">
                                <return-type type="GdkDragContext*"/>
                        </constructor>
-                       <method name="ref" symbol="gdk_drag_context_ref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="context" type="GdkDragContext*"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gdk_drag_context_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="context" type="GdkDragContext*"/>
-                               </parameters>
-                       </method>
                        <field name="protocol" type="GdkDragProtocol"/>
                        <field name="is_source" type="gboolean"/>
                        <field name="source_window" type="GdkWindow*"/>
@@ -3489,13 +3082,6 @@
                                        <parameter name="drawable" type="GdkDrawable*"/>
                                </parameters>
                        </method>
-                       <method name="get_data" symbol="gdk_drawable_get_data">
-                               <return-type type="gpointer"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                                       <parameter name="key" type="gchar*"/>
-                               </parameters>
-                       </method>
                        <method name="get_depth" symbol="gdk_drawable_get_depth">
                                <return-type type="gint"/>
                                <parameters>
@@ -3544,12 +3130,6 @@
                                        <parameter name="drawable" type="GdkDrawable*"/>
                                </parameters>
                        </method>
-                       <method name="ref" symbol="gdk_drawable_ref">
-                               <return-type type="GdkDrawable*"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                               </parameters>
-                       </method>
                        <method name="set_colormap" symbol="gdk_drawable_set_colormap">
                                <return-type type="void"/>
                                <parameters>
@@ -3557,21 +3137,6 @@
                                        <parameter name="colormap" type="GdkColormap*"/>
                                </parameters>
                        </method>
-                       <method name="set_data" symbol="gdk_drawable_set_data">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                                       <parameter name="key" type="gchar*"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy_func" type="GDestroyNotify"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gdk_drawable_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                               </parameters>
-                       </method>
                        <vfunc name="create_gc">
                                <return-type type="GdkGC*"/>
                                <parameters>
@@ -3873,12 +3438,6 @@
                                        <parameter name="y_offset" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="ref" symbol="gdk_gc_ref">
-                               <return-type type="GdkGC*"/>
-                               <parameters>
-                                       <parameter name="gc" type="GdkGC*"/>
-                               </parameters>
-                       </method>
                        <method name="set_background" symbol="gdk_gc_set_background">
                                <return-type type="void"/>
                                <parameters>
@@ -3945,13 +3504,6 @@
                                        <parameter name="fill" type="GdkFill"/>
                                </parameters>
                        </method>
-                       <method name="set_font" symbol="gdk_gc_set_font">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gc" type="GdkGC*"/>
-                                       <parameter name="font" type="GdkFont*"/>
-                               </parameters>
-                       </method>
                        <method name="set_foreground" symbol="gdk_gc_set_foreground">
                                <return-type type="void"/>
                                <parameters>
@@ -4027,12 +3579,6 @@
                                        <parameter name="values_mask" type="GdkGCValuesMask"/>
                                </parameters>
                        </method>
-                       <method name="unref" symbol="gdk_gc_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gc" type="GdkGC*"/>
-                               </parameters>
-                       </method>
                        <vfunc name="get_values">
                                <return-type type="void"/>
                                <parameters>
@@ -4064,16 +3610,6 @@
                        <field name="colormap" type="GdkColormap*"/>
                </object>
                <object name="GdkImage" parent="GObject" type-name="GdkImage" get-type="gdk_image_get_type">
-                       <method name="get" symbol="gdk_image_get">
-                               <return-type type="GdkImage*"/>
-                               <parameters>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
-                               </parameters>
-                       </method>
                        <method name="get_colormap" symbol="gdk_image_get_colormap">
                                <return-type type="GdkColormap*"/>
                                <parameters>
@@ -4106,12 +3642,6 @@
                                        <parameter name="pixel" type="guint32"/>
                                </parameters>
                        </method>
-                       <method name="ref" symbol="gdk_image_ref">
-                               <return-type type="GdkImage*"/>
-                               <parameters>
-                                       <parameter name="image" type="GdkImage*"/>
-                               </parameters>
-                       </method>
                        <method name="set_colormap" symbol="gdk_image_set_colormap">
                                <return-type type="void"/>
                                <parameters>
@@ -4119,12 +3649,6 @@
                                        <parameter name="colormap" type="GdkColormap*"/>
                                </parameters>
                        </method>
-                       <method name="unref" symbol="gdk_image_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="image" type="GdkImage*"/>
-                               </parameters>
-                       </method>
                        <field name="type" type="GdkImageType"/>
                        <field name="visual" type="GdkVisual*"/>
                        <field name="byte_order" type="GdkByteOrder"/>
@@ -4540,12 +4064,6 @@
                                        <parameter name="height" type="int"/>
                                </parameters>
                        </constructor>
-                       <method name="ref" symbol="gdk_pixbuf_ref">
-                               <return-type type="GdkPixbuf*"/>
-                               <parameters>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
                        <method name="render_pixmap_and_mask" symbol="gdk_pixbuf_render_pixmap_and_mask">
                                <return-type type="void"/>
                                <parameters>
@@ -4579,41 +4097,6 @@
                                        <parameter name="alpha_threshold" type="int"/>
                                </parameters>
                        </method>
-                       <method name="render_to_drawable" symbol="gdk_pixbuf_render_to_drawable">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                                       <parameter name="gc" type="GdkGC*"/>
-                                       <parameter name="src_x" type="int"/>
-                                       <parameter name="src_y" type="int"/>
-                                       <parameter name="dest_x" type="int"/>
-                                       <parameter name="dest_y" type="int"/>
-                                       <parameter name="width" type="int"/>
-                                       <parameter name="height" type="int"/>
-                                       <parameter name="dither" type="GdkRgbDither"/>
-                                       <parameter name="x_dither" type="int"/>
-                                       <parameter name="y_dither" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="render_to_drawable_alpha" symbol="gdk_pixbuf_render_to_drawable_alpha">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
-                                       <parameter name="drawable" type="GdkDrawable*"/>
-                                       <parameter name="src_x" type="int"/>
-                                       <parameter name="src_y" type="int"/>
-                                       <parameter name="dest_x" type="int"/>
-                                       <parameter name="dest_y" type="int"/>
-                                       <parameter name="width" type="int"/>
-                                       <parameter name="height" type="int"/>
-                                       <parameter name="alpha_mode" type="GdkPixbufAlphaMode"/>
-                                       <parameter name="alpha_threshold" type="int"/>
-                                       <parameter name="dither" type="GdkRgbDither"/>
-                                       <parameter name="x_dither" type="int"/>
-                                       <parameter name="y_dither" type="int"/>
-                               </parameters>
-                       </method>
                        <method name="rotate_simple" symbol="gdk_pixbuf_rotate_simple">
                                <return-type type="GdkPixbuf*"/>
                                <parameters>
@@ -4719,12 +4202,6 @@
                                        <parameter name="interp_type" type="GdkInterpType"/>
                                </parameters>
                        </method>
-                       <method name="unref" symbol="gdk_pixbuf_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
                        <property name="bits-per-sample" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
                        <property name="colorspace" type="GdkColorspace" readable="1" writable="1" construct="0" construct-only="1"/>
                        <property name="has-alpha" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
@@ -4773,18 +4250,6 @@
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </constructor>
-                       <method name="ref" symbol="gdk_pixbuf_animation_ref">
-                               <return-type type="GdkPixbufAnimation*"/>
-                               <parameters>
-                                       <parameter name="animation" type="GdkPixbufAnimation*"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gdk_pixbuf_animation_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="animation" type="GdkPixbufAnimation*"/>
-                               </parameters>
-                       </method>
                </object>
                <object name="GdkPixbufAnimationIter" parent="GObject" type-name="GdkPixbufAnimationIter" get-type="gdk_pixbuf_animation_iter_get_type">
                        <method name="advance" symbol="gdk_pixbuf_animation_iter_advance">
@@ -5487,14 +4952,6 @@
                                        <parameter name="decorations" type="GdkWMDecoration*"/>
                                </parameters>
                        </method>
-                       <method name="get_deskrelative_origin" symbol="gdk_window_get_deskrelative_origin">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="window" type="GdkWindow*"/>
-                                       <parameter name="x" type="gint*"/>
-                                       <parameter name="y" type="gint*"/>
-                               </parameters>
-                       </method>
                        <method name="get_events" symbol="gdk_window_get_events">
                                <return-type type="GdkEventMask"/>
                                <parameters>
@@ -5910,19 +5367,6 @@
                                        <parameter name="leader" type="GdkWindow*"/>
                                </parameters>
                        </method>
-                       <method name="set_hints" symbol="gdk_window_set_hints">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="window" type="GdkWindow*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="min_width" type="gint"/>
-                                       <parameter name="min_height" type="gint"/>
-                                       <parameter name="max_width" type="gint"/>
-                                       <parameter name="max_height" type="gint"/>
-                                       <parameter name="flags" type="gint"/>
-                               </parameters>
-                       </method>
                        <method name="set_icon" symbol="gdk_window_set_icon">
                                <return-type type="void"/>
                                <parameters>
@@ -6130,9 +5574,9 @@
                <constant name="GDK_PIXBUF_FEATURES_H" type="int" value="1"/>
                <constant name="GDK_PIXBUF_MAGIC_NUMBER" type="int" value="1197763408"/>
                <constant name="GDK_PIXBUF_MAJOR" type="int" value="2"/>
-               <constant name="GDK_PIXBUF_MICRO" type="int" value="1"/>
+               <constant name="GDK_PIXBUF_MICRO" type="int" value="3"/>
                <constant name="GDK_PIXBUF_MINOR" type="int" value="12"/>
-               <constant name="GDK_PIXBUF_VERSION" type="char*" value="2.12.1"/>
+               <constant name="GDK_PIXBUF_VERSION" type="char*" value="2.12.3"/>
                <constant name="GDK_PIXDATA_HEADER_LENGTH" type="int" value="24"/>
                <constant name="GDK_PRIORITY_REDRAW" type="int" value="20"/>
        </namespace>

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.gi b/vapi/packages/gtk+-2.0/gtk+-2.0.gi
index c4d7594..5fed246 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.gi
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.gi
@@ -59,12 +59,6 @@
                                <parameter name="screen" type="GdkScreen*"/>
                        </parameters>
                </function>
-               <function name="binding_parse_binding" symbol="gtk_binding_parse_binding">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="scanner" type="GScanner*"/>
-                       </parameters>
-               </function>
                <function name="bindings_activate" symbol="gtk_bindings_activate">
                        <return-type type="gboolean"/>
                        <parameters>
@@ -218,16 +212,6 @@
                                <parameter name="widget" type="GtkWidget*"/>
                        </parameters>
                </function>
-               <function name="drag_set_default_icon" symbol="gtk_drag_set_default_icon">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="colormap" type="GdkColormap*"/>
-                               <parameter name="pixmap" type="GdkPixmap*"/>
-                               <parameter name="mask" type="GdkBitmap*"/>
-                               <parameter name="hot_x" type="gint"/>
-                               <parameter name="hot_y" type="gint"/>
-                       </parameters>
-               </function>
                <function name="drag_set_icon_default" symbol="gtk_drag_set_icon_default">
                        <return-type type="void"/>
                        <parameters>
@@ -364,13 +348,207 @@
                                <parameter name="widget" type="GtkWidget*"/>
                        </parameters>
                </function>
-               <function name="draw_arrow" symbol="gtk_draw_arrow">
+               <function name="draw_insertion_cursor" symbol="gtk_draw_insertion_cursor">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="drawable" type="GdkDrawable*"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <parameter name="location" type="GdkRectangle*"/>
+                               <parameter name="is_primary" type="gboolean"/>
+                               <parameter name="direction" type="GtkTextDirection"/>
+                               <parameter name="draw_arrow" type="gboolean"/>
+                       </parameters>
+               </function>
+               <function name="events_pending" symbol="gtk_events_pending">
+                       <return-type type="gboolean"/>
+               </function>
+               <function name="false" symbol="gtk_false">
+                       <return-type type="gboolean"/>
+               </function>
+               <function name="gc_get" symbol="gtk_gc_get">
+                       <return-type type="GdkGC*"/>
+                       <parameters>
+                               <parameter name="depth" type="gint"/>
+                               <parameter name="colormap" type="GdkColormap*"/>
+                               <parameter name="values" type="GdkGCValues*"/>
+                               <parameter name="values_mask" type="GdkGCValuesMask"/>
+                       </parameters>
+               </function>
+               <function name="gc_release" symbol="gtk_gc_release">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="gc" type="GdkGC*"/>
+                       </parameters>
+               </function>
+               <function name="get_current_event" symbol="gtk_get_current_event">
+                       <return-type type="GdkEvent*"/>
+               </function>
+               <function name="get_current_event_state" symbol="gtk_get_current_event_state">
+                       <return-type type="gboolean"/>
+                       <parameters>
+                               <parameter name="state" type="GdkModifierType*"/>
+                       </parameters>
+               </function>
+               <function name="get_current_event_time" symbol="gtk_get_current_event_time">
+                       <return-type type="guint32"/>
+               </function>
+               <function name="get_default_language" symbol="gtk_get_default_language">
+                       <return-type type="PangoLanguage*"/>
+               </function>
+               <function name="get_event_widget" symbol="gtk_get_event_widget">
+                       <return-type type="GtkWidget*"/>
+                       <parameters>
+                               <parameter name="event" type="GdkEvent*"/>
+                       </parameters>
+               </function>
+               <function name="get_option_group" symbol="gtk_get_option_group">
+                       <return-type type="GOptionGroup*"/>
+                       <parameters>
+                               <parameter name="open_default_display" type="gboolean"/>
+                       </parameters>
+               </function>
+               <function name="grab_add" symbol="gtk_grab_add">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="widget" type="GtkWidget*"/>
+                       </parameters>
+               </function>
+               <function name="grab_get_current" symbol="gtk_grab_get_current">
+                       <return-type type="GtkWidget*"/>
+               </function>
+               <function name="grab_remove" symbol="gtk_grab_remove">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="widget" type="GtkWidget*"/>
+                       </parameters>
+               </function>
+               <function name="icon_size_from_name" symbol="gtk_icon_size_from_name">
+                       <return-type type="GtkIconSize"/>
+                       <parameters>
+                               <parameter name="name" type="gchar*"/>
+                       </parameters>
+               </function>
+               <function name="icon_size_get_name" symbol="gtk_icon_size_get_name">
+                       <return-type type="gchar*"/>
+                       <parameters>
+                               <parameter name="size" type="GtkIconSize"/>
+                       </parameters>
+               </function>
+               <function name="icon_size_lookup" symbol="gtk_icon_size_lookup">
+                       <return-type type="gboolean"/>
+                       <parameters>
+                               <parameter name="size" type="GtkIconSize"/>
+                               <parameter name="width" type="gint*"/>
+                               <parameter name="height" type="gint*"/>
+                       </parameters>
+               </function>
+               <function name="icon_size_lookup_for_settings" symbol="gtk_icon_size_lookup_for_settings">
+                       <return-type type="gboolean"/>
+                       <parameters>
+                               <parameter name="settings" type="GtkSettings*"/>
+                               <parameter name="size" type="GtkIconSize"/>
+                               <parameter name="width" type="gint*"/>
+                               <parameter name="height" type="gint*"/>
+                       </parameters>
+               </function>
+               <function name="icon_size_register" symbol="gtk_icon_size_register">
+                       <return-type type="GtkIconSize"/>
+                       <parameters>
+                               <parameter name="name" type="gchar*"/>
+                               <parameter name="width" type="gint"/>
+                               <parameter name="height" type="gint"/>
+                       </parameters>
+               </function>
+               <function name="icon_size_register_alias" symbol="gtk_icon_size_register_alias">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="alias" type="gchar*"/>
+                               <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>
+                               <parameter name="argc" type="int*"/>
+                               <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>
+                               <parameter name="argc" type="int*"/>
+                               <parameter name="argv" type="char***"/>
+                       </parameters>
+               </function>
+               <function name="init_with_args" symbol="gtk_init_with_args">
+                       <return-type type="gboolean"/>
+                       <parameters>
+                               <parameter name="argc" type="int*"/>
+                               <parameter name="argv" type="char***"/>
+                               <parameter name="parameter_string" type="char*"/>
+                               <parameter name="entries" type="GOptionEntry*"/>
+                               <parameter name="translation_domain" type="char*"/>
+                               <parameter name="error" type="GError**"/>
+                       </parameters>
+               </function>
+               <function name="key_snooper_install" symbol="gtk_key_snooper_install">
+                       <return-type type="guint"/>
+                       <parameters>
+                               <parameter name="snooper" type="GtkKeySnoopFunc"/>
+                               <parameter name="func_data" type="gpointer"/>
+                       </parameters>
+               </function>
+               <function name="key_snooper_remove" symbol="gtk_key_snooper_remove">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="snooper_handler_id" type="guint"/>
+                       </parameters>
+               </function>
+               <function name="main" symbol="gtk_main">
+                       <return-type type="void"/>
+               </function>
+               <function name="main_do_event" symbol="gtk_main_do_event">
+                       <return-type type="void"/>
+                       <parameters>
+                               <parameter name="event" type="GdkEvent*"/>
+                       </parameters>
+               </function>
+               <function name="main_iteration" symbol="gtk_main_iteration">
+                       <return-type type="gboolean"/>
+               </function>
+               <function name="main_iteration_do" symbol="gtk_main_iteration_do">
+                       <return-type type="gboolean"/>
+                       <parameters>
+                               <parameter name="blocking" type="gboolean"/>
+                       </parameters>
+               </function>
+               <function name="main_level" symbol="gtk_main_level">
+                       <return-type type="guint"/>
+               </function>
+               <function name="main_quit" symbol="gtk_main_quit">
+                       <return-type type="void"/>
+               </function>
+               <function name="paint_arrow" symbol="gtk_paint_arrow">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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"/>
@@ -379,26 +557,32 @@
                                <parameter name="height" type="gint"/>
                        </parameters>
                </function>
-               <function name="draw_box" symbol="gtk_draw_box">
+               <function name="paint_box" symbol="gtk_paint_box">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="draw_box_gap" symbol="gtk_draw_box_gap">
+               <function name="paint_box_gap" symbol="gtk_paint_box_gap">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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"/>
@@ -408,50 +592,62 @@
                                <parameter name="gap_width" type="gint"/>
                        </parameters>
                </function>
-               <function name="draw_check" symbol="gtk_draw_check">
+               <function name="paint_check" symbol="gtk_paint_check">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="draw_diamond" symbol="gtk_draw_diamond">
+               <function name="paint_diamond" symbol="gtk_paint_diamond">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="draw_expander" symbol="gtk_draw_expander">
+               <function name="paint_expander" symbol="gtk_paint_expander">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="draw_extension" symbol="gtk_draw_extension">
+               <function name="paint_extension" symbol="gtk_paint_extension">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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"/>
@@ -459,37 +655,47 @@
                                <parameter name="gap_side" type="GtkPositionType"/>
                        </parameters>
                </function>
-               <function name="draw_flat_box" symbol="gtk_draw_flat_box">
+               <function name="paint_flat_box" symbol="gtk_paint_flat_box">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="draw_focus" symbol="gtk_draw_focus">
+               <function name="paint_focus" symbol="gtk_paint_focus">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
+                               <parameter name="state_type" type="GtkStateType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="draw_handle" symbol="gtk_draw_handle">
+               <function name="paint_handle" symbol="gtk_paint_handle">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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"/>
@@ -497,72 +703,75 @@
                                <parameter name="orientation" type="GtkOrientation"/>
                        </parameters>
                </function>
-               <function name="draw_hline" symbol="gtk_draw_hline">
+               <function name="paint_hline" symbol="gtk_paint_hline">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="draw_insertion_cursor" symbol="gtk_draw_insertion_cursor">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="drawable" type="GdkDrawable*"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <parameter name="location" type="GdkRectangle*"/>
-                               <parameter name="is_primary" type="gboolean"/>
-                               <parameter name="direction" type="GtkTextDirection"/>
-                               <parameter name="draw_arrow" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="draw_layout" symbol="gtk_draw_layout">
+               <function name="paint_layout" symbol="gtk_paint_layout">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="use_text" type="gboolean"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="draw_option" symbol="gtk_draw_option">
+               <function name="paint_option" symbol="gtk_paint_option">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="draw_polygon" symbol="gtk_draw_polygon">
+               <function name="paint_polygon" symbol="gtk_paint_polygon">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="detail" type="gchar*"/>
                                <parameter name="points" type="GdkPoint*"/>
                                <parameter name="npoints" type="gint"/>
                                <parameter name="fill" type="gboolean"/>
                        </parameters>
                </function>
-               <function name="draw_resize_grip" symbol="gtk_draw_resize_grip">
+               <function name="paint_resize_grip" symbol="gtk_paint_resize_grip">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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"/>
@@ -570,26 +779,32 @@
                                <parameter name="height" type="gint"/>
                        </parameters>
                </function>
-               <function name="draw_shadow" symbol="gtk_draw_shadow">
+               <function name="paint_shadow" symbol="gtk_paint_shadow">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="draw_shadow_gap" symbol="gtk_draw_shadow_gap">
+               <function name="paint_shadow_gap" symbol="gtk_paint_shadow_gap">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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"/>
@@ -599,13 +814,16 @@
                                <parameter name="gap_width" type="gint"/>
                        </parameters>
                </function>
-               <function name="draw_slider" symbol="gtk_draw_slider">
+               <function name="paint_slider" symbol="gtk_paint_slider">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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"/>
@@ -613,15817 +831,11759 @@
                                <parameter name="orientation" type="GtkOrientation"/>
                        </parameters>
                </function>
-               <function name="draw_string" symbol="gtk_draw_string">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="x" type="gint"/>
-                               <parameter name="y" type="gint"/>
-                               <parameter name="string" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="draw_tab" symbol="gtk_draw_tab">
+               <function name="paint_tab" symbol="gtk_paint_tab">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
                                <parameter name="shadow_type" type="GtkShadowType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="draw_vline" symbol="gtk_draw_vline">
+               <function name="paint_vline" symbol="gtk_paint_vline">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="style" type="GtkStyle*"/>
                                <parameter name="window" type="GdkWindow*"/>
                                <parameter name="state_type" type="GtkStateType"/>
+                               <parameter name="area" type="GdkRectangle*"/>
+                               <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>
                </function>
-               <function name="events_pending" symbol="gtk_events_pending">
+               <function name="parse_args" symbol="gtk_parse_args">
                        <return-type type="gboolean"/>
-               </function>
-               <function name="exit" symbol="gtk_exit">
-                       <return-type type="void"/>
                        <parameters>
-                               <parameter name="error_code" type="gint"/>
+                               <parameter name="argc" type="int*"/>
+                               <parameter name="argv" type="char***"/>
                        </parameters>
                </function>
-               <function name="false" symbol="gtk_false">
-                       <return-type type="gboolean"/>
+               <function name="print_error_quark" symbol="gtk_print_error_quark">
+                       <return-type type="GQuark"/>
                </function>
-               <function name="gc_get" symbol="gtk_gc_get">
-                       <return-type type="GdkGC*"/>
+               <function name="print_run_page_setup_dialog" symbol="gtk_print_run_page_setup_dialog">
+                       <return-type type="GtkPageSetup*"/>
                        <parameters>
-                               <parameter name="depth" type="gint"/>
-                               <parameter name="colormap" type="GdkColormap*"/>
-                               <parameter name="values" type="GdkGCValues*"/>
-                               <parameter name="values_mask" type="GdkGCValuesMask"/>
+                               <parameter name="parent" type="GtkWindow*"/>
+                               <parameter name="page_setup" type="GtkPageSetup*"/>
+                               <parameter name="settings" type="GtkPrintSettings*"/>
                        </parameters>
                </function>
-               <function name="gc_release" symbol="gtk_gc_release">
+               <function name="print_run_page_setup_dialog_async" symbol="gtk_print_run_page_setup_dialog_async">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="gc" type="GdkGC*"/>
+                               <parameter name="parent" type="GtkWindow*"/>
+                               <parameter name="page_setup" type="GtkPageSetup*"/>
+                               <parameter name="settings" type="GtkPrintSettings*"/>
+                               <parameter name="done_cb" type="GtkPageSetupDoneFunc"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
                </function>
-               <function name="get_current_event" symbol="gtk_get_current_event">
-                       <return-type type="GdkEvent*"/>
-               </function>
-               <function name="get_current_event_state" symbol="gtk_get_current_event_state">
-                       <return-type type="gboolean"/>
+               <function name="propagate_event" symbol="gtk_propagate_event">
+                       <return-type type="void"/>
                        <parameters>
-                               <parameter name="state" type="GdkModifierType*"/>
+                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="event" type="GdkEvent*"/>
                        </parameters>
                </function>
-               <function name="get_current_event_time" symbol="gtk_get_current_event_time">
-                       <return-type type="guint32"/>
-               </function>
-               <function name="get_default_language" symbol="gtk_get_default_language">
-                       <return-type type="PangoLanguage*"/>
+               <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="get_event_widget" symbol="gtk_get_event_widget">
-                       <return-type type="GtkWidget*"/>
+               <function name="quit_add_destroy" symbol="gtk_quit_add_destroy">
+                       <return-type type="void"/>
                        <parameters>
-                               <parameter name="event" type="GdkEvent*"/>
+                               <parameter name="main_level" type="guint"/>
+                               <parameter name="object" type="GtkObject*"/>
                        </parameters>
                </function>
-               <function name="get_option_group" symbol="gtk_get_option_group">
-                       <return-type type="GOptionGroup*"/>
+               <function name="quit_add_full" symbol="gtk_quit_add_full">
+                       <return-type type="guint"/>
                        <parameters>
-                               <parameter name="open_default_display" type="gboolean"/>
+                               <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="GtkDestroyNotify"/>
                        </parameters>
                </function>
-               <function name="grab_add" symbol="gtk_grab_add">
+               <function name="quit_remove" symbol="gtk_quit_remove">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="quit_handler_id" type="guint"/>
                        </parameters>
                </function>
-               <function name="grab_get_current" symbol="gtk_grab_get_current">
-                       <return-type type="GtkWidget*"/>
-               </function>
-               <function name="grab_remove" symbol="gtk_grab_remove">
+               <function name="quit_remove_by_data" symbol="gtk_quit_remove_by_data">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
                </function>
-               <function name="icon_size_from_name" symbol="gtk_icon_size_from_name">
-                       <return-type type="GtkIconSize"/>
+               <function name="rc_add_default_file" symbol="gtk_rc_add_default_file">
+                       <return-type type="void"/>
                        <parameters>
-                               <parameter name="name" type="gchar*"/>
+                               <parameter name="filename" type="gchar*"/>
                        </parameters>
                </function>
-               <function name="icon_size_get_name" symbol="gtk_icon_size_get_name">
+               <function name="rc_find_module_in_path" symbol="gtk_rc_find_module_in_path">
                        <return-type type="gchar*"/>
                        <parameters>
-                               <parameter name="size" type="GtkIconSize"/>
+                               <parameter name="module_file" type="gchar*"/>
                        </parameters>
                </function>
-               <function name="icon_size_lookup" symbol="gtk_icon_size_lookup">
-                       <return-type type="gboolean"/>
+               <function name="rc_find_pixmap_in_path" symbol="gtk_rc_find_pixmap_in_path">
+                       <return-type type="gchar*"/>
                        <parameters>
-                               <parameter name="size" type="GtkIconSize"/>
-                               <parameter name="width" type="gint*"/>
-                               <parameter name="height" type="gint*"/>
+                               <parameter name="settings" type="GtkSettings*"/>
+                               <parameter name="scanner" type="GScanner*"/>
+                               <parameter name="pixmap_file" type="gchar*"/>
                        </parameters>
                </function>
-               <function name="icon_size_lookup_for_settings" symbol="gtk_icon_size_lookup_for_settings">
-                       <return-type type="gboolean"/>
+               <function name="rc_get_default_files" symbol="gtk_rc_get_default_files">
+                       <return-type type="gchar**"/>
+               </function>
+               <function name="rc_get_im_module_file" symbol="gtk_rc_get_im_module_file">
+                       <return-type type="gchar*"/>
+               </function>
+               <function name="rc_get_im_module_path" symbol="gtk_rc_get_im_module_path">
+                       <return-type type="gchar*"/>
+               </function>
+               <function name="rc_get_module_dir" symbol="gtk_rc_get_module_dir">
+                       <return-type type="gchar*"/>
+               </function>
+               <function name="rc_get_style" symbol="gtk_rc_get_style">
+                       <return-type type="GtkStyle*"/>
                        <parameters>
-                               <parameter name="settings" type="GtkSettings*"/>
-                               <parameter name="size" type="GtkIconSize"/>
-                               <parameter name="width" type="gint*"/>
-                               <parameter name="height" type="gint*"/>
+                               <parameter name="widget" type="GtkWidget*"/>
                        </parameters>
                </function>
-               <function name="icon_size_register" symbol="gtk_icon_size_register">
-                       <return-type type="GtkIconSize"/>
+               <function name="rc_get_style_by_paths" symbol="gtk_rc_get_style_by_paths">
+                       <return-type type="GtkStyle*"/>
                        <parameters>
-                               <parameter name="name" type="gchar*"/>
-                               <parameter name="width" type="gint"/>
-                               <parameter name="height" type="gint"/>
+                               <parameter name="settings" type="GtkSettings*"/>
+                               <parameter name="widget_path" type="char*"/>
+                               <parameter name="class_path" type="char*"/>
+                               <parameter name="type" type="GType"/>
                        </parameters>
                </function>
-               <function name="icon_size_register_alias" symbol="gtk_icon_size_register_alias">
+               <function name="rc_get_theme_dir" symbol="gtk_rc_get_theme_dir">
+                       <return-type type="gchar*"/>
+               </function>
+               <function name="rc_parse" symbol="gtk_rc_parse">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="alias" type="gchar*"/>
-                               <parameter name="target" type="GtkIconSize"/>
+                               <parameter name="filename" type="gchar*"/>
                        </parameters>
                </function>
-               <function name="identifier_get_type" symbol="gtk_identifier_get_type">
-                       <return-type type="GType"/>
+               <function name="rc_parse_color" symbol="gtk_rc_parse_color">
+                       <return-type type="guint"/>
+                       <parameters>
+                               <parameter name="scanner" type="GScanner*"/>
+                               <parameter name="color" type="GdkColor*"/>
+                       </parameters>
                </function>
-               <function name="idle_add" symbol="gtk_idle_add">
+               <function name="rc_parse_color_full" symbol="gtk_rc_parse_color_full">
                        <return-type type="guint"/>
                        <parameters>
-                               <parameter name="function" type="GtkFunction"/>
-                               <parameter name="data" type="gpointer"/>
+                               <parameter name="scanner" type="GScanner*"/>
+                               <parameter name="style" type="GtkRcStyle*"/>
+                               <parameter name="color" type="GdkColor*"/>
                        </parameters>
                </function>
-               <function name="idle_add_full" symbol="gtk_idle_add_full">
+               <function name="rc_parse_priority" symbol="gtk_rc_parse_priority">
                        <return-type type="guint"/>
                        <parameters>
-                               <parameter name="priority" type="gint"/>
-                               <parameter name="function" type="GtkFunction"/>
-                               <parameter name="marshal" type="GtkCallbackMarshal"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="destroy" type="GtkDestroyNotify"/>
+                               <parameter name="scanner" type="GScanner*"/>
+                               <parameter name="priority" type="GtkPathPriorityType*"/>
                        </parameters>
                </function>
-               <function name="idle_add_priority" symbol="gtk_idle_add_priority">
+               <function name="rc_parse_state" symbol="gtk_rc_parse_state">
                        <return-type type="guint"/>
                        <parameters>
-                               <parameter name="priority" type="gint"/>
-                               <parameter name="function" type="GtkFunction"/>
-                               <parameter name="data" type="gpointer"/>
+                               <parameter name="scanner" type="GScanner*"/>
+                               <parameter name="state" type="GtkStateType*"/>
                        </parameters>
                </function>
-               <function name="idle_remove" symbol="gtk_idle_remove">
+               <function name="rc_parse_string" symbol="gtk_rc_parse_string">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="idle_handler_id" type="guint"/>
+                               <parameter name="rc_string" type="gchar*"/>
                        </parameters>
                </function>
-               <function name="idle_remove_by_data" symbol="gtk_idle_remove_by_data">
-                       <return-type type="void"/>
+               <function name="rc_reparse_all" symbol="gtk_rc_reparse_all">
+                       <return-type type="gboolean"/>
+               </function>
+               <function name="rc_reparse_all_for_settings" symbol="gtk_rc_reparse_all_for_settings">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="data" type="gpointer"/>
+                               <parameter name="settings" type="GtkSettings*"/>
+                               <parameter name="force_load" type="gboolean"/>
                        </parameters>
                </function>
-               <function name="init" symbol="gtk_init">
+               <function name="rc_reset_styles" symbol="gtk_rc_reset_styles">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="argc" type="int*"/>
-                               <parameter name="argv" type="char***"/>
+                               <parameter name="settings" type="GtkSettings*"/>
                        </parameters>
                </function>
-               <function name="init_add" symbol="gtk_init_add">
+               <function name="rc_scanner_new" symbol="gtk_rc_scanner_new">
+                       <return-type type="GScanner*"/>
+               </function>
+               <function name="rc_set_default_files" symbol="gtk_rc_set_default_files">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="function" type="GtkFunction"/>
-                               <parameter name="data" type="gpointer"/>
+                               <parameter name="filenames" type="gchar**"/>
                        </parameters>
                </function>
-               <function name="init_check" symbol="gtk_init_check">
-                       <return-type type="gboolean"/>
+               <function name="selection_add_target" symbol="gtk_selection_add_target">
+                       <return-type type="void"/>
                        <parameters>
-                               <parameter name="argc" type="int*"/>
-                               <parameter name="argv" type="char***"/>
+                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="selection" type="GdkAtom"/>
+                               <parameter name="target" type="GdkAtom"/>
+                               <parameter name="info" type="guint"/>
                        </parameters>
                </function>
-               <function name="init_with_args" symbol="gtk_init_with_args">
-                       <return-type type="gboolean"/>
+               <function name="selection_add_targets" symbol="gtk_selection_add_targets">
+                       <return-type type="void"/>
                        <parameters>
-                               <parameter name="argc" type="int*"/>
-                               <parameter name="argv" type="char***"/>
-                               <parameter name="parameter_string" type="char*"/>
-                               <parameter name="entries" type="GOptionEntry*"/>
-                               <parameter name="translation_domain" type="char*"/>
-                               <parameter name="error" type="GError**"/>
+                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="selection" type="GdkAtom"/>
+                               <parameter name="targets" type="GtkTargetEntry*"/>
+                               <parameter name="ntargets" type="guint"/>
                        </parameters>
                </function>
-               <function name="input_add_full" symbol="gtk_input_add_full">
-                       <return-type type="guint"/>
+               <function name="selection_clear_targets" symbol="gtk_selection_clear_targets">
+                       <return-type type="void"/>
                        <parameters>
-                               <parameter name="source" type="gint"/>
-                               <parameter name="condition" type="GdkInputCondition"/>
-                               <parameter name="function" type="GdkInputFunction"/>
-                               <parameter name="marshal" type="GtkCallbackMarshal"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="destroy" type="GtkDestroyNotify"/>
+                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="selection" type="GdkAtom"/>
                        </parameters>
                </function>
-               <function name="input_remove" symbol="gtk_input_remove">
-                       <return-type type="void"/>
+               <function name="selection_convert" symbol="gtk_selection_convert">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="input_handler_id" type="guint"/>
+                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="selection" type="GdkAtom"/>
+                               <parameter name="target" type="GdkAtom"/>
+                               <parameter name="time_" type="guint32"/>
                        </parameters>
                </function>
-               <function name="key_snooper_install" symbol="gtk_key_snooper_install">
-                       <return-type type="guint"/>
+               <function name="selection_owner_set" symbol="gtk_selection_owner_set">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="snooper" type="GtkKeySnoopFunc"/>
-                               <parameter name="func_data" type="gpointer"/>
+                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="selection" type="GdkAtom"/>
+                               <parameter name="time_" type="guint32"/>
                        </parameters>
                </function>
-               <function name="key_snooper_remove" symbol="gtk_key_snooper_remove">
-                       <return-type type="void"/>
+               <function name="selection_owner_set_for_display" symbol="gtk_selection_owner_set_for_display">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="snooper_handler_id" type="guint"/>
+                               <parameter name="display" type="GdkDisplay*"/>
+                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="selection" type="GdkAtom"/>
+                               <parameter name="time_" type="guint32"/>
                        </parameters>
                </function>
-               <function name="main" symbol="gtk_main">
-                       <return-type type="void"/>
-               </function>
-               <function name="main_do_event" symbol="gtk_main_do_event">
+               <function name="selection_remove_all" symbol="gtk_selection_remove_all">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="event" type="GdkEvent*"/>
+                               <parameter name="widget" type="GtkWidget*"/>
                        </parameters>
                </function>
-               <function name="main_iteration" symbol="gtk_main_iteration">
-                       <return-type type="gboolean"/>
+               <function name="set_locale" symbol="gtk_set_locale">
+                       <return-type type="gchar*"/>
                </function>
-               <function name="main_iteration_do" symbol="gtk_main_iteration_do">
-                       <return-type type="gboolean"/>
+               <function name="show_about_dialog" symbol="gtk_show_about_dialog">
+                       <return-type type="void"/>
                        <parameters>
-                               <parameter name="blocking" type="gboolean"/>
+                               <parameter name="parent" type="GtkWindow*"/>
+                               <parameter name="first_property_name" type="gchar*"/>
                        </parameters>
                </function>
-               <function name="main_level" symbol="gtk_main_level">
-                       <return-type type="guint"/>
-               </function>
-               <function name="main_quit" symbol="gtk_main_quit">
-                       <return-type type="void"/>
-               </function>
-               <function name="marshal_BOOLEAN__POINTER" symbol="gtk_marshal_BOOLEAN__POINTER">
+               <function name="stock_add" symbol="gtk_stock_add">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="items" type="GtkStockItem*"/>
+                               <parameter name="n_items" type="guint"/>
                        </parameters>
                </function>
-               <function name="marshal_BOOLEAN__POINTER_INT_INT" symbol="gtk_marshal_BOOLEAN__POINTER_INT_INT">
+               <function name="stock_add_static" symbol="gtk_stock_add_static">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="items" type="GtkStockItem*"/>
+                               <parameter name="n_items" type="guint"/>
                        </parameters>
                </function>
-               <function name="marshal_BOOLEAN__POINTER_INT_INT_UINT" symbol="gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT">
-                       <return-type type="void"/>
+               <function name="stock_list_ids" symbol="gtk_stock_list_ids">
+                       <return-type type="GSList*"/>
+               </function>
+               <function name="stock_lookup" symbol="gtk_stock_lookup">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="stock_id" type="gchar*"/>
+                               <parameter name="item" type="GtkStockItem*"/>
                        </parameters>
                </function>
-               <function name="marshal_BOOLEAN__POINTER_POINTER_INT_INT" symbol="gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT">
+               <function name="stock_set_translate_func" symbol="gtk_stock_set_translate_func">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="domain" type="gchar*"/>
+                               <parameter name="func" type="GtkTranslateFunc"/>
+                               <parameter name="data" type="gpointer"/>
+                               <parameter name="notify" type="GtkDestroyNotify"/>
                        </parameters>
                </function>
-               <function name="marshal_BOOLEAN__POINTER_STRING_STRING_POINTER" symbol="gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER">
+               <function name="target_table_free" symbol="gtk_target_table_free">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="targets" type="GtkTargetEntry*"/>
+                               <parameter name="n_targets" type="gint"/>
                        </parameters>
                </function>
-               <function name="marshal_BOOLEAN__VOID" symbol="gtk_marshal_BOOLEAN__VOID">
-                       <return-type type="void"/>
+               <function name="target_table_new_from_list" symbol="gtk_target_table_new_from_list">
+                       <return-type type="GtkTargetEntry*"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="list" type="GtkTargetList*"/>
+                               <parameter name="n_targets" type="gint*"/>
                        </parameters>
                </function>
-               <function name="marshal_ENUM__ENUM" symbol="gtk_marshal_ENUM__ENUM">
-                       <return-type type="void"/>
+               <function name="targets_include_image" symbol="gtk_targets_include_image">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="targets" type="GdkAtom*"/>
+                               <parameter name="n_targets" type="gint"/>
+                               <parameter name="writable" type="gboolean"/>
                        </parameters>
                </function>
-               <function name="marshal_INT__POINTER" symbol="gtk_marshal_INT__POINTER">
-                       <return-type type="void"/>
+               <function name="targets_include_rich_text" symbol="gtk_targets_include_rich_text">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="targets" type="GdkAtom*"/>
+                               <parameter name="n_targets" type="gint"/>
+                               <parameter name="buffer" type="GtkTextBuffer*"/>
                        </parameters>
                </function>
-               <function name="marshal_INT__POINTER_CHAR_CHAR" symbol="gtk_marshal_INT__POINTER_CHAR_CHAR">
-                       <return-type type="void"/>
+               <function name="targets_include_text" symbol="gtk_targets_include_text">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="targets" type="GdkAtom*"/>
+                               <parameter name="n_targets" type="gint"/>
                        </parameters>
                </function>
-               <function name="marshal_VOID__ENUM_FLOAT" symbol="gtk_marshal_VOID__ENUM_FLOAT">
-                       <return-type type="void"/>
+               <function name="targets_include_uri" symbol="gtk_targets_include_uri">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="targets" type="GdkAtom*"/>
+                               <parameter name="n_targets" type="gint"/>
                        </parameters>
                </function>
-               <function name="marshal_VOID__ENUM_FLOAT_BOOLEAN" symbol="gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN">
-                       <return-type type="void"/>
+               <function name="tree_get_row_drag_data" symbol="gtk_tree_get_row_drag_data">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="selection_data" type="GtkSelectionData*"/>
+                               <parameter name="tree_model" type="GtkTreeModel**"/>
+                               <parameter name="path" type="GtkTreePath**"/>
                        </parameters>
                </function>
-               <function name="marshal_VOID__INT_INT" symbol="gtk_marshal_VOID__INT_INT">
-                       <return-type type="void"/>
+               <function name="tree_set_row_drag_data" symbol="gtk_tree_set_row_drag_data">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="selection_data" type="GtkSelectionData*"/>
+                               <parameter name="tree_model" type="GtkTreeModel*"/>
+                               <parameter name="path" type="GtkTreePath*"/>
                        </parameters>
                </function>
-               <function name="marshal_VOID__INT_INT_POINTER" symbol="gtk_marshal_VOID__INT_INT_POINTER">
+               <function name="true" symbol="gtk_true">
+                       <return-type type="gboolean"/>
+               </function>
+               <callback name="GtkAboutDialogActivateLinkFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="about" type="GtkAboutDialog*"/>
+                               <parameter name="link_" type="gchar*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__POINTER_INT" symbol="gtk_marshal_VOID__POINTER_INT">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkAccelGroupActivate">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="accel_group" type="GtkAccelGroup*"/>
+                               <parameter name="acceleratable" type="GObject*"/>
+                               <parameter name="keyval" type="guint"/>
+                               <parameter name="modifier" type="GdkModifierType"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT" symbol="gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkAccelGroupFindFunc">
+                       <return-type type="gboolean"/>
                        <parameters>
+                               <parameter name="key" type="GtkAccelKey*"/>
                                <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__POINTER_POINTER" symbol="gtk_marshal_VOID__POINTER_POINTER">
+               </callback>
+               <callback name="GtkAccelMapForeach">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="data" type="gpointer"/>
+                               <parameter name="accel_path" type="gchar*"/>
+                               <parameter name="accel_key" type="guint"/>
+                               <parameter name="accel_mods" type="GdkModifierType"/>
+                               <parameter name="changed" type="gboolean"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__POINTER_POINTER_POINTER" symbol="gtk_marshal_VOID__POINTER_POINTER_POINTER">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkAssistantPageFunc">
+                       <return-type type="gint"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="current_page" type="gint"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__POINTER_POINTER_UINT_UINT" symbol="gtk_marshal_VOID__POINTER_POINTER_UINT_UINT">
+               </callback>
+               <callback name="GtkBuilderConnectFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="builder" type="GtkBuilder*"/>
+                               <parameter name="object" type="GObject*"/>
+                               <parameter name="signal_name" type="gchar*"/>
+                               <parameter name="handler_name" type="gchar*"/>
+                               <parameter name="connect_object" type="GObject*"/>
+                               <parameter name="flags" type="GConnectFlags"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__POINTER_STRING_STRING" symbol="gtk_marshal_VOID__POINTER_STRING_STRING">
+               </callback>
+               <callback name="GtkCallback">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__POINTER_UINT" symbol="gtk_marshal_VOID__POINTER_UINT">
+               </callback>
+               <callback name="GtkCallbackMarshal">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="object" type="GtkObject*"/>
+                               <parameter name="data" type="gpointer"/>
+                               <parameter name="n_args" type="guint"/>
+                               <parameter name="args" type="GtkArg*"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__POINTER_UINT_ENUM" symbol="gtk_marshal_VOID__POINTER_UINT_ENUM">
+               </callback>
+               <callback name="GtkCellLayoutDataFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="cell_layout" type="GtkCellLayout*"/>
+                               <parameter name="cell" type="GtkCellRenderer*"/>
+                               <parameter name="tree_model" type="GtkTreeModel*"/>
+                               <parameter name="iter" type="GtkTreeIter*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__POINTER_UINT_UINT" symbol="gtk_marshal_VOID__POINTER_UINT_UINT">
+               </callback>
+               <callback name="GtkClipboardClearFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="clipboard" type="GtkClipboard*"/>
+                               <parameter name="user_data_or_owner" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__STRING_INT_POINTER" symbol="gtk_marshal_VOID__STRING_INT_POINTER">
+               </callback>
+               <callback name="GtkClipboardGetFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="clipboard" type="GtkClipboard*"/>
+                               <parameter name="selection_data" type="GtkSelectionData*"/>
+                               <parameter name="info" type="guint"/>
+                               <parameter name="user_data_or_owner" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER" symbol="gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER">
+               </callback>
+               <callback name="GtkClipboardImageReceivedFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="clipboard" type="GtkClipboard*"/>
+                               <parameter name="pixbuf" type="GdkPixbuf*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__UINT_POINTER_UINT_UINT_ENUM" symbol="gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM">
+               </callback>
+               <callback name="GtkClipboardReceivedFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="clipboard" type="GtkClipboard*"/>
+                               <parameter name="selection_data" type="GtkSelectionData*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="marshal_VOID__UINT_STRING" symbol="gtk_marshal_VOID__UINT_STRING">
+               </callback>
+               <callback name="GtkClipboardRichTextReceivedFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="return_value" type="GValue*"/>
-                               <parameter name="n_param_values" type="guint"/>
-                               <parameter name="param_values" type="GValue*"/>
-                               <parameter name="invocation_hint" type="gpointer"/>
-                               <parameter name="marshal_data" type="gpointer"/>
+                               <parameter name="clipboard" type="GtkClipboard*"/>
+                               <parameter name="format" type="GdkAtom"/>
+                               <parameter name="text" type="guint8*"/>
+                               <parameter name="length" type="gsize"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_arrow" symbol="gtk_paint_arrow">
+               </callback>
+               <callback name="GtkClipboardTargetsReceivedFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="clipboard" type="GtkClipboard*"/>
+                               <parameter name="atoms" type="GdkAtom*"/>
+                               <parameter name="n_atoms" type="gint"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_box" symbol="gtk_paint_box">
+               </callback>
+               <callback name="GtkClipboardTextReceivedFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="clipboard" type="GtkClipboard*"/>
+                               <parameter name="text" type="gchar*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_box_gap" symbol="gtk_paint_box_gap">
+               </callback>
+               <callback name="GtkColorSelectionChangePaletteFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="colors" type="GdkColor*"/>
+                               <parameter name="n_colors" type="gint"/>
                        </parameters>
-               </function>
-               <function name="paint_check" symbol="gtk_paint_check">
+               </callback>
+               <callback name="GtkColorSelectionChangePaletteWithScreenFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="screen" type="GdkScreen*"/>
+                               <parameter name="colors" type="GdkColor*"/>
+                               <parameter name="n_colors" type="gint"/>
                        </parameters>
-               </function>
-               <function name="paint_diamond" symbol="gtk_paint_diamond">
+               </callback>
+               <callback name="GtkDestroyNotify">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_expander" symbol="gtk_paint_expander">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkEntryCompletionMatchFunc">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="completion" type="GtkEntryCompletion*"/>
+                               <parameter name="key" type="gchar*"/>
+                               <parameter name="iter" type="GtkTreeIter*"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_extension" symbol="gtk_paint_extension">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkFileFilterFunc">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="filter_info" type="GtkFileFilterInfo*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_flat_box" symbol="gtk_paint_flat_box">
+               </callback>
+               <callback name="GtkFunction">
+                       <return-type type="gboolean"/>
+                       <parameters>
+                               <parameter name="data" type="gpointer"/>
+                       </parameters>
+               </callback>
+               <callback name="GtkIconViewForeachFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="icon_view" type="GtkIconView*"/>
+                               <parameter name="path" type="GtkTreePath*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_focus" symbol="gtk_paint_focus">
+               </callback>
+               <callback name="GtkKeySnoopFunc">
+                       <return-type type="gint"/>
+                       <parameters>
+                               <parameter name="grab_widget" type="GtkWidget*"/>
+                               <parameter name="event" type="GdkEventKey*"/>
+                               <parameter name="func_data" type="gpointer"/>
+                       </parameters>
+               </callback>
+               <callback name="GtkLinkButtonUriFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="button" type="GtkLinkButton*"/>
+                               <parameter name="link_" type="gchar*"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_handle" symbol="gtk_paint_handle">
+               </callback>
+               <callback name="GtkMenuDetachFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="attach_widget" type="GtkWidget*"/>
+                               <parameter name="menu" type="GtkMenu*"/>
                        </parameters>
-               </function>
-               <function name="paint_hline" symbol="gtk_paint_hline">
+               </callback>
+               <callback name="GtkMenuPositionFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="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>
-               </function>
-               <function name="paint_layout" symbol="gtk_paint_layout">
+               </callback>
+               <callback name="GtkModuleDisplayInitFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="use_text" type="gboolean"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="display" type="GdkDisplay*"/>
                        </parameters>
-               </function>
-               <function name="paint_option" symbol="gtk_paint_option">
+               </callback>
+               <callback name="GtkModuleInitFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="detail" type="gchar*"/>
+                               <parameter name="argc" type="gint*"/>
+                               <parameter name="argv" type="gchar***"/>
+                       </parameters>
+               </callback>
+               <callback name="GtkNotebookWindowCreationFunc">
+                       <return-type type="GtkNotebook*"/>
+                       <parameters>
+                               <parameter name="source" type="GtkNotebook*"/>
+                               <parameter name="page" type="GtkWidget*"/>
                                <parameter name="x" type="gint"/>
                                <parameter name="y" type="gint"/>
-                               <parameter name="width" type="gint"/>
-                               <parameter name="height" type="gint"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_polygon" symbol="gtk_paint_polygon">
+               </callback>
+               <callback name="GtkPageSetupDoneFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="detail" type="gchar*"/>
-                               <parameter name="points" type="GdkPoint*"/>
-                               <parameter name="npoints" type="gint"/>
-                               <parameter name="fill" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="paint_resize_grip" symbol="gtk_paint_resize_grip">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="page_setup" type="GtkPageSetup*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_shadow" symbol="gtk_paint_shadow">
+               </callback>
+               <callback name="GtkPrintSettingsFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="key" type="gchar*"/>
+                               <parameter name="value" type="gchar*"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_shadow_gap" symbol="gtk_paint_shadow_gap">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkRcPropertyParser">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="pspec" type="GParamSpec*"/>
+                               <parameter name="rc_string" type="GString*"/>
+                               <parameter name="property_value" type="GValue*"/>
                        </parameters>
-               </function>
-               <function name="paint_slider" symbol="gtk_paint_slider">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkRecentFilterFunc">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="filter_info" type="GtkRecentFilterInfo*"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_string" symbol="gtk_paint_string">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkRecentSortFunc">
+                       <return-type type="gint"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="detail" type="gchar*"/>
-                               <parameter name="x" type="gint"/>
-                               <parameter name="y" type="gint"/>
-                               <parameter name="string" type="gchar*"/>
+                               <parameter name="a" type="GtkRecentInfo*"/>
+                               <parameter name="b" type="GtkRecentInfo*"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="paint_tab" symbol="gtk_paint_tab">
+               </callback>
+               <callback name="GtkSignalFunc">
                        <return-type type="void"/>
+               </callback>
+               <callback name="GtkTextBufferDeserializeFunc">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="shadow_type" type="GtkShadowType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="register_buffer" type="GtkTextBuffer*"/>
+                               <parameter name="content_buffer" type="GtkTextBuffer*"/>
+                               <parameter name="iter" type="GtkTextIter*"/>
+                               <parameter name="data" type="guint8*"/>
+                               <parameter name="length" type="gsize"/>
+                               <parameter name="create_tags" type="gboolean"/>
+                               <parameter name="user_data" type="gpointer"/>
+                               <parameter name="error" type="GError**"/>
                        </parameters>
-               </function>
-               <function name="paint_vline" symbol="gtk_paint_vline">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkTextBufferSerializeFunc">
+                       <return-type type="guint8*"/>
                        <parameters>
-                               <parameter name="style" type="GtkStyle*"/>
-                               <parameter name="window" type="GdkWindow*"/>
-                               <parameter name="state_type" type="GtkStateType"/>
-                               <parameter name="area" type="GdkRectangle*"/>
-                               <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="register_buffer" type="GtkTextBuffer*"/>
+                               <parameter name="content_buffer" type="GtkTextBuffer*"/>
+                               <parameter name="start" type="GtkTextIter*"/>
+                               <parameter name="end" type="GtkTextIter*"/>
+                               <parameter name="length" type="gsize*"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="parse_args" symbol="gtk_parse_args">
+               </callback>
+               <callback name="GtkTextCharPredicate">
                        <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="argc" type="int*"/>
-                               <parameter name="argv" type="char***"/>
-                       </parameters>
-               </function>
-               <function name="print_error_quark" symbol="gtk_print_error_quark">
-                       <return-type type="GQuark"/>
-               </function>
-               <function name="print_run_page_setup_dialog" symbol="gtk_print_run_page_setup_dialog">
-                       <return-type type="GtkPageSetup*"/>
-                       <parameters>
-                               <parameter name="parent" type="GtkWindow*"/>
-                               <parameter name="page_setup" type="GtkPageSetup*"/>
-                               <parameter name="settings" type="GtkPrintSettings*"/>
+                               <parameter name="ch" type="gunichar"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="print_run_page_setup_dialog_async" symbol="gtk_print_run_page_setup_dialog_async">
+               </callback>
+               <callback name="GtkTextTagTableForeach">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="parent" type="GtkWindow*"/>
-                               <parameter name="page_setup" type="GtkPageSetup*"/>
-                               <parameter name="settings" type="GtkPrintSettings*"/>
-                               <parameter name="done_cb" type="GtkPageSetupDoneFunc"/>
+                               <parameter name="tag" type="GtkTextTag*"/>
                                <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="propagate_event" symbol="gtk_propagate_event">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkTranslateFunc">
+                       <return-type type="gchar*"/>
                        <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="event" type="GdkEvent*"/>
+                               <parameter name="path" type="gchar*"/>
+                               <parameter name="func_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="quit_add" symbol="gtk_quit_add">
-                       <return-type type="guint"/>
+               </callback>
+               <callback name="GtkTreeCellDataFunc">
+                       <return-type type="void"/>
                        <parameters>
-                               <parameter name="main_level" type="guint"/>
-                               <parameter name="function" type="GtkFunction"/>
+                               <parameter name="tree_column" type="GtkTreeViewColumn*"/>
+                               <parameter name="cell" type="GtkCellRenderer*"/>
+                               <parameter name="tree_model" type="GtkTreeModel*"/>
+                               <parameter name="iter" type="GtkTreeIter*"/>
                                <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="quit_add_destroy" symbol="gtk_quit_add_destroy">
+               </callback>
+               <callback name="GtkTreeDestroyCountFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="main_level" type="guint"/>
-                               <parameter name="object" type="GtkObject*"/>
+                               <parameter name="tree_view" type="GtkTreeView*"/>
+                               <parameter name="path" type="GtkTreePath*"/>
+                               <parameter name="children" type="gint"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="quit_add_full" symbol="gtk_quit_add_full">
-                       <return-type type="guint"/>
+               </callback>
+               <callback name="GtkTreeIterCompareFunc">
+                       <return-type type="gint"/>
                        <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="GtkDestroyNotify"/>
+                               <parameter name="model" type="GtkTreeModel*"/>
+                               <parameter name="a" type="GtkTreeIter*"/>
+                               <parameter name="b" type="GtkTreeIter*"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="quit_remove" symbol="gtk_quit_remove">
+               </callback>
+               <callback name="GtkTreeModelFilterModifyFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="quit_handler_id" type="guint"/>
+                               <parameter name="model" type="GtkTreeModel*"/>
+                               <parameter name="iter" type="GtkTreeIter*"/>
+                               <parameter name="value" type="GValue*"/>
+                               <parameter name="column" type="gint"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="quit_remove_by_data" symbol="gtk_quit_remove_by_data">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkTreeModelFilterVisibleFunc">
+                       <return-type type="gboolean"/>
                        <parameters>
+                               <parameter name="model" type="GtkTreeModel*"/>
+                               <parameter name="iter" type="GtkTreeIter*"/>
                                <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="rc_add_class_style" symbol="gtk_rc_add_class_style">
-                       <return-type type="void"/>
+               </callback>
+               <callback name="GtkTreeModelForeachFunc">
+                       <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="rc_style" type="GtkRcStyle*"/>
-                               <parameter name="pattern" type="gchar*"/>
+                               <parameter name="model" type="GtkTreeModel*"/>
+                               <parameter name="path" type="GtkTreePath*"/>
+                               <parameter name="iter" type="GtkTreeIter*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="rc_add_default_file" symbol="gtk_rc_add_default_file">
+               </callback>
+               <callback name="GtkTreeSelectionForeachFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="filename" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="rc_add_widget_class_style" symbol="gtk_rc_add_widget_class_style">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="rc_style" type="GtkRcStyle*"/>
-                               <parameter name="pattern" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="rc_add_widget_name_style" symbol="gtk_rc_add_widget_name_style">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="rc_style" type="GtkRcStyle*"/>
-                               <parameter name="pattern" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="rc_find_module_in_path" symbol="gtk_rc_find_module_in_path">
-                       <return-type type="gchar*"/>
-                       <parameters>
-                               <parameter name="module_file" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="rc_find_pixmap_in_path" symbol="gtk_rc_find_pixmap_in_path">
-                       <return-type type="gchar*"/>
-                       <parameters>
-                               <parameter name="settings" type="GtkSettings*"/>
-                               <parameter name="scanner" type="GScanner*"/>
-                               <parameter name="pixmap_file" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="rc_get_default_files" symbol="gtk_rc_get_default_files">
-                       <return-type type="gchar**"/>
-               </function>
-               <function name="rc_get_im_module_file" symbol="gtk_rc_get_im_module_file">
-                       <return-type type="gchar*"/>
-               </function>
-               <function name="rc_get_im_module_path" symbol="gtk_rc_get_im_module_path">
-                       <return-type type="gchar*"/>
-               </function>
-               <function name="rc_get_module_dir" symbol="gtk_rc_get_module_dir">
-                       <return-type type="gchar*"/>
-               </function>
-               <function name="rc_get_style" symbol="gtk_rc_get_style">
-                       <return-type type="GtkStyle*"/>
-                       <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                       </parameters>
-               </function>
-               <function name="rc_get_style_by_paths" symbol="gtk_rc_get_style_by_paths">
-                       <return-type type="GtkStyle*"/>
-                       <parameters>
-                               <parameter name="settings" type="GtkSettings*"/>
-                               <parameter name="widget_path" type="char*"/>
-                               <parameter name="class_path" type="char*"/>
-                               <parameter name="type" type="GType"/>
-                       </parameters>
-               </function>
-               <function name="rc_get_theme_dir" symbol="gtk_rc_get_theme_dir">
-                       <return-type type="gchar*"/>
-               </function>
-               <function name="rc_parse" symbol="gtk_rc_parse">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="filename" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="rc_parse_color" symbol="gtk_rc_parse_color">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="scanner" type="GScanner*"/>
-                               <parameter name="color" type="GdkColor*"/>
-                       </parameters>
-               </function>
-               <function name="rc_parse_color_full" symbol="gtk_rc_parse_color_full">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="scanner" type="GScanner*"/>
-                               <parameter name="style" type="GtkRcStyle*"/>
-                               <parameter name="color" type="GdkColor*"/>
-                       </parameters>
-               </function>
-               <function name="rc_parse_priority" symbol="gtk_rc_parse_priority">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="scanner" type="GScanner*"/>
-                               <parameter name="priority" type="GtkPathPriorityType*"/>
-                       </parameters>
-               </function>
-               <function name="rc_parse_state" symbol="gtk_rc_parse_state">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="scanner" type="GScanner*"/>
-                               <parameter name="state" type="GtkStateType*"/>
-                       </parameters>
-               </function>
-               <function name="rc_parse_string" symbol="gtk_rc_parse_string">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="rc_string" type="gchar*"/>
+                               <parameter name="model" type="GtkTreeModel*"/>
+                               <parameter name="path" type="GtkTreePath*"/>
+                               <parameter name="iter" type="GtkTreeIter*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="rc_reparse_all" symbol="gtk_rc_reparse_all">
-                       <return-type type="gboolean"/>
-               </function>
-               <function name="rc_reparse_all_for_settings" symbol="gtk_rc_reparse_all_for_settings">
+               </callback>
+               <callback name="GtkTreeSelectionFunc">
                        <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="settings" type="GtkSettings*"/>
-                               <parameter name="force_load" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="rc_reset_styles" symbol="gtk_rc_reset_styles">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="settings" type="GtkSettings*"/>
-                       </parameters>
-               </function>
-               <function name="rc_scanner_new" symbol="gtk_rc_scanner_new">
-                       <return-type type="GScanner*"/>
-               </function>
-               <function name="rc_set_default_files" symbol="gtk_rc_set_default_files">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="filenames" type="gchar**"/>
-                       </parameters>
-               </function>
-               <function name="selection_add_target" symbol="gtk_selection_add_target">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="selection" type="GdkAtom"/>
-                               <parameter name="target" type="GdkAtom"/>
-                               <parameter name="info" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="selection_add_targets" symbol="gtk_selection_add_targets">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="selection" type="GdkAtom"/>
-                               <parameter name="targets" type="GtkTargetEntry*"/>
-                               <parameter name="ntargets" type="guint"/>
+                               <parameter name="selection" type="GtkTreeSelection*"/>
+                               <parameter name="model" type="GtkTreeModel*"/>
+                               <parameter name="path" type="GtkTreePath*"/>
+                               <parameter name="path_currently_selected" type="gboolean"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="selection_clear" symbol="gtk_selection_clear">
+               </callback>
+               <callback name="GtkTreeViewColumnDropFunc">
                        <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="event" type="GdkEventSelection*"/>
+                               <parameter name="tree_view" type="GtkTreeView*"/>
+                               <parameter name="column" type="GtkTreeViewColumn*"/>
+                               <parameter name="prev_column" type="GtkTreeViewColumn*"/>
+                               <parameter name="next_column" type="GtkTreeViewColumn*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="selection_clear_targets" symbol="gtk_selection_clear_targets">
+               </callback>
+               <callback name="GtkTreeViewMappingFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="selection" type="GdkAtom"/>
-                       </parameters>
-               </function>
-               <function name="selection_convert" symbol="gtk_selection_convert">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="selection" type="GdkAtom"/>
-                               <parameter name="target" type="GdkAtom"/>
-                               <parameter name="time_" type="guint32"/>
+                               <parameter name="tree_view" type="GtkTreeView*"/>
+                               <parameter name="path" type="GtkTreePath*"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="selection_owner_set" symbol="gtk_selection_owner_set">
+               </callback>
+               <callback name="GtkTreeViewRowSeparatorFunc">
                        <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="selection" type="GdkAtom"/>
-                               <parameter name="time_" type="guint32"/>
+                               <parameter name="model" type="GtkTreeModel*"/>
+                               <parameter name="iter" type="GtkTreeIter*"/>
+                               <parameter name="data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="selection_owner_set_for_display" symbol="gtk_selection_owner_set_for_display">
+               </callback>
+               <callback name="GtkTreeViewSearchEqualFunc">
                        <return-type type="gboolean"/>
                        <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="selection" type="GdkAtom"/>
-                               <parameter name="time_" type="guint32"/>
-                       </parameters>
-               </function>
-               <function name="selection_remove_all" symbol="gtk_selection_remove_all">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
+                               <parameter name="model" type="GtkTreeModel*"/>
+                               <parameter name="column" type="gint"/>
+                               <parameter name="key" type="gchar*"/>
+                               <parameter name="iter" type="GtkTreeIter*"/>
+                               <parameter name="search_data" type="gpointer"/>
                        </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">
+               </callback>
+               <callback name="GtkTreeViewSearchPositionFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="parent" type="GtkWindow*"/>
-                               <parameter name="first_property_name" type="gchar*"/>
+                               <parameter name="tree_view" type="GtkTreeView*"/>
+                               <parameter name="search_dialog" type="GtkWidget*"/>
+                               <parameter name="user_data" type="gpointer"/>
                        </parameters>
-               </function>
-               <function name="signal_compat_matched" symbol="gtk_signal_compat_matched">
+               </callback>
+               <callback name="GtkWindowKeysForeachFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="object" type="GtkObject*"/>
-                               <parameter name="func" type="GtkSignalFunc"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="match" type="GSignalMatchType"/>
-                               <parameter name="action" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="signal_connect_full" symbol="gtk_signal_connect_full">
-                       <return-type type="gulong"/>
-                       <parameters>
-                               <parameter name="object" type="GtkObject*"/>
-                               <parameter name="name" type="gchar*"/>
-                               <parameter name="func" type="GtkSignalFunc"/>
-                               <parameter name="unsupported" type="GtkCallbackMarshal"/>
+                               <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"/>
-                               <parameter name="destroy_func" type="GtkDestroyNotify"/>
-                               <parameter name="object_signal" type="gint"/>
-                               <parameter name="after" type="gint"/>
-                       </parameters>
-               </function>
-               <function name="signal_connect_object_while_alive" symbol="gtk_signal_connect_object_while_alive">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="object" type="GtkObject*"/>
-                               <parameter name="name" type="gchar*"/>
-                               <parameter name="func" type="GtkSignalFunc"/>
-                               <parameter name="alive_object" type="GtkObject*"/>
-                       </parameters>
-               </function>
-               <function name="signal_connect_while_alive" symbol="gtk_signal_connect_while_alive">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="object" type="GtkObject*"/>
-                               <parameter name="name" type="gchar*"/>
-                               <parameter name="func" type="GtkSignalFunc"/>
-                               <parameter name="func_data" type="gpointer"/>
-                               <parameter name="alive_object" type="GtkObject*"/>
-                       </parameters>
-               </function>
-               <function name="signal_emit" symbol="gtk_signal_emit">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="object" type="GtkObject*"/>
-                               <parameter name="signal_id" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="signal_emit_by_name" symbol="gtk_signal_emit_by_name">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="object" type="GtkObject*"/>
-                               <parameter name="name" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="signal_emit_stop_by_name" symbol="gtk_signal_emit_stop_by_name">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="object" type="GtkObject*"/>
-                               <parameter name="name" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="signal_emitv" symbol="gtk_signal_emitv">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="object" type="GtkObject*"/>
-                               <parameter name="signal_id" type="guint"/>
-                               <parameter name="args" type="GtkArg*"/>
-                       </parameters>
-               </function>
-               <function name="signal_emitv_by_name" symbol="gtk_signal_emitv_by_name">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="object" type="GtkObject*"/>
-                               <parameter name="name" type="gchar*"/>
-                               <parameter name="args" type="GtkArg*"/>
-                       </parameters>
-               </function>
-               <function name="signal_new" symbol="gtk_signal_new">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="name" type="gchar*"/>
-                               <parameter name="signal_flags" type="GtkSignalRunType"/>
-                               <parameter name="object_type" type="GtkType"/>
-                               <parameter name="function_offset" type="guint"/>
-                               <parameter name="marshaller" type="GtkSignalMarshaller"/>
-                               <parameter name="return_val" type="GtkType"/>
-                               <parameter name="n_args" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="signal_newv" symbol="gtk_signal_newv">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="name" type="gchar*"/>
-                               <parameter name="signal_flags" type="GtkSignalRunType"/>
-                               <parameter name="object_type" type="GtkType"/>
-                               <parameter name="function_offset" type="guint"/>
-                               <parameter name="marshaller" type="GtkSignalMarshaller"/>
-                               <parameter name="return_val" type="GtkType"/>
-                               <parameter name="n_args" type="guint"/>
-                               <parameter name="args" type="GtkType*"/>
-                       </parameters>
-               </function>
-               <function name="stock_add" symbol="gtk_stock_add">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="items" type="GtkStockItem*"/>
-                               <parameter name="n_items" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="stock_add_static" symbol="gtk_stock_add_static">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="items" type="GtkStockItem*"/>
-                               <parameter name="n_items" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="stock_list_ids" symbol="gtk_stock_list_ids">
-                       <return-type type="GSList*"/>
-               </function>
-               <function name="stock_lookup" symbol="gtk_stock_lookup">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="stock_id" type="gchar*"/>
-                               <parameter name="item" type="GtkStockItem*"/>
-                       </parameters>
-               </function>
-               <function name="stock_set_translate_func" symbol="gtk_stock_set_translate_func">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="domain" type="gchar*"/>
-                               <parameter name="func" type="GtkTranslateFunc"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="notify" type="GtkDestroyNotify"/>
-                       </parameters>
-               </function>
-               <function name="target_table_free" symbol="gtk_target_table_free">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="targets" type="GtkTargetEntry*"/>
-                               <parameter name="n_targets" type="gint"/>
-                       </parameters>
-               </function>
-               <function name="target_table_new_from_list" symbol="gtk_target_table_new_from_list">
-                       <return-type type="GtkTargetEntry*"/>
-                       <parameters>
-                               <parameter name="list" type="GtkTargetList*"/>
-                               <parameter name="n_targets" type="gint*"/>
-                       </parameters>
-               </function>
-               <function name="targets_include_image" symbol="gtk_targets_include_image">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="targets" type="GdkAtom*"/>
-                               <parameter name="n_targets" type="gint"/>
-                               <parameter name="writable" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="targets_include_rich_text" symbol="gtk_targets_include_rich_text">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="targets" type="GdkAtom*"/>
-                               <parameter name="n_targets" type="gint"/>
-                               <parameter name="buffer" type="GtkTextBuffer*"/>
-                       </parameters>
-               </function>
-               <function name="targets_include_text" symbol="gtk_targets_include_text">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="targets" type="GdkAtom*"/>
-                               <parameter name="n_targets" type="gint"/>
-                       </parameters>
-               </function>
-               <function name="targets_include_uri" symbol="gtk_targets_include_uri">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="targets" type="GdkAtom*"/>
-                               <parameter name="n_targets" type="gint"/>
-                       </parameters>
-               </function>
-               <function name="timeout_add" symbol="gtk_timeout_add">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="interval" type="guint32"/>
-                               <parameter name="function" type="GtkFunction"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </function>
-               <function name="timeout_add_full" symbol="gtk_timeout_add_full">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="interval" type="guint32"/>
-                               <parameter name="function" type="GtkFunction"/>
-                               <parameter name="marshal" type="GtkCallbackMarshal"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="destroy" type="GtkDestroyNotify"/>
-                       </parameters>
-               </function>
-               <function name="timeout_remove" symbol="gtk_timeout_remove">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="timeout_handler_id" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="tree_get_row_drag_data" symbol="gtk_tree_get_row_drag_data">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="selection_data" type="GtkSelectionData*"/>
-                               <parameter name="tree_model" type="GtkTreeModel**"/>
-                               <parameter name="path" type="GtkTreePath**"/>
-                       </parameters>
-               </function>
-               <function name="tree_set_row_drag_data" symbol="gtk_tree_set_row_drag_data">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="selection_data" type="GtkSelectionData*"/>
-                               <parameter name="tree_model" type="GtkTreeModel*"/>
-                               <parameter name="path" type="GtkTreePath*"/>
-                       </parameters>
-               </function>
-               <function name="true" symbol="gtk_true">
-                       <return-type type="gboolean"/>
-               </function>
-               <callback name="GtkAboutDialogActivateLinkFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="about" type="GtkAboutDialog*"/>
-                               <parameter name="link_" type="gchar*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkAccelGroupActivate">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="accel_group" type="GtkAccelGroup*"/>
-                               <parameter name="acceleratable" type="GObject*"/>
-                               <parameter name="keyval" type="guint"/>
-                               <parameter name="modifier" type="GdkModifierType"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkAccelGroupFindFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="key" type="GtkAccelKey*"/>
-                               <parameter name="closure" type="GClosure*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkAccelMapForeach">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="accel_path" type="gchar*"/>
-                               <parameter name="accel_key" type="guint"/>
-                               <parameter name="accel_mods" type="GdkModifierType"/>
-                               <parameter name="changed" type="gboolean"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkAssistantPageFunc">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="current_page" type="gint"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkBuilderConnectFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="builder" type="GtkBuilder*"/>
-                               <parameter name="object" type="GObject*"/>
-                               <parameter name="signal_name" type="gchar*"/>
-                               <parameter name="handler_name" type="gchar*"/>
-                               <parameter name="connect_object" type="GObject*"/>
-                               <parameter name="flags" type="GConnectFlags"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkCListCompareFunc">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="clist" type="GtkCList*"/>
-                               <parameter name="ptr1" type="gconstpointer"/>
-                               <parameter name="ptr2" type="gconstpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkCTreeCompareDragFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="ctree" type="GtkCTree*"/>
-                               <parameter name="source_node" type="GtkCTreeNode*"/>
-                               <parameter name="new_parent" type="GtkCTreeNode*"/>
-                               <parameter name="new_sibling" type="GtkCTreeNode*"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkCTreeFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="ctree" type="GtkCTree*"/>
-                               <parameter name="node" type="GtkCTreeNode*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkCTreeGNodeFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="ctree" type="GtkCTree*"/>
-                               <parameter name="depth" type="guint"/>
-                               <parameter name="gnode" type="GNode*"/>
-                               <parameter name="cnode" type="GtkCTreeNode*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkCallback">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkCallbackMarshal">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="object" type="GtkObject*"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="n_args" type="guint"/>
-                               <parameter name="args" type="GtkArg*"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkCellLayoutDataFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cell_layout" type="GtkCellLayout*"/>
-                               <parameter name="cell" type="GtkCellRenderer*"/>
-                               <parameter name="tree_model" type="GtkTreeModel*"/>
-                               <parameter name="iter" type="GtkTreeIter*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkClipboardClearFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="clipboard" type="GtkClipboard*"/>
-                               <parameter name="user_data_or_owner" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkClipboardGetFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="clipboard" type="GtkClipboard*"/>
-                               <parameter name="selection_data" type="GtkSelectionData*"/>
-                               <parameter name="info" type="guint"/>
-                               <parameter name="user_data_or_owner" type="gpointer"/>
                        </parameters>
                </callback>
-               <callback name="GtkClipboardImageReceivedFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="clipboard" type="GtkClipboard*"/>
-                               <parameter name="pixbuf" type="GdkPixbuf*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkClipboardReceivedFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="clipboard" type="GtkClipboard*"/>
-                               <parameter name="selection_data" type="GtkSelectionData*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkClipboardRichTextReceivedFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="clipboard" type="GtkClipboard*"/>
-                               <parameter name="format" type="GdkAtom"/>
-                               <parameter name="text" type="guint8*"/>
-                               <parameter name="length" type="gsize"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkClipboardTargetsReceivedFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="clipboard" type="GtkClipboard*"/>
-                               <parameter name="atoms" type="GdkAtom*"/>
-                               <parameter name="n_atoms" type="gint"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkClipboardTextReceivedFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="clipboard" type="GtkClipboard*"/>
-                               <parameter name="text" type="gchar*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkColorSelectionChangePaletteFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="colors" type="GdkColor*"/>
-                               <parameter name="n_colors" type="gint"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkColorSelectionChangePaletteWithScreenFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="screen" type="GdkScreen*"/>
-                               <parameter name="colors" type="GdkColor*"/>
-                               <parameter name="n_colors" type="gint"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkDestroyNotify">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkEntryCompletionMatchFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="completion" type="GtkEntryCompletion*"/>
-                               <parameter name="key" type="gchar*"/>
-                               <parameter name="iter" type="GtkTreeIter*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkFileFilterFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="filter_info" type="GtkFileFilterInfo*"/>
-                               <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>
-                               <parameter name="icon_view" type="GtkIconView*"/>
-                               <parameter name="path" type="GtkTreePath*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkItemFactoryCallback">
-                       <return-type type="void"/>
-               </callback>
-               <callback name="GtkItemFactoryCallback1">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="callback_data" type="gpointer"/>
-                               <parameter name="callback_action" type="guint"/>
-                               <parameter name="widget" type="GtkWidget*"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkItemFactoryCallback2">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="callback_data" type="gpointer"/>
-                               <parameter name="callback_action" type="guint"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkKeySnoopFunc">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="grab_widget" type="GtkWidget*"/>
-                               <parameter name="event" type="GdkEventKey*"/>
-                               <parameter name="func_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkLinkButtonUriFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="button" type="GtkLinkButton*"/>
-                               <parameter name="link_" type="gchar*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkMenuCallback">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkMenuDetachFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="attach_widget" type="GtkWidget*"/>
-                               <parameter name="menu" type="GtkMenu*"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkMenuPositionFunc">
-                       <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>
-               </callback>
-               <callback name="GtkModuleDisplayInitFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="display" type="GdkDisplay*"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkModuleInitFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="argc" type="gint*"/>
-                               <parameter name="argv" type="gchar***"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkNotebookWindowCreationFunc">
-                       <return-type type="GtkNotebook*"/>
-                       <parameters>
-                               <parameter name="source" type="GtkNotebook*"/>
-                               <parameter name="page" type="GtkWidget*"/>
-                               <parameter name="x" type="gint"/>
-                               <parameter name="y" type="gint"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkPageSetupDoneFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="page_setup" type="GtkPageSetup*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkPrintFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="func_data" type="gpointer"/>
-                               <parameter name="str" type="gchar*"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkPrintSettingsFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="key" type="gchar*"/>
-                               <parameter name="value" type="gchar*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkRcPropertyParser">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="pspec" type="GParamSpec*"/>
-                               <parameter name="rc_string" type="GString*"/>
-                               <parameter name="property_value" type="GValue*"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkRecentFilterFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="filter_info" type="GtkRecentFilterInfo*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkRecentSortFunc">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="a" type="GtkRecentInfo*"/>
-                               <parameter name="b" type="GtkRecentInfo*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkSignalFunc">
-                       <return-type type="void"/>
-               </callback>
-               <callback name="GtkTextBufferDeserializeFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="register_buffer" type="GtkTextBuffer*"/>
-                               <parameter name="content_buffer" type="GtkTextBuffer*"/>
-                               <parameter name="iter" type="GtkTextIter*"/>
-                               <parameter name="data" type="guint8*"/>
-                               <parameter name="length" type="gsize"/>
-                               <parameter name="create_tags" type="gboolean"/>
-                               <parameter name="user_data" type="gpointer"/>
-                               <parameter name="error" type="GError**"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTextBufferSerializeFunc">
-                       <return-type type="guint8*"/>
-                       <parameters>
-                               <parameter name="register_buffer" type="GtkTextBuffer*"/>
-                               <parameter name="content_buffer" type="GtkTextBuffer*"/>
-                               <parameter name="start" type="GtkTextIter*"/>
-                               <parameter name="end" type="GtkTextIter*"/>
-                               <parameter name="length" type="gsize*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTextCharPredicate">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="ch" type="gunichar"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTextFunction">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="editable" type="GtkOldEditable*"/>
-                               <parameter name="time_" type="guint32"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTextTagTableForeach">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="tag" type="GtkTextTag*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTranslateFunc">
-                       <return-type type="gchar*"/>
-                       <parameters>
-                               <parameter name="path" type="gchar*"/>
-                               <parameter name="func_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeCellDataFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="tree_column" type="GtkTreeViewColumn*"/>
-                               <parameter name="cell" type="GtkCellRenderer*"/>
-                               <parameter name="tree_model" type="GtkTreeModel*"/>
-                               <parameter name="iter" type="GtkTreeIter*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeDestroyCountFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="tree_view" type="GtkTreeView*"/>
-                               <parameter name="path" type="GtkTreePath*"/>
-                               <parameter name="children" type="gint"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeIterCompareFunc">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="model" type="GtkTreeModel*"/>
-                               <parameter name="a" type="GtkTreeIter*"/>
-                               <parameter name="b" type="GtkTreeIter*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeModelFilterModifyFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="model" type="GtkTreeModel*"/>
-                               <parameter name="iter" type="GtkTreeIter*"/>
-                               <parameter name="value" type="GValue*"/>
-                               <parameter name="column" type="gint"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeModelFilterVisibleFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="model" type="GtkTreeModel*"/>
-                               <parameter name="iter" type="GtkTreeIter*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeModelForeachFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="model" type="GtkTreeModel*"/>
-                               <parameter name="path" type="GtkTreePath*"/>
-                               <parameter name="iter" type="GtkTreeIter*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeSelectionForeachFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="model" type="GtkTreeModel*"/>
-                               <parameter name="path" type="GtkTreePath*"/>
-                               <parameter name="iter" type="GtkTreeIter*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeSelectionFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="selection" type="GtkTreeSelection*"/>
-                               <parameter name="model" type="GtkTreeModel*"/>
-                               <parameter name="path" type="GtkTreePath*"/>
-                               <parameter name="path_currently_selected" type="gboolean"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeViewColumnDropFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="tree_view" type="GtkTreeView*"/>
-                               <parameter name="column" type="GtkTreeViewColumn*"/>
-                               <parameter name="prev_column" type="GtkTreeViewColumn*"/>
-                               <parameter name="next_column" type="GtkTreeViewColumn*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeViewMappingFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="tree_view" type="GtkTreeView*"/>
-                               <parameter name="path" type="GtkTreePath*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeViewRowSeparatorFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="model" type="GtkTreeModel*"/>
-                               <parameter name="iter" type="GtkTreeIter*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeViewSearchEqualFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="model" type="GtkTreeModel*"/>
-                               <parameter name="column" type="gint"/>
-                               <parameter name="key" type="gchar*"/>
-                               <parameter name="iter" type="GtkTreeIter*"/>
-                               <parameter name="search_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GtkTreeViewSearchPositionFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="tree_view" type="GtkTreeView*"/>
-                               <parameter name="search_dialog" type="GtkWidget*"/>
-                               <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*"/>
-                       <field name="accel_path_quark" type="GQuark"/>
-               </struct>
-               <struct name="GtkAccelKey">
-                       <field name="accel_key" type="guint"/>
-                       <field name="accel_mods" type="GdkModifierType"/>
-                       <field name="accel_flags" type="guint"/>
-               </struct>
-               <struct name="GtkAccelMapClass">
-               </struct>
-               <struct name="GtkActionEntry">
-                       <field name="name" type="gchar*"/>
-                       <field name="stock_id" type="gchar*"/>
-                       <field name="label" type="gchar*"/>
-                       <field name="accelerator" type="gchar*"/>
-                       <field name="tooltip" type="gchar*"/>
-                       <field name="callback" type="GCallback"/>
-               </struct>
-               <struct name="GtkAllocation">
-               </struct>
-               <struct name="GtkArg">
-                       <field name="type" type="GtkType"/>
-                       <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"/>
-               </struct>
-               <struct name="GtkBindingEntry">
-                       <method name="add_signal" symbol="gtk_binding_entry_add_signal">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="binding_set" type="GtkBindingSet*"/>
-                                       <parameter name="keyval" type="guint"/>
-                                       <parameter name="modifiers" type="GdkModifierType"/>
-                                       <parameter name="signal_name" type="gchar*"/>
-                                       <parameter name="n_args" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="add_signall" symbol="gtk_binding_entry_add_signall">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="binding_set" type="GtkBindingSet*"/>
-                                       <parameter name="keyval" type="guint"/>
-                                       <parameter name="modifiers" type="GdkModifierType"/>
-                                       <parameter name="signal_name" type="gchar*"/>
-                                       <parameter name="binding_args" type="GSList*"/>
-                               </parameters>
-                       </method>
-                       <method name="clear" symbol="gtk_binding_entry_clear">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="binding_set" type="GtkBindingSet*"/>
-                                       <parameter name="keyval" type="guint"/>
-                                       <parameter name="modifiers" type="GdkModifierType"/>
-                               </parameters>
-                       </method>
-                       <method name="remove" symbol="gtk_binding_entry_remove">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="binding_set" type="GtkBindingSet*"/>
-                                       <parameter name="keyval" type="guint"/>
-                                       <parameter name="modifiers" type="GdkModifierType"/>
-                               </parameters>
-                       </method>
-                       <method name="skip" symbol="gtk_binding_entry_skip">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="binding_set" type="GtkBindingSet*"/>
-                                       <parameter name="keyval" type="guint"/>
-                                       <parameter name="modifiers" type="GdkModifierType"/>
-                               </parameters>
-                       </method>
-                       <field name="keyval" type="guint"/>
-                       <field name="modifiers" type="GdkModifierType"/>
-                       <field name="binding_set" type="GtkBindingSet*"/>
-                       <field name="destroyed" type="guint"/>
-                       <field name="in_emission" type="guint"/>
-                       <field name="marks_unbound" type="guint"/>
-                       <field name="set_next" type="GtkBindingEntry*"/>
-                       <field name="hash_next" type="GtkBindingEntry*"/>
-                       <field name="signals" type="GtkBindingSignal*"/>
-               </struct>
-               <struct name="GtkBindingSet">
-                       <method name="activate" symbol="gtk_binding_set_activate">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="binding_set" type="GtkBindingSet*"/>
-                                       <parameter name="keyval" type="guint"/>
-                                       <parameter name="modifiers" type="GdkModifierType"/>
-                                       <parameter name="object" type="GtkObject*"/>
-                               </parameters>
-                       </method>
-                       <method name="add_path" symbol="gtk_binding_set_add_path">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="binding_set" type="GtkBindingSet*"/>
-                                       <parameter name="path_type" type="GtkPathType"/>
-                                       <parameter name="path_pattern" type="gchar*"/>
-                                       <parameter name="priority" type="GtkPathPriorityType"/>
-                               </parameters>
-                       </method>
-                       <method name="by_class" symbol="gtk_binding_set_by_class">
-                               <return-type type="GtkBindingSet*"/>
-                               <parameters>
-                                       <parameter name="object_class" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="find" symbol="gtk_binding_set_find">
-                               <return-type type="GtkBindingSet*"/>
-                               <parameters>
-                                       <parameter name="set_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="new" symbol="gtk_binding_set_new">
-                               <return-type type="GtkBindingSet*"/>
-                               <parameters>
-                                       <parameter name="set_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <field name="set_name" type="gchar*"/>
-                       <field name="priority" type="gint"/>
-                       <field name="widget_path_pspecs" type="GSList*"/>
-                       <field name="widget_class_pspecs" type="GSList*"/>
-                       <field name="class_branch_pspecs" type="GSList*"/>
-                       <field name="entries" type="GtkBindingEntry*"/>
-                       <field name="current" type="GtkBindingEntry*"/>
-                       <field name="parsed" type="guint"/>
-               </struct>
-               <struct name="GtkBindingSignal">
-                       <field name="next" type="GtkBindingSignal*"/>
-                       <field name="signal_name" type="gchar*"/>
-                       <field name="n_args" type="guint"/>
-                       <field name="args" type="GtkBindingArg*"/>
-               </struct>
-               <struct name="GtkBoxChild">
-                       <field name="widget" type="GtkWidget*"/>
-                       <field name="padding" type="guint16"/>
-                       <field name="expand" type="guint"/>
-                       <field name="fill" type="guint"/>
-                       <field name="pack" type="guint"/>
-                       <field name="is_secondary" type="guint"/>
-               </struct>
-               <struct name="GtkCListCellInfo">
-                       <field name="row" type="gint"/>
-                       <field name="column" type="gint"/>
-               </struct>
-               <struct name="GtkCListColumn">
-                       <method name="title_active" symbol="gtk_clist_column_title_active">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="title_passive" symbol="gtk_clist_column_title_passive">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="titles_active" symbol="gtk_clist_column_titles_active">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                               </parameters>
-                       </method>
-                       <method name="titles_hide" symbol="gtk_clist_column_titles_hide">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                               </parameters>
-                       </method>
-                       <method name="titles_passive" symbol="gtk_clist_column_titles_passive">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                               </parameters>
-                       </method>
-                       <method name="titles_show" symbol="gtk_clist_column_titles_show">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                               </parameters>
-                       </method>
-                       <field name="title" type="gchar*"/>
-                       <field name="area" type="GdkRectangle"/>
-                       <field name="button" type="GtkWidget*"/>
-                       <field name="window" type="GdkWindow*"/>
-                       <field name="width" type="gint"/>
-                       <field name="min_width" type="gint"/>
-                       <field name="max_width" type="gint"/>
-                       <field name="justification" type="GtkJustification"/>
-                       <field name="visible" type="guint"/>
-                       <field name="width_set" type="guint"/>
-                       <field name="resizeable" type="guint"/>
-                       <field name="auto_resize" type="guint"/>
-                       <field name="button_passive" type="guint"/>
-               </struct>
-               <struct name="GtkCListDestInfo">
-                       <field name="cell" type="GtkCListCellInfo"/>
-                       <field name="insert_pos" type="GtkCListDragPos"/>
-               </struct>
-               <struct name="GtkCListRow">
-                       <method name="is_visible" symbol="gtk_clist_row_is_visible">
-                               <return-type type="GtkVisibility"/>
-                               <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="move" symbol="gtk_clist_row_move">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="source_row" type="gint"/>
-                                       <parameter name="dest_row" type="gint"/>
-                               </parameters>
-                       </method>
-                       <field name="cell" type="GtkCell*"/>
-                       <field name="state" type="GtkStateType"/>
-                       <field name="foreground" type="GdkColor"/>
-                       <field name="background" type="GdkColor"/>
-                       <field name="style" type="GtkStyle*"/>
-                       <field name="data" type="gpointer"/>
-                       <field name="destroy" type="GtkDestroyNotify"/>
-                       <field name="fg_set" type="guint"/>
-                       <field name="bg_set" type="guint"/>
-                       <field name="selectable" type="guint"/>
-               </struct>
-               <struct name="GtkCTreeNode">
-                       <method name="get_cell_style" symbol="gtk_ctree_node_get_cell_style">
-                               <return-type type="GtkStyle*"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="column" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="get_cell_type" symbol="gtk_ctree_node_get_cell_type">
-                               <return-type type="GtkCellType"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="column" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="get_pixmap" symbol="gtk_ctree_node_get_pixmap">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="pixmap" type="GdkPixmap**"/>
-                                       <parameter name="mask" type="GdkBitmap**"/>
-                               </parameters>
-                       </method>
-                       <method name="get_pixtext" symbol="gtk_ctree_node_get_pixtext">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="text" type="gchar**"/>
-                                       <parameter name="spacing" type="guint8*"/>
-                                       <parameter name="pixmap" type="GdkPixmap**"/>
-                                       <parameter name="mask" type="GdkBitmap**"/>
-                               </parameters>
-                       </method>
-                       <method name="get_row_data" symbol="gtk_ctree_node_get_row_data">
-                               <return-type type="gpointer"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_row_style" symbol="gtk_ctree_node_get_row_style">
-                               <return-type type="GtkStyle*"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_selectable" symbol="gtk_ctree_node_get_selectable">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_text" symbol="gtk_ctree_node_get_text">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="text" type="gchar**"/>
-                               </parameters>
-                       </method>
-                       <method name="is_visible" symbol="gtk_ctree_node_is_visible">
-                               <return-type type="GtkVisibility"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                               </parameters>
-                       </method>
-                       <method name="moveto" symbol="gtk_ctree_node_moveto">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="row_align" type="gfloat"/>
-                                       <parameter name="col_align" type="gfloat"/>
-                               </parameters>
-                       </method>
-                       <method name="nth" symbol="gtk_ctree_node_nth">
-                               <return-type type="GtkCTreeNode*"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="row" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_background" symbol="gtk_ctree_node_set_background">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_cell_style" symbol="gtk_ctree_node_set_cell_style">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="style" type="GtkStyle*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_foreground" symbol="gtk_ctree_node_set_foreground">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_pixmap" symbol="gtk_ctree_node_set_pixmap">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="pixmap" type="GdkPixmap*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_pixtext" symbol="gtk_ctree_node_set_pixtext">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="text" type="gchar*"/>
-                                       <parameter name="spacing" type="guint8"/>
-                                       <parameter name="pixmap" type="GdkPixmap*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_row_data" symbol="gtk_ctree_node_set_row_data">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="set_row_data_full" symbol="gtk_ctree_node_set_row_data_full">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GtkDestroyNotify"/>
-                               </parameters>
-                       </method>
-                       <method name="set_row_style" symbol="gtk_ctree_node_set_row_style">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="style" type="GtkStyle*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_selectable" symbol="gtk_ctree_node_set_selectable">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="selectable" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_shift" symbol="gtk_ctree_node_set_shift">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="vertical" type="gint"/>
-                                       <parameter name="horizontal" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_text" symbol="gtk_ctree_node_set_text">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="text" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <field name="list" type="GList"/>
-               </struct>
-               <struct name="GtkCTreeRow">
-                       <field name="row" type="GtkCListRow"/>
-                       <field name="parent" type="GtkCTreeNode*"/>
-                       <field name="sibling" type="GtkCTreeNode*"/>
-                       <field name="children" type="GtkCTreeNode*"/>
-                       <field name="pixmap_closed" type="GdkPixmap*"/>
-                       <field name="mask_closed" type="GdkBitmap*"/>
-                       <field name="pixmap_opened" type="GdkPixmap*"/>
-                       <field name="mask_opened" type="GdkBitmap*"/>
-                       <field name="level" type="guint16"/>
-                       <field name="is_leaf" type="guint"/>
-                       <field name="expanded" type="guint"/>
-               </struct>
-               <struct name="GtkCell">
-                       <field name="type" type="GtkCellType"/>
-                       <field name="vertical" type="gint16"/>
-                       <field name="horizontal" type="gint16"/>
-                       <field name="style" type="GtkStyle*"/>
-                       <field name="u" type="gpointer"/>
-               </struct>
-               <struct name="GtkCellPixText">
-                       <field name="type" type="GtkCellType"/>
-                       <field name="vertical" type="gint16"/>
-                       <field name="horizontal" type="gint16"/>
-                       <field name="style" type="GtkStyle*"/>
-                       <field name="text" type="gchar*"/>
-                       <field name="spacing" type="guint8"/>
-                       <field name="pixmap" type="GdkPixmap*"/>
-                       <field name="mask" type="GdkBitmap*"/>
-               </struct>
-               <struct name="GtkCellPixmap">
-                       <field name="type" type="GtkCellType"/>
-                       <field name="vertical" type="gint16"/>
-                       <field name="horizontal" type="gint16"/>
-                       <field name="style" type="GtkStyle*"/>
-                       <field name="pixmap" type="GdkPixmap*"/>
-                       <field name="mask" type="GdkBitmap*"/>
-               </struct>
-               <struct name="GtkCellText">
-                       <field name="type" type="GtkCellType"/>
-                       <field name="vertical" type="gint16"/>
-                       <field name="horizontal" type="gint16"/>
-                       <field name="style" type="GtkStyle*"/>
-                       <field name="text" type="gchar*"/>
-               </struct>
-               <struct name="GtkCellWidget">
-                       <field name="type" type="GtkCellType"/>
-                       <field name="vertical" type="gint16"/>
-                       <field name="horizontal" type="gint16"/>
-                       <field name="style" type="GtkStyle*"/>
-                       <field name="widget" type="GtkWidget*"/>
-               </struct>
-               <struct name="GtkClassInitFunc">
-               </struct>
-               <struct name="GtkEnumValue">
-               </struct>
-               <struct name="GtkFileFilterInfo">
-                       <field name="contains" type="GtkFileFilterFlags"/>
-                       <field name="filename" type="gchar*"/>
-                       <field name="uri" type="gchar*"/>
-                       <field name="display_name" type="gchar*"/>
-                       <field name="mime_type" type="gchar*"/>
-               </struct>
-               <struct name="GtkFixedChild">
-                       <field name="widget" type="GtkWidget*"/>
-                       <field name="x" type="gint"/>
-                       <field name="y" type="gint"/>
-               </struct>
-               <struct name="GtkFlagValue">
-               </struct>
-               <struct name="GtkFundamentalType">
-               </struct>
-               <struct name="GtkIMContextInfo">
-                       <field name="context_id" type="gchar*"/>
-                       <field name="context_name" type="gchar*"/>
-                       <field name="domain" type="gchar*"/>
-                       <field name="domain_dirname" type="gchar*"/>
-                       <field name="default_locales" type="gchar*"/>
-               </struct>
-               <struct name="GtkImageAnimationData">
-                       <field name="anim" type="GdkPixbufAnimation*"/>
-                       <field name="iter" type="GdkPixbufAnimationIter*"/>
-                       <field name="frame_timeout" type="guint"/>
-               </struct>
-               <struct name="GtkImageIconNameData">
-                       <field name="icon_name" type="gchar*"/>
-                       <field name="pixbuf" type="GdkPixbuf*"/>
-                       <field name="theme_change_id" type="guint"/>
-               </struct>
-               <struct name="GtkImageIconSetData">
-                       <field name="icon_set" type="GtkIconSet*"/>
-               </struct>
-               <struct name="GtkImageImageData">
-                       <field name="image" type="GdkImage*"/>
-               </struct>
-               <struct name="GtkImagePixbufData">
-                       <field name="pixbuf" type="GdkPixbuf*"/>
-               </struct>
-               <struct name="GtkImagePixmapData">
-                       <field name="pixmap" type="GdkPixmap*"/>
-               </struct>
-               <struct name="GtkImageStockData">
-                       <field name="stock_id" type="gchar*"/>
-               </struct>
-               <struct name="GtkItemFactoryEntry">
-                       <field name="path" type="gchar*"/>
-                       <field name="accelerator" type="gchar*"/>
-                       <field name="callback" type="GtkItemFactoryCallback"/>
-                       <field name="callback_action" type="guint"/>
-                       <field name="item_type" type="gchar*"/>
-                       <field name="extra_data" type="gconstpointer"/>
-               </struct>
-               <struct name="GtkItemFactoryItem">
-                       <field name="path" type="gchar*"/>
-                       <field name="widgets" type="GSList*"/>
-               </struct>
-               <struct name="GtkLabelSelectionInfo">
-               </struct>
-               <struct name="GtkMenuEntry">
-                       <field name="path" type="gchar*"/>
-                       <field name="accelerator" type="gchar*"/>
-                       <field name="callback" type="GtkMenuCallback"/>
-                       <field name="callback_data" type="gpointer"/>
-                       <field name="widget" type="GtkWidget*"/>
-               </struct>
-               <struct name="GtkNotebookPage">
-                       <method name="num" symbol="gtk_notebook_page_num">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-               </struct>
-               <struct name="GtkObjectInitFunc">
-               </struct>
-               <struct name="GtkPageRange">
-                       <field name="start" type="gint"/>
-                       <field name="end" type="gint"/>
-               </struct>
-               <struct name="GtkPreviewInfo">
-                       <field name="lookup" type="guchar*"/>
-                       <field name="gamma" type="gdouble"/>
-               </struct>
-               <struct name="GtkRadioActionEntry">
-                       <field name="name" type="gchar*"/>
-                       <field name="stock_id" type="gchar*"/>
-                       <field name="label" type="gchar*"/>
-                       <field name="accelerator" type="gchar*"/>
-                       <field name="tooltip" type="gchar*"/>
-                       <field name="value" type="gint"/>
-               </struct>
-               <struct name="GtkRangeLayout">
-               </struct>
-               <struct name="GtkRangeStepTimer">
-               </struct>
-               <struct name="GtkRcContext">
-               </struct>
-               <struct name="GtkRcProperty">
-                       <method name="parse_border" symbol="gtk_rc_property_parse_border">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="pspec" type="GParamSpec*"/>
-                                       <parameter name="gstring" type="GString*"/>
-                                       <parameter name="property_value" type="GValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="parse_color" symbol="gtk_rc_property_parse_color">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="pspec" type="GParamSpec*"/>
-                                       <parameter name="gstring" type="GString*"/>
-                                       <parameter name="property_value" type="GValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="parse_enum" symbol="gtk_rc_property_parse_enum">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="pspec" type="GParamSpec*"/>
-                                       <parameter name="gstring" type="GString*"/>
-                                       <parameter name="property_value" type="GValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="parse_flags" symbol="gtk_rc_property_parse_flags">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="pspec" type="GParamSpec*"/>
-                                       <parameter name="gstring" type="GString*"/>
-                                       <parameter name="property_value" type="GValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="parse_requisition" symbol="gtk_rc_property_parse_requisition">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="pspec" type="GParamSpec*"/>
-                                       <parameter name="gstring" type="GString*"/>
-                                       <parameter name="property_value" type="GValue*"/>
-                               </parameters>
-                       </method>
-                       <field name="type_name" type="GQuark"/>
-                       <field name="property_name" type="GQuark"/>
-                       <field name="origin" type="gchar*"/>
-                       <field name="value" type="GValue"/>
-               </struct>
-               <struct name="GtkRecentData">
-                       <field name="display_name" type="gchar*"/>
-                       <field name="description" type="gchar*"/>
-                       <field name="mime_type" type="gchar*"/>
-                       <field name="app_name" type="gchar*"/>
-                       <field name="app_exec" type="gchar*"/>
-                       <field name="groups" type="gchar**"/>
-                       <field name="is_private" type="gboolean"/>
-               </struct>
-               <struct name="GtkRecentFilterInfo">
-                       <field name="contains" type="GtkRecentFilterFlags"/>
-                       <field name="uri" type="gchar*"/>
-                       <field name="display_name" type="gchar*"/>
-                       <field name="mime_type" type="gchar*"/>
-                       <field name="applications" type="gchar**"/>
-                       <field name="groups" type="gchar**"/>
-                       <field name="age" 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"/>
-               </struct>
-               <struct name="GtkSignalMarshaller">
-               </struct>
-               <struct name="GtkStockItem">
-                       <method name="copy" symbol="gtk_stock_item_copy">
-                               <return-type type="GtkStockItem*"/>
-                               <parameters>
-                                       <parameter name="item" type="GtkStockItem*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gtk_stock_item_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="item" type="GtkStockItem*"/>
-                               </parameters>
-                       </method>
-                       <field name="stock_id" type="gchar*"/>
-                       <field name="label" type="gchar*"/>
-                       <field name="modifier" type="GdkModifierType"/>
-                       <field name="keyval" type="guint"/>
-                       <field name="translation_domain" type="gchar*"/>
-               </struct>
-               <struct name="GtkTableChild">
-                       <field name="widget" type="GtkWidget*"/>
-                       <field name="left_attach" type="guint16"/>
-                       <field name="right_attach" type="guint16"/>
-                       <field name="top_attach" type="guint16"/>
-                       <field name="bottom_attach" type="guint16"/>
-                       <field name="xpadding" type="guint16"/>
-                       <field name="ypadding" type="guint16"/>
-                       <field name="xexpand" type="guint"/>
-                       <field name="yexpand" type="guint"/>
-                       <field name="xshrink" type="guint"/>
-                       <field name="yshrink" type="guint"/>
-                       <field name="xfill" type="guint"/>
-                       <field name="yfill" type="guint"/>
-               </struct>
-               <struct name="GtkTableRowCol">
-                       <field name="requisition" type="guint16"/>
-                       <field name="allocation" type="guint16"/>
-                       <field name="spacing" type="guint16"/>
-                       <field name="need_expand" type="guint"/>
-                       <field name="need_shrink" type="guint"/>
-                       <field name="expand" type="guint"/>
-                       <field name="shrink" type="guint"/>
-                       <field name="empty" type="guint"/>
-               </struct>
-               <struct name="GtkTargetEntry">
-                       <field name="target" type="gchar*"/>
-                       <field name="flags" type="guint"/>
-                       <field name="info" type="guint"/>
-               </struct>
-               <struct name="GtkTargetPair">
-                       <field name="target" type="GdkAtom"/>
-                       <field name="flags" type="guint"/>
-                       <field name="info" type="guint"/>
-               </struct>
-               <struct name="GtkTextAppearance">
-                       <field name="bg_color" type="GdkColor"/>
-                       <field name="fg_color" type="GdkColor"/>
-                       <field name="bg_stipple" type="GdkBitmap*"/>
-                       <field name="fg_stipple" type="GdkBitmap*"/>
-                       <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"/>
-               </struct>
-               <struct name="GtkTextBTree">
-               </struct>
-               <struct name="GtkTextLogAttrCache">
-               </struct>
-               <struct name="GtkTextPendingScroll">
-               </struct>
-               <struct name="GtkTextWindow">
-               </struct>
-               <struct name="GtkThemeEngine">
-               </struct>
-               <struct name="GtkToggleActionEntry">
-                       <field name="name" type="gchar*"/>
-                       <field name="stock_id" type="gchar*"/>
-                       <field name="label" type="gchar*"/>
-                       <field name="accelerator" type="gchar*"/>
-                       <field name="tooltip" type="gchar*"/>
-                       <field name="callback" type="GCallback"/>
-                       <field name="is_active" type="gboolean"/>
-               </struct>
-               <struct name="GtkToolbarChild">
-                       <field name="type" type="GtkToolbarChildType"/>
-                       <field name="widget" type="GtkWidget*"/>
-                       <field name="icon" type="GtkWidget*"/>
-                       <field name="label" type="GtkWidget*"/>
-               </struct>
-               <struct name="GtkTooltipsData">
-                       <method name="get" symbol="gtk_tooltips_data_get">
-                               <return-type type="GtkTooltipsData*"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <field name="tooltips" type="GtkTooltips*"/>
-                       <field name="widget" type="GtkWidget*"/>
-                       <field name="tip_text" type="gchar*"/>
-                       <field name="tip_private" type="gchar*"/>
-               </struct>
-               <struct name="GtkType">
-                       <method name="class" symbol="gtk_type_class">
-                               <return-type type="gpointer"/>
-                               <parameters>
-                                       <parameter name="type" type="GtkType"/>
-                               </parameters>
-                       </method>
-                       <method name="enum_find_value" symbol="gtk_type_enum_find_value">
-                               <return-type type="GtkEnumValue*"/>
-                               <parameters>
-                                       <parameter name="enum_type" type="GtkType"/>
-                                       <parameter name="value_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="enum_get_values" symbol="gtk_type_enum_get_values">
-                               <return-type type="GtkEnumValue*"/>
-                               <parameters>
-                                       <parameter name="enum_type" type="GtkType"/>
-                               </parameters>
-                       </method>
-                       <method name="flags_find_value" symbol="gtk_type_flags_find_value">
-                               <return-type type="GtkFlagValue*"/>
-                               <parameters>
-                                       <parameter name="flags_type" type="GtkType"/>
-                                       <parameter name="value_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="flags_get_values" symbol="gtk_type_flags_get_values">
-                               <return-type type="GtkFlagValue*"/>
-                               <parameters>
-                                       <parameter name="flags_type" type="GtkType"/>
-                               </parameters>
-                       </method>
-                       <method name="init" symbol="gtk_type_init">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="debug_flags" type="GTypeDebugFlags"/>
-                               </parameters>
-                       </method>
-                       <method name="new" symbol="gtk_type_new">
-                               <return-type type="gpointer"/>
-                               <parameters>
-                                       <parameter name="type" type="GtkType"/>
-                               </parameters>
-                       </method>
-                       <method name="unique" symbol="gtk_type_unique">
-                               <return-type type="GtkType"/>
-                               <parameters>
-                                       <parameter name="parent_type" type="GtkType"/>
-                                       <parameter name="gtkinfo" type="GtkTypeInfo*"/>
-                               </parameters>
-                       </method>
-               </struct>
-               <struct name="GtkTypeClass">
-               </struct>
-               <struct name="GtkTypeInfo">
-                       <field name="type_name" type="gchar*"/>
-                       <field name="object_size" type="guint"/>
-                       <field name="class_size" type="guint"/>
-                       <field name="class_init_func" type="GtkClassInitFunc"/>
-                       <field name="object_init_func" type="GtkObjectInitFunc"/>
-                       <field name="reserved_1" type="gpointer"/>
-                       <field name="reserved_2" type="gpointer"/>
-                       <field name="base_class_init_func" type="GtkClassInitFunc"/>
-               </struct>
-               <struct name="GtkTypeObject">
-               </struct>
-               <struct name="GtkWidgetAuxInfo">
-                       <field name="x" type="gint"/>
-                       <field name="y" type="gint"/>
-                       <field name="width" type="gint"/>
-                       <field name="height" type="gint"/>
-                       <field name="x_set" type="guint"/>
-                       <field name="y_set" type="guint"/>
-               </struct>
-               <struct name="GtkWidgetShapeInfo">
-                       <field name="offset_x" type="gint16"/>
-                       <field name="offset_y" type="gint16"/>
-                       <field name="shape_mask" type="GdkBitmap*"/>
-               </struct>
-               <struct name="GtkWindowGeometryInfo">
-               </struct>
-               <boxed name="GtkBorder" type-name="GtkBorder" get-type="gtk_border_get_type">
-                       <method name="copy" symbol="gtk_border_copy">
-                               <return-type type="GtkBorder*"/>
-                               <parameters>
-                                       <parameter name="border_" type="GtkBorder*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gtk_border_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="border_" type="GtkBorder*"/>
-                               </parameters>
-                       </method>
-                       <field name="left" type="gint"/>
-                       <field name="right" type="gint"/>
-                       <field name="top" type="gint"/>
-                       <field name="bottom" type="gint"/>
-               </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*"/>
-                               <parameters>
-                                       <parameter name="icon_info" type="GtkIconInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gtk_icon_info_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="icon_info" type="GtkIconInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_attach_points" symbol="gtk_icon_info_get_attach_points">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="icon_info" type="GtkIconInfo*"/>
-                                       <parameter name="points" type="GdkPoint**"/>
-                                       <parameter name="n_points" type="gint*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_base_size" symbol="gtk_icon_info_get_base_size">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="icon_info" type="GtkIconInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_builtin_pixbuf" symbol="gtk_icon_info_get_builtin_pixbuf">
-                               <return-type type="GdkPixbuf*"/>
-                               <parameters>
-                                       <parameter name="icon_info" type="GtkIconInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_display_name" symbol="gtk_icon_info_get_display_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="icon_info" type="GtkIconInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_embedded_rect" symbol="gtk_icon_info_get_embedded_rect">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="icon_info" type="GtkIconInfo*"/>
-                                       <parameter name="rectangle" type="GdkRectangle*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_filename" symbol="gtk_icon_info_get_filename">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="icon_info" type="GtkIconInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="load_icon" symbol="gtk_icon_info_load_icon">
-                               <return-type type="GdkPixbuf*"/>
-                               <parameters>
-                                       <parameter name="icon_info" type="GtkIconInfo*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </method>
-                       <method name="set_raw_coordinates" symbol="gtk_icon_info_set_raw_coordinates">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="icon_info" type="GtkIconInfo*"/>
-                                       <parameter name="raw_coordinates" type="gboolean"/>
-                               </parameters>
-                       </method>
-               </boxed>
-               <boxed name="GtkIconSet" type-name="GtkIconSet" get-type="gtk_icon_set_get_type">
-                       <method name="add_source" symbol="gtk_icon_set_add_source">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <method name="copy" symbol="gtk_icon_set_copy">
-                               <return-type type="GtkIconSet*"/>
-                               <parameters>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_sizes" symbol="gtk_icon_set_get_sizes">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
-                                       <parameter name="sizes" type="GtkIconSize**"/>
-                                       <parameter name="n_sizes" type="gint*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_icon_set_new">
-                               <return-type type="GtkIconSet*"/>
-                       </constructor>
-                       <constructor name="new_from_pixbuf" symbol="gtk_icon_set_new_from_pixbuf">
-                               <return-type type="GtkIconSet*"/>
-                               <parameters>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="ref" symbol="gtk_icon_set_ref">
-                               <return-type type="GtkIconSet*"/>
-                               <parameters>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
-                               </parameters>
-                       </method>
-                       <method name="render_icon" symbol="gtk_icon_set_render_icon">
-                               <return-type type="GdkPixbuf*"/>
-                               <parameters>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="direction" type="GtkTextDirection"/>
-                                       <parameter name="state" type="GtkStateType"/>
-                                       <parameter name="size" type="GtkIconSize"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="detail" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gtk_icon_set_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
-                               </parameters>
-                       </method>
-               </boxed>
-               <boxed name="GtkIconSource" type-name="GtkIconSource" get-type="gtk_icon_source_get_type">
-                       <method name="copy" symbol="gtk_icon_source_copy">
-                               <return-type type="GtkIconSource*"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gtk_icon_source_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_direction" symbol="gtk_icon_source_get_direction">
-                               <return-type type="GtkTextDirection"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_direction_wildcarded" symbol="gtk_icon_source_get_direction_wildcarded">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_filename" symbol="gtk_icon_source_get_filename">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_icon_name" symbol="gtk_icon_source_get_icon_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_pixbuf" symbol="gtk_icon_source_get_pixbuf">
-                               <return-type type="GdkPixbuf*"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_size" symbol="gtk_icon_source_get_size">
-                               <return-type type="GtkIconSize"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_size_wildcarded" symbol="gtk_icon_source_get_size_wildcarded">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_state" symbol="gtk_icon_source_get_state">
-                               <return-type type="GtkStateType"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_state_wildcarded" symbol="gtk_icon_source_get_state_wildcarded">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_icon_source_new">
-                               <return-type type="GtkIconSource*"/>
-                       </constructor>
-                       <method name="set_direction" symbol="gtk_icon_source_set_direction">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                                       <parameter name="direction" type="GtkTextDirection"/>
-                               </parameters>
-                       </method>
-                       <method name="set_direction_wildcarded" symbol="gtk_icon_source_set_direction_wildcarded">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                                       <parameter name="setting" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_filename" symbol="gtk_icon_source_set_filename">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                                       <parameter name="filename" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_icon_name" symbol="gtk_icon_source_set_icon_name">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_pixbuf" symbol="gtk_icon_source_set_pixbuf">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_size" symbol="gtk_icon_source_set_size">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
-                               </parameters>
-                       </method>
-                       <method name="set_size_wildcarded" symbol="gtk_icon_source_set_size_wildcarded">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                                       <parameter name="setting" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_state" symbol="gtk_icon_source_set_state">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                                       <parameter name="state" type="GtkStateType"/>
-                               </parameters>
-                       </method>
-                       <method name="set_state_wildcarded" symbol="gtk_icon_source_set_state_wildcarded">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="source" type="GtkIconSource*"/>
-                                       <parameter name="setting" type="gboolean"/>
-                               </parameters>
-                       </method>
-               </boxed>
-               <boxed name="GtkPaperSize" type-name="GtkPaperSize" get-type="gtk_paper_size_get_type">
-                       <method name="copy" symbol="gtk_paper_size_copy">
-                               <return-type type="GtkPaperSize*"/>
-                               <parameters>
-                                       <parameter name="other" type="GtkPaperSize*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gtk_paper_size_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_default" symbol="gtk_paper_size_get_default">
-                               <return-type type="gchar*"/>
-                       </method>
-                       <method name="get_default_bottom_margin" symbol="gtk_paper_size_get_default_bottom_margin">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
-                               </parameters>
-                       </method>
-                       <method name="get_default_left_margin" symbol="gtk_paper_size_get_default_left_margin">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
-                               </parameters>
-                       </method>
-                       <method name="get_default_right_margin" symbol="gtk_paper_size_get_default_right_margin">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
-                               </parameters>
-                       </method>
-                       <method name="get_default_top_margin" symbol="gtk_paper_size_get_default_top_margin">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
-                               </parameters>
-                       </method>
-                       <method name="get_display_name" symbol="gtk_paper_size_get_display_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_height" symbol="gtk_paper_size_get_height">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
-                               </parameters>
-                       </method>
-                       <method name="get_name" symbol="gtk_paper_size_get_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_paper_sizes" symbol="gtk_paper_size_get_paper_sizes">
-                               <return-type type="GList*"/>
-                               <parameters>
-                                       <parameter name="include_custom" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="get_ppd_name" symbol="gtk_paper_size_get_ppd_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_width" symbol="gtk_paper_size_get_width">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                                       <parameter name="unit" type="GtkUnit"/>
-                               </parameters>
-                       </method>
-                       <method name="is_custom" symbol="gtk_paper_size_is_custom">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                               </parameters>
-                       </method>
-                       <method name="is_equal" symbol="gtk_paper_size_is_equal">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="size1" type="GtkPaperSize*"/>
-                                       <parameter name="size2" type="GtkPaperSize*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_paper_size_new">
-                               <return-type type="GtkPaperSize*"/>
-                               <parameters>
-                                       <parameter name="name" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_custom" symbol="gtk_paper_size_new_custom">
-                               <return-type type="GtkPaperSize*"/>
-                               <parameters>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="display_name" type="gchar*"/>
-                                       <parameter name="width" type="gdouble"/>
-                                       <parameter name="height" type="gdouble"/>
-                                       <parameter name="unit" type="GtkUnit"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_key_file" symbol="gtk_paper_size_new_from_key_file">
-                               <return-type type="GtkPaperSize*"/>
-                               <parameters>
-                                       <parameter name="key_file" type="GKeyFile*"/>
-                                       <parameter name="group_name" type="gchar*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_ppd" symbol="gtk_paper_size_new_from_ppd">
-                               <return-type type="GtkPaperSize*"/>
-                               <parameters>
-                                       <parameter name="ppd_name" type="gchar*"/>
-                                       <parameter name="ppd_display_name" type="gchar*"/>
-                                       <parameter name="width" type="gdouble"/>
-                                       <parameter name="height" type="gdouble"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_size" symbol="gtk_paper_size_set_size">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                                       <parameter name="width" type="gdouble"/>
-                                       <parameter name="height" type="gdouble"/>
-                                       <parameter name="unit" type="GtkUnit"/>
-                               </parameters>
-                       </method>
-                       <method name="to_key_file" symbol="gtk_paper_size_to_key_file">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="size" type="GtkPaperSize*"/>
-                                       <parameter name="key_file" type="GKeyFile*"/>
-                                       <parameter name="group_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-               </boxed>
-               <boxed name="GtkRecentInfo" type-name="GtkRecentInfo" get-type="gtk_recent_info_get_type">
-                       <method name="exists" symbol="gtk_recent_info_exists">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_added" symbol="gtk_recent_info_get_added">
-                               <return-type type="time_t"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_age" symbol="gtk_recent_info_get_age">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_application_info" symbol="gtk_recent_info_get_application_info">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                                       <parameter name="app_name" type="gchar*"/>
-                                       <parameter name="app_exec" type="gchar**"/>
-                                       <parameter name="count" type="guint*"/>
-                                       <parameter name="time_" type="time_t*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_applications" symbol="gtk_recent_info_get_applications">
-                               <return-type type="gchar**"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                                       <parameter name="length" type="gsize*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_description" symbol="gtk_recent_info_get_description">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_display_name" symbol="gtk_recent_info_get_display_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_groups" symbol="gtk_recent_info_get_groups">
-                               <return-type type="gchar**"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                                       <parameter name="length" type="gsize*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_icon" symbol="gtk_recent_info_get_icon">
-                               <return-type type="GdkPixbuf*"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                                       <parameter name="size" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="get_mime_type" symbol="gtk_recent_info_get_mime_type">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_modified" symbol="gtk_recent_info_get_modified">
-                               <return-type type="time_t"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_private_hint" symbol="gtk_recent_info_get_private_hint">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_short_name" symbol="gtk_recent_info_get_short_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_uri" symbol="gtk_recent_info_get_uri">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_uri_display" symbol="gtk_recent_info_get_uri_display">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_visited" symbol="gtk_recent_info_get_visited">
-                               <return-type type="time_t"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="has_application" symbol="gtk_recent_info_has_application">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                                       <parameter name="app_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="has_group" symbol="gtk_recent_info_has_group">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                                       <parameter name="group_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="is_local" symbol="gtk_recent_info_is_local">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="last_application" symbol="gtk_recent_info_last_application">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="match" symbol="gtk_recent_info_match">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="info_a" type="GtkRecentInfo*"/>
-                                       <parameter name="info_b" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="ref" symbol="gtk_recent_info_ref">
-                               <return-type type="GtkRecentInfo*"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gtk_recent_info_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="info" type="GtkRecentInfo*"/>
-                               </parameters>
-                       </method>
-               </boxed>
-               <boxed name="GtkRequisition" type-name="GtkRequisition" get-type="gtk_requisition_get_type">
-                       <method name="copy" symbol="gtk_requisition_copy">
-                               <return-type type="GtkRequisition*"/>
-                               <parameters>
-                                       <parameter name="requisition" type="GtkRequisition*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gtk_requisition_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="requisition" type="GtkRequisition*"/>
-                               </parameters>
-                       </method>
-                       <field name="width" type="gint"/>
-                       <field name="height" type="gint"/>
-               </boxed>
-               <boxed name="GtkSelectionData" type-name="GtkSelectionData" get-type="gtk_selection_data_get_type">
-                       <method name="copy" symbol="gtk_selection_data_copy">
-                               <return-type type="GtkSelectionData*"/>
-                               <parameters>
-                                       <parameter name="data" type="GtkSelectionData*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gtk_selection_data_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="data" type="GtkSelectionData*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_pixbuf" symbol="gtk_selection_data_get_pixbuf">
-                               <return-type type="GdkPixbuf*"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_targets" symbol="gtk_selection_data_get_targets">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                                       <parameter name="targets" type="GdkAtom**"/>
-                                       <parameter name="n_atoms" type="gint*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_text" symbol="gtk_selection_data_get_text">
-                               <return-type type="guchar*"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_uris" symbol="gtk_selection_data_get_uris">
-                               <return-type type="gchar**"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                               </parameters>
-                       </method>
-                       <method name="set" symbol="gtk_selection_data_set">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                                       <parameter name="type" type="GdkAtom"/>
-                                       <parameter name="format" type="gint"/>
-                                       <parameter name="data" type="guchar*"/>
-                                       <parameter name="length" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_pixbuf" symbol="gtk_selection_data_set_pixbuf">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_text" symbol="gtk_selection_data_set_text">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                                       <parameter name="str" type="gchar*"/>
-                                       <parameter name="len" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_uris" symbol="gtk_selection_data_set_uris">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                                       <parameter name="uris" type="gchar**"/>
-                               </parameters>
-                       </method>
-                       <method name="targets_include_image" symbol="gtk_selection_data_targets_include_image">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                                       <parameter name="writable" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="targets_include_rich_text" symbol="gtk_selection_data_targets_include_rich_text">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                                       <parameter name="buffer" type="GtkTextBuffer*"/>
-                               </parameters>
-                       </method>
-                       <method name="targets_include_text" symbol="gtk_selection_data_targets_include_text">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                               </parameters>
-                       </method>
-                       <method name="targets_include_uri" symbol="gtk_selection_data_targets_include_uri">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="selection_data" type="GtkSelectionData*"/>
-                               </parameters>
-                       </method>
-                       <field name="selection" type="GdkAtom"/>
-                       <field name="target" type="GdkAtom"/>
-                       <field name="type" type="GdkAtom"/>
-                       <field name="format" type="gint"/>
-                       <field name="data" type="guchar*"/>
-                       <field name="length" type="gint"/>
-                       <field name="display" type="GdkDisplay*"/>
-               </boxed>
-               <boxed name="GtkTargetList" type-name="GtkTargetList" get-type="gtk_target_list_get_type">
-                       <method name="add" symbol="gtk_target_list_add">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="list" type="GtkTargetList*"/>
-                                       <parameter name="target" type="GdkAtom"/>
-                                       <parameter name="flags" type="guint"/>
-                                       <parameter name="info" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="add_image_targets" symbol="gtk_target_list_add_image_targets">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="list" type="GtkTargetList*"/>
-                                       <parameter name="info" type="guint"/>
-                                       <parameter name="writable" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="add_rich_text_targets" symbol="gtk_target_list_add_rich_text_targets">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="list" type="GtkTargetList*"/>
-                                       <parameter name="info" type="guint"/>
-                                       <parameter name="deserializable" type="gboolean"/>
-                                       <parameter name="buffer" type="GtkTextBuffer*"/>
-                               </parameters>
-                       </method>
-                       <method name="add_table" symbol="gtk_target_list_add_table">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="list" type="GtkTargetList*"/>
-                                       <parameter name="targets" type="GtkTargetEntry*"/>
-                                       <parameter name="ntargets" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="add_text_targets" symbol="gtk_target_list_add_text_targets">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="list" type="GtkTargetList*"/>
-                                       <parameter name="info" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="add_uri_targets" symbol="gtk_target_list_add_uri_targets">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="list" type="GtkTargetList*"/>
-                                       <parameter name="info" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="find" symbol="gtk_target_list_find">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="list" type="GtkTargetList*"/>
-                                       <parameter name="target" type="GdkAtom"/>
-                                       <parameter name="info" type="guint*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_target_list_new">
-                               <return-type type="GtkTargetList*"/>
-                               <parameters>
-                                       <parameter name="targets" type="GtkTargetEntry*"/>
-                                       <parameter name="ntargets" type="guint"/>
-                               </parameters>
-                       </constructor>
-                       <method name="ref" symbol="gtk_target_list_ref">
-                               <return-type type="GtkTargetList*"/>
-                               <parameters>
-                                       <parameter name="list" type="GtkTargetList*"/>
-                               </parameters>
-                       </method>
-                       <method name="remove" symbol="gtk_target_list_remove">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="list" type="GtkTargetList*"/>
-                                       <parameter name="target" type="GdkAtom"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gtk_target_list_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="list" type="GtkTargetList*"/>
-                               </parameters>
-                       </method>
-                       <field name="list" type="GList*"/>
-                       <field name="ref_count" type="guint"/>
-               </boxed>
-               <boxed name="GtkTextAttributes" type-name="GtkTextAttributes" get-type="gtk_text_attributes_get_type">
-                       <method name="copy" symbol="gtk_text_attributes_copy">
-                               <return-type type="GtkTextAttributes*"/>
-                               <parameters>
-                                       <parameter name="src" type="GtkTextAttributes*"/>
-                               </parameters>
-                       </method>
-                       <method name="copy_values" symbol="gtk_text_attributes_copy_values">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="src" type="GtkTextAttributes*"/>
-                                       <parameter name="dest" type="GtkTextAttributes*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_text_attributes_new">
-                               <return-type type="GtkTextAttributes*"/>
-                       </constructor>
-                       <method name="ref" symbol="gtk_text_attributes_ref">
-                               <return-type type="GtkTextAttributes*"/>
-                               <parameters>
-                                       <parameter name="values" type="GtkTextAttributes*"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gtk_text_attributes_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="values" type="GtkTextAttributes*"/>
-                               </parameters>
-                       </method>
-                       <field name="refcount" type="guint"/>
-                       <field name="appearance" type="GtkTextAppearance"/>
-                       <field name="justification" type="GtkJustification"/>
-                       <field name="direction" type="GtkTextDirection"/>
-                       <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="pixels_above_lines" type="gint"/>
-                       <field name="pixels_below_lines" type="gint"/>
-                       <field name="pixels_inside_wrap" type="gint"/>
-                       <field name="tabs" type="PangoTabArray*"/>
-                       <field name="wrap_mode" type="GtkWrapMode"/>
-                       <field name="language" type="PangoLanguage*"/>
-                       <field name="pg_bg_color" type="GdkColor*"/>
-                       <field name="invisible" type="guint"/>
-                       <field name="bg_full_height" type="guint"/>
-                       <field name="editable" type="guint"/>
-                       <field name="realized" type="guint"/>
-                       <field name="pad1" type="guint"/>
-                       <field name="pad2" type="guint"/>
-                       <field name="pad3" type="guint"/>
-                       <field name="pad4" 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">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_chars" symbol="gtk_text_iter_backward_chars">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_cursor_position" symbol="gtk_text_iter_backward_cursor_position">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_cursor_positions" symbol="gtk_text_iter_backward_cursor_positions">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_find_char" symbol="gtk_text_iter_backward_find_char">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="pred" type="GtkTextCharPredicate"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                                       <parameter name="limit" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_line" symbol="gtk_text_iter_backward_line">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_lines" symbol="gtk_text_iter_backward_lines">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_search" symbol="gtk_text_iter_backward_search">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="str" type="gchar*"/>
-                                       <parameter name="flags" type="GtkTextSearchFlags"/>
-                                       <parameter name="match_start" type="GtkTextIter*"/>
-                                       <parameter name="match_end" type="GtkTextIter*"/>
-                                       <parameter name="limit" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_sentence_start" symbol="gtk_text_iter_backward_sentence_start">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_sentence_starts" symbol="gtk_text_iter_backward_sentence_starts">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_to_tag_toggle" symbol="gtk_text_iter_backward_to_tag_toggle">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="tag" type="GtkTextTag*"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_visible_cursor_position" symbol="gtk_text_iter_backward_visible_cursor_position">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_visible_cursor_positions" symbol="gtk_text_iter_backward_visible_cursor_positions">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_visible_line" symbol="gtk_text_iter_backward_visible_line">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_visible_lines" symbol="gtk_text_iter_backward_visible_lines">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_visible_word_start" symbol="gtk_text_iter_backward_visible_word_start">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_visible_word_starts" symbol="gtk_text_iter_backward_visible_word_starts">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_word_start" symbol="gtk_text_iter_backward_word_start">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="backward_word_starts" symbol="gtk_text_iter_backward_word_starts">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="begins_tag" symbol="gtk_text_iter_begins_tag">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="tag" type="GtkTextTag*"/>
-                               </parameters>
-                       </method>
-                       <method name="can_insert" symbol="gtk_text_iter_can_insert">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="default_editability" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="compare" symbol="gtk_text_iter_compare">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="lhs" type="GtkTextIter*"/>
-                                       <parameter name="rhs" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="copy" symbol="gtk_text_iter_copy">
-                               <return-type type="GtkTextIter*"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="editable" symbol="gtk_text_iter_editable">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="default_setting" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="ends_line" symbol="gtk_text_iter_ends_line">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="ends_sentence" symbol="gtk_text_iter_ends_sentence">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="ends_tag" symbol="gtk_text_iter_ends_tag">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="tag" type="GtkTextTag*"/>
-                               </parameters>
-                       </method>
-                       <method name="ends_word" symbol="gtk_text_iter_ends_word">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="equal" symbol="gtk_text_iter_equal">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="lhs" type="GtkTextIter*"/>
-                                       <parameter name="rhs" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_char" symbol="gtk_text_iter_forward_char">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_chars" symbol="gtk_text_iter_forward_chars">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_cursor_position" symbol="gtk_text_iter_forward_cursor_position">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_cursor_positions" symbol="gtk_text_iter_forward_cursor_positions">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_find_char" symbol="gtk_text_iter_forward_find_char">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="pred" type="GtkTextCharPredicate"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                                       <parameter name="limit" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_line" symbol="gtk_text_iter_forward_line">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_lines" symbol="gtk_text_iter_forward_lines">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_search" symbol="gtk_text_iter_forward_search">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="str" type="gchar*"/>
-                                       <parameter name="flags" type="GtkTextSearchFlags"/>
-                                       <parameter name="match_start" type="GtkTextIter*"/>
-                                       <parameter name="match_end" type="GtkTextIter*"/>
-                                       <parameter name="limit" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_sentence_end" symbol="gtk_text_iter_forward_sentence_end">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_sentence_ends" symbol="gtk_text_iter_forward_sentence_ends">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_to_end" symbol="gtk_text_iter_forward_to_end">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_to_line_end" symbol="gtk_text_iter_forward_to_line_end">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_to_tag_toggle" symbol="gtk_text_iter_forward_to_tag_toggle">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="tag" type="GtkTextTag*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_visible_cursor_position" symbol="gtk_text_iter_forward_visible_cursor_position">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_visible_cursor_positions" symbol="gtk_text_iter_forward_visible_cursor_positions">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_visible_line" symbol="gtk_text_iter_forward_visible_line">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_visible_lines" symbol="gtk_text_iter_forward_visible_lines">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_visible_word_end" symbol="gtk_text_iter_forward_visible_word_end">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_visible_word_ends" symbol="gtk_text_iter_forward_visible_word_ends">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_word_end" symbol="gtk_text_iter_forward_word_end">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="forward_word_ends" symbol="gtk_text_iter_forward_word_ends">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gtk_text_iter_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_attributes" symbol="gtk_text_iter_get_attributes">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="values" type="GtkTextAttributes*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_buffer" symbol="gtk_text_iter_get_buffer">
-                               <return-type type="GtkTextBuffer*"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_bytes_in_line" symbol="gtk_text_iter_get_bytes_in_line">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_char" symbol="gtk_text_iter_get_char">
-                               <return-type type="gunichar"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_chars_in_line" symbol="gtk_text_iter_get_chars_in_line">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_child_anchor" symbol="gtk_text_iter_get_child_anchor">
-                               <return-type type="GtkTextChildAnchor*"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_language" symbol="gtk_text_iter_get_language">
-                               <return-type type="PangoLanguage*"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_line" symbol="gtk_text_iter_get_line">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_line_index" symbol="gtk_text_iter_get_line_index">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_line_offset" symbol="gtk_text_iter_get_line_offset">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_marks" symbol="gtk_text_iter_get_marks">
-                               <return-type type="GSList*"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_offset" symbol="gtk_text_iter_get_offset">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_pixbuf" symbol="gtk_text_iter_get_pixbuf">
-                               <return-type type="GdkPixbuf*"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_slice" symbol="gtk_text_iter_get_slice">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="start" type="GtkTextIter*"/>
-                                       <parameter name="end" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_tags" symbol="gtk_text_iter_get_tags">
-                               <return-type type="GSList*"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_text" symbol="gtk_text_iter_get_text">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="start" type="GtkTextIter*"/>
-                                       <parameter name="end" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_toggled_tags" symbol="gtk_text_iter_get_toggled_tags">
-                               <return-type type="GSList*"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="toggled_on" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="get_visible_line_index" symbol="gtk_text_iter_get_visible_line_index">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_visible_line_offset" symbol="gtk_text_iter_get_visible_line_offset">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_visible_slice" symbol="gtk_text_iter_get_visible_slice">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="start" type="GtkTextIter*"/>
-                                       <parameter name="end" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_visible_text" symbol="gtk_text_iter_get_visible_text">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="start" type="GtkTextIter*"/>
-                                       <parameter name="end" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="has_tag" symbol="gtk_text_iter_has_tag">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="tag" type="GtkTextTag*"/>
-                               </parameters>
-                       </method>
-                       <method name="in_range" symbol="gtk_text_iter_in_range">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="start" type="GtkTextIter*"/>
-                                       <parameter name="end" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="inside_sentence" symbol="gtk_text_iter_inside_sentence">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="inside_word" symbol="gtk_text_iter_inside_word">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="is_cursor_position" symbol="gtk_text_iter_is_cursor_position">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="is_end" symbol="gtk_text_iter_is_end">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="is_start" symbol="gtk_text_iter_is_start">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="order" symbol="gtk_text_iter_order">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="first" type="GtkTextIter*"/>
-                                       <parameter name="second" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_line" symbol="gtk_text_iter_set_line">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="line_number" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_line_index" symbol="gtk_text_iter_set_line_index">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="byte_on_line" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_line_offset" symbol="gtk_text_iter_set_line_offset">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="char_on_line" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_offset" symbol="gtk_text_iter_set_offset">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="char_offset" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_visible_line_index" symbol="gtk_text_iter_set_visible_line_index">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="byte_on_line" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_visible_line_offset" symbol="gtk_text_iter_set_visible_line_offset">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="char_on_line" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="starts_line" symbol="gtk_text_iter_starts_line">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="starts_sentence" symbol="gtk_text_iter_starts_sentence">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="starts_word" symbol="gtk_text_iter_starts_word">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="toggles_tag" symbol="gtk_text_iter_toggles_tag">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTextIter*"/>
-                                       <parameter name="tag" type="GtkTextTag*"/>
-                               </parameters>
-                       </method>
-                       <field name="dummy1" type="gpointer"/>
-                       <field name="dummy2" type="gpointer"/>
-                       <field name="dummy3" type="gint"/>
-                       <field name="dummy4" type="gint"/>
-                       <field name="dummy5" type="gint"/>
-                       <field name="dummy6" type="gint"/>
-                       <field name="dummy7" type="gint"/>
-                       <field name="dummy8" type="gint"/>
-                       <field name="dummy9" type="gpointer"/>
-                       <field name="dummy10" type="gpointer"/>
-                       <field name="dummy11" type="gint"/>
-                       <field name="dummy12" type="gint"/>
-                       <field name="dummy13" type="gint"/>
-                       <field name="dummy14" type="gpointer"/>
-               </boxed>
-               <boxed name="GtkTreeIter" type-name="GtkTreeIter" get-type="gtk_tree_iter_get_type">
-                       <method name="copy" symbol="gtk_tree_iter_copy">
-                               <return-type type="GtkTreeIter*"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gtk_tree_iter_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                               </parameters>
-                       </method>
-                       <field name="stamp" type="gint"/>
-                       <field name="user_data" type="gpointer"/>
-                       <field name="user_data2" type="gpointer"/>
-                       <field name="user_data3" type="gpointer"/>
-               </boxed>
-               <boxed name="GtkTreePath" type-name="GtkTreePath" get-type="gtk_tree_path_get_type">
-                       <method name="append_index" symbol="gtk_tree_path_append_index">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="index_" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="compare" symbol="gtk_tree_path_compare">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="a" type="GtkTreePath*"/>
-                                       <parameter name="b" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="copy" symbol="gtk_tree_path_copy">
-                               <return-type type="GtkTreePath*"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="down" symbol="gtk_tree_path_down">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gtk_tree_path_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_depth" symbol="gtk_tree_path_get_depth">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_indices" symbol="gtk_tree_path_get_indices">
-                               <return-type type="gint*"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="is_ancestor" symbol="gtk_tree_path_is_ancestor">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="descendant" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="is_descendant" symbol="gtk_tree_path_is_descendant">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="ancestor" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_tree_path_new">
-                               <return-type type="GtkTreePath*"/>
-                       </constructor>
-                       <constructor name="new_first" symbol="gtk_tree_path_new_first">
-                               <return-type type="GtkTreePath*"/>
-                       </constructor>
-                       <constructor name="new_from_indices" symbol="gtk_tree_path_new_from_indices">
-                               <return-type type="GtkTreePath*"/>
-                               <parameters>
-                                       <parameter name="first_index" type="gint"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_string" symbol="gtk_tree_path_new_from_string">
-                               <return-type type="GtkTreePath*"/>
-                               <parameters>
-                                       <parameter name="path" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="next" symbol="gtk_tree_path_next">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="prepend_index" symbol="gtk_tree_path_prepend_index">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="index_" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="prev" symbol="gtk_tree_path_prev">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="to_string" symbol="gtk_tree_path_to_string">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="up" symbol="gtk_tree_path_up">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-               </boxed>
-               <boxed name="GtkTreeRowReference" type-name="GtkTreeRowReference" get-type="gtk_tree_row_reference_get_type">
-                       <method name="copy" symbol="gtk_tree_row_reference_copy">
-                               <return-type type="GtkTreeRowReference*"/>
-                               <parameters>
-                                       <parameter name="reference" type="GtkTreeRowReference*"/>
-                               </parameters>
-                       </method>
-                       <method name="deleted" symbol="gtk_tree_row_reference_deleted">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="proxy" type="GObject*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gtk_tree_row_reference_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="reference" type="GtkTreeRowReference*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_model" symbol="gtk_tree_row_reference_get_model">
-                               <return-type type="GtkTreeModel*"/>
-                               <parameters>
-                                       <parameter name="reference" type="GtkTreeRowReference*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_path" symbol="gtk_tree_row_reference_get_path">
-                               <return-type type="GtkTreePath*"/>
-                               <parameters>
-                                       <parameter name="reference" type="GtkTreeRowReference*"/>
-                               </parameters>
-                       </method>
-                       <method name="inserted" symbol="gtk_tree_row_reference_inserted">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="proxy" type="GObject*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_tree_row_reference_new">
-                               <return-type type="GtkTreeRowReference*"/>
-                               <parameters>
-                                       <parameter name="model" type="GtkTreeModel*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_proxy" symbol="gtk_tree_row_reference_new_proxy">
-                               <return-type type="GtkTreeRowReference*"/>
-                               <parameters>
-                                       <parameter name="proxy" type="GObject*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="reordered" symbol="gtk_tree_row_reference_reordered">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="proxy" type="GObject*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="new_order" type="gint*"/>
-                               </parameters>
-                       </method>
-                       <method name="valid" symbol="gtk_tree_row_reference_valid">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="reference" type="GtkTreeRowReference*"/>
-                               </parameters>
-                       </method>
-               </boxed>
-               <enum name="GtkAnchorType">
-                       <member name="GTK_ANCHOR_CENTER" value="0"/>
-                       <member name="GTK_ANCHOR_NORTH" value="1"/>
-                       <member name="GTK_ANCHOR_NORTH_WEST" value="2"/>
-                       <member name="GTK_ANCHOR_NORTH_EAST" value="3"/>
-                       <member name="GTK_ANCHOR_SOUTH" value="4"/>
-                       <member name="GTK_ANCHOR_SOUTH_WEST" value="5"/>
-                       <member name="GTK_ANCHOR_SOUTH_EAST" value="6"/>
-                       <member name="GTK_ANCHOR_WEST" value="7"/>
-                       <member name="GTK_ANCHOR_EAST" value="8"/>
-                       <member name="GTK_ANCHOR_N" value="1"/>
-                       <member name="GTK_ANCHOR_NW" value="2"/>
-                       <member name="GTK_ANCHOR_NE" value="3"/>
-                       <member name="GTK_ANCHOR_S" value="4"/>
-                       <member name="GTK_ANCHOR_SW" value="5"/>
-                       <member name="GTK_ANCHOR_SE" value="6"/>
-                       <member name="GTK_ANCHOR_W" value="7"/>
-                       <member name="GTK_ANCHOR_E" value="8"/>
-               </enum>
-               <enum name="GtkArrowType">
-                       <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">
-                       <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"/>
-               </enum>
-               <enum name="GtkBuilderError">
-                       <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"/>
-               </enum>
-               <enum name="GtkButtonBoxStyle">
-                       <member name="GTK_BUTTONBOX_DEFAULT_STYLE" value="0"/>
-                       <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">
-                       <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>
-               <enum name="GtkCListDragPos">
-                       <member name="GTK_CLIST_DRAG_NONE" value="0"/>
-                       <member name="GTK_CLIST_DRAG_BEFORE" value="1"/>
-                       <member name="GTK_CLIST_DRAG_INTO" value="2"/>
-                       <member name="GTK_CLIST_DRAG_AFTER" value="3"/>
-               </enum>
-               <enum name="GtkCTreeExpanderStyle">
-                       <member name="GTK_CTREE_EXPANDER_NONE" value="0"/>
-                       <member name="GTK_CTREE_EXPANDER_SQUARE" value="1"/>
-                       <member name="GTK_CTREE_EXPANDER_TRIANGLE" value="2"/>
-                       <member name="GTK_CTREE_EXPANDER_CIRCULAR" value="3"/>
-               </enum>
-               <enum name="GtkCTreeExpansionType">
-                       <member name="GTK_CTREE_EXPANSION_EXPAND" value="0"/>
-                       <member name="GTK_CTREE_EXPANSION_EXPAND_RECURSIVE" value="1"/>
-                       <member name="GTK_CTREE_EXPANSION_COLLAPSE" value="2"/>
-                       <member name="GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE" value="3"/>
-                       <member name="GTK_CTREE_EXPANSION_TOGGLE" value="4"/>
-                       <member name="GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE" value="5"/>
-               </enum>
-               <enum name="GtkCTreeLineStyle">
-                       <member name="GTK_CTREE_LINES_NONE" value="0"/>
-                       <member name="GTK_CTREE_LINES_SOLID" value="1"/>
-                       <member name="GTK_CTREE_LINES_DOTTED" value="2"/>
-                       <member name="GTK_CTREE_LINES_TABBED" value="3"/>
-               </enum>
-               <enum name="GtkCTreePos">
-                       <member name="GTK_CTREE_POS_BEFORE" value="0"/>
-                       <member name="GTK_CTREE_POS_AS_CHILD" value="1"/>
-                       <member name="GTK_CTREE_POS_AFTER" value="2"/>
-               </enum>
-               <enum name="GtkCellRendererAccelMode">
-                       <member name="GTK_CELL_RENDERER_ACCEL_MODE_GTK" value="0"/>
-                       <member name="GTK_CELL_RENDERER_ACCEL_MODE_OTHER" value="1"/>
-               </enum>
-               <enum name="GtkCellRendererMode">
-                       <member name="GTK_CELL_RENDERER_MODE_INERT" value="0"/>
-                       <member name="GTK_CELL_RENDERER_MODE_ACTIVATABLE" value="1"/>
-                       <member name="GTK_CELL_RENDERER_MODE_EDITABLE" value="2"/>
-               </enum>
-               <enum name="GtkCellType">
-                       <member name="GTK_CELL_EMPTY" value="0"/>
-                       <member name="GTK_CELL_TEXT" value="1"/>
-                       <member name="GTK_CELL_PIXMAP" value="2"/>
-                       <member name="GTK_CELL_PIXTEXT" value="3"/>
-                       <member name="GTK_CELL_WIDGET" value="4"/>
-               </enum>
-               <enum name="GtkCornerType">
-                       <member name="GTK_CORNER_TOP_LEFT" value="0"/>
-                       <member name="GTK_CORNER_BOTTOM_LEFT" value="1"/>
-                       <member name="GTK_CORNER_TOP_RIGHT" value="2"/>
-                       <member name="GTK_CORNER_BOTTOM_RIGHT" value="3"/>
-               </enum>
-               <enum name="GtkCurveType">
-                       <member name="GTK_CURVE_TYPE_LINEAR" value="0"/>
-                       <member name="GTK_CURVE_TYPE_SPLINE" value="1"/>
-                       <member name="GTK_CURVE_TYPE_FREE" value="2"/>
-               </enum>
-               <enum name="GtkDeleteType">
-                       <member name="GTK_DELETE_CHARS" value="0"/>
-                       <member name="GTK_DELETE_WORD_ENDS" value="1"/>
-                       <member name="GTK_DELETE_WORDS" value="2"/>
-                       <member name="GTK_DELETE_DISPLAY_LINES" value="3"/>
-                       <member name="GTK_DELETE_DISPLAY_LINE_ENDS" value="4"/>
-                       <member name="GTK_DELETE_PARAGRAPH_ENDS" value="5"/>
-                       <member name="GTK_DELETE_PARAGRAPHS" value="6"/>
-                       <member name="GTK_DELETE_WHITESPACE" value="7"/>
-               </enum>
-               <enum name="GtkDirectionType">
-                       <member name="GTK_DIR_TAB_FORWARD" value="0"/>
-                       <member name="GTK_DIR_TAB_BACKWARD" value="1"/>
-                       <member name="GTK_DIR_UP" value="2"/>
-                       <member name="GTK_DIR_DOWN" value="3"/>
-                       <member name="GTK_DIR_LEFT" value="4"/>
-                       <member name="GTK_DIR_RIGHT" value="5"/>
-               </enum>
-               <enum name="GtkDragResult">
-                       <member name="GTK_DRAG_RESULT_SUCCESS" value="0"/>
-                       <member name="GTK_DRAG_RESULT_NO_TARGET" value="1"/>
-                       <member name="GTK_DRAG_RESULT_USER_CANCELLED" value="2"/>
-                       <member name="GTK_DRAG_RESULT_TIMEOUT_EXPIRED" value="3"/>
-                       <member name="GTK_DRAG_RESULT_GRAB_BROKEN" value="4"/>
-                       <member name="GTK_DRAG_RESULT_ERROR" value="5"/>
-               </enum>
-               <enum name="GtkExpanderStyle">
-                       <member name="GTK_EXPANDER_COLLAPSED" value="0"/>
-                       <member name="GTK_EXPANDER_SEMI_COLLAPSED" value="1"/>
-                       <member name="GTK_EXPANDER_SEMI_EXPANDED" value="2"/>
-                       <member name="GTK_EXPANDER_EXPANDED" value="3"/>
-               </enum>
-               <enum name="GtkFileChooserAction">
-                       <member name="GTK_FILE_CHOOSER_ACTION_OPEN" value="0"/>
-                       <member name="GTK_FILE_CHOOSER_ACTION_SAVE" value="1"/>
-                       <member name="GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER" value="2"/>
-                       <member name="GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER" value="3"/>
-               </enum>
-               <enum name="GtkFileChooserConfirmation">
-                       <member name="GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM" value="0"/>
-                       <member name="GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME" value="1"/>
-                       <member name="GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN" value="2"/>
-               </enum>
-               <enum name="GtkFileChooserError">
-                       <member name="GTK_FILE_CHOOSER_ERROR_NONEXISTENT" value="0"/>
-                       <member name="GTK_FILE_CHOOSER_ERROR_BAD_FILENAME" value="1"/>
-                       <member name="GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS" value="2"/>
-               </enum>
-               <enum name="GtkIMPreeditStyle">
-                       <member name="GTK_IM_PREEDIT_NOTHING" value="0"/>
-                       <member name="GTK_IM_PREEDIT_CALLBACK" value="1"/>
-                       <member name="GTK_IM_PREEDIT_NONE" value="2"/>
-               </enum>
-               <enum name="GtkIMStatusStyle">
-                       <member name="GTK_IM_STATUS_NOTHING" value="0"/>
-                       <member name="GTK_IM_STATUS_CALLBACK" value="1"/>
-                       <member name="GTK_IM_STATUS_NONE" value="2"/>
-               </enum>
-               <enum name="GtkIconSize">
-                       <member name="GTK_ICON_SIZE_INVALID" value="0"/>
-                       <member name="GTK_ICON_SIZE_MENU" value="1"/>
-                       <member name="GTK_ICON_SIZE_SMALL_TOOLBAR" value="2"/>
-                       <member name="GTK_ICON_SIZE_LARGE_TOOLBAR" value="3"/>
-                       <member name="GTK_ICON_SIZE_BUTTON" value="4"/>
-                       <member name="GTK_ICON_SIZE_DND" value="5"/>
-                       <member name="GTK_ICON_SIZE_DIALOG" value="6"/>
-               </enum>
-               <enum name="GtkIconThemeError">
-                       <member name="GTK_ICON_THEME_NOT_FOUND" value="0"/>
-                       <member name="GTK_ICON_THEME_FAILED" value="1"/>
-               </enum>
-               <enum name="GtkIconViewDropPosition">
-                       <member name="GTK_ICON_VIEW_NO_DROP" value="0"/>
-                       <member name="GTK_ICON_VIEW_DROP_INTO" value="1"/>
-                       <member name="GTK_ICON_VIEW_DROP_LEFT" value="2"/>
-                       <member name="GTK_ICON_VIEW_DROP_RIGHT" value="3"/>
-                       <member name="GTK_ICON_VIEW_DROP_ABOVE" value="4"/>
-                       <member name="GTK_ICON_VIEW_DROP_BELOW" value="5"/>
-               </enum>
-               <enum name="GtkImageType">
-                       <member name="GTK_IMAGE_EMPTY" value="0"/>
-                       <member name="GTK_IMAGE_PIXMAP" value="1"/>
-                       <member name="GTK_IMAGE_IMAGE" value="2"/>
-                       <member name="GTK_IMAGE_PIXBUF" value="3"/>
-                       <member name="GTK_IMAGE_STOCK" value="4"/>
-                       <member name="GTK_IMAGE_ICON_SET" value="5"/>
-                       <member name="GTK_IMAGE_ANIMATION" value="6"/>
-                       <member name="GTK_IMAGE_ICON_NAME" value="7"/>
-               </enum>
-               <enum name="GtkJustification">
-                       <member name="GTK_JUSTIFY_LEFT" value="0"/>
-                       <member name="GTK_JUSTIFY_RIGHT" value="1"/>
-                       <member name="GTK_JUSTIFY_CENTER" value="2"/>
-                       <member name="GTK_JUSTIFY_FILL" value="3"/>
-               </enum>
-               <enum name="GtkMatchType">
-                       <member name="GTK_MATCH_ALL" value="0"/>
-                       <member name="GTK_MATCH_ALL_TAIL" value="1"/>
-                       <member name="GTK_MATCH_HEAD" value="2"/>
-                       <member name="GTK_MATCH_TAIL" value="3"/>
-                       <member name="GTK_MATCH_EXACT" value="4"/>
-                       <member name="GTK_MATCH_LAST" value="5"/>
-               </enum>
-               <enum name="GtkMenuDirectionType">
-                       <member name="GTK_MENU_DIR_PARENT" value="0"/>
-                       <member name="GTK_MENU_DIR_CHILD" value="1"/>
-                       <member name="GTK_MENU_DIR_NEXT" value="2"/>
-                       <member name="GTK_MENU_DIR_PREV" value="3"/>
-               </enum>
-               <enum name="GtkMessageType">
-                       <member name="GTK_MESSAGE_INFO" value="0"/>
-                       <member name="GTK_MESSAGE_WARNING" value="1"/>
-                       <member name="GTK_MESSAGE_QUESTION" value="2"/>
-                       <member name="GTK_MESSAGE_ERROR" value="3"/>
-                       <member name="GTK_MESSAGE_OTHER" value="4"/>
-               </enum>
-               <enum name="GtkMetricType">
-                       <member name="GTK_PIXELS" value="0"/>
-                       <member name="GTK_INCHES" value="1"/>
-                       <member name="GTK_CENTIMETERS" value="2"/>
-               </enum>
-               <enum name="GtkMovementStep">
-                       <member name="GTK_MOVEMENT_LOGICAL_POSITIONS" value="0"/>
-                       <member name="GTK_MOVEMENT_VISUAL_POSITIONS" value="1"/>
-                       <member name="GTK_MOVEMENT_WORDS" value="2"/>
-                       <member name="GTK_MOVEMENT_DISPLAY_LINES" value="3"/>
-                       <member name="GTK_MOVEMENT_DISPLAY_LINE_ENDS" value="4"/>
-                       <member name="GTK_MOVEMENT_PARAGRAPHS" value="5"/>
-                       <member name="GTK_MOVEMENT_PARAGRAPH_ENDS" value="6"/>
-                       <member name="GTK_MOVEMENT_PAGES" value="7"/>
-                       <member name="GTK_MOVEMENT_BUFFER_ENDS" value="8"/>
-                       <member name="GTK_MOVEMENT_HORIZONTAL_PAGES" value="9"/>
-               </enum>
-               <enum name="GtkNotebookTab">
-                       <member name="GTK_NOTEBOOK_TAB_FIRST" value="0"/>
-                       <member name="GTK_NOTEBOOK_TAB_LAST" value="1"/>
-               </enum>
-               <enum name="GtkOrientation">
-                       <member name="GTK_ORIENTATION_HORIZONTAL" value="0"/>
-                       <member name="GTK_ORIENTATION_VERTICAL" value="1"/>
-               </enum>
-               <enum name="GtkPackDirection">
-                       <member name="GTK_PACK_DIRECTION_LTR" value="0"/>
-                       <member name="GTK_PACK_DIRECTION_RTL" value="1"/>
-                       <member name="GTK_PACK_DIRECTION_TTB" value="2"/>
-                       <member name="GTK_PACK_DIRECTION_BTT" value="3"/>
-               </enum>
-               <enum name="GtkPackType">
-                       <member name="GTK_PACK_START" value="0"/>
-                       <member name="GTK_PACK_END" value="1"/>
-               </enum>
-               <enum name="GtkPageOrientation">
-                       <member name="GTK_PAGE_ORIENTATION_PORTRAIT" value="0"/>
-                       <member name="GTK_PAGE_ORIENTATION_LANDSCAPE" value="1"/>
-                       <member name="GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT" value="2"/>
-                       <member name="GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE" value="3"/>
-               </enum>
-               <enum name="GtkPageSet">
-                       <member name="GTK_PAGE_SET_ALL" value="0"/>
-                       <member name="GTK_PAGE_SET_EVEN" value="1"/>
-                       <member name="GTK_PAGE_SET_ODD" value="2"/>
-               </enum>
-               <enum name="GtkPathPriorityType">
-                       <member name="GTK_PATH_PRIO_LOWEST" value="0"/>
-                       <member name="GTK_PATH_PRIO_GTK" value="4"/>
-                       <member name="GTK_PATH_PRIO_APPLICATION" value="8"/>
-                       <member name="GTK_PATH_PRIO_THEME" value="10"/>
-                       <member name="GTK_PATH_PRIO_RC" value="12"/>
-                       <member name="GTK_PATH_PRIO_HIGHEST" value="15"/>
-               </enum>
-               <enum name="GtkPathType">
-                       <member name="GTK_PATH_WIDGET" value="0"/>
-                       <member name="GTK_PATH_WIDGET_CLASS" value="1"/>
-                       <member name="GTK_PATH_CLASS" value="2"/>
-               </enum>
-               <enum name="GtkPolicyType">
-                       <member name="GTK_POLICY_ALWAYS" value="0"/>
-                       <member name="GTK_POLICY_AUTOMATIC" value="1"/>
-                       <member name="GTK_POLICY_NEVER" value="2"/>
-               </enum>
-               <enum name="GtkPositionType">
-                       <member name="GTK_POS_LEFT" value="0"/>
-                       <member name="GTK_POS_RIGHT" value="1"/>
-                       <member name="GTK_POS_TOP" value="2"/>
-                       <member name="GTK_POS_BOTTOM" value="3"/>
-               </enum>
-               <enum name="GtkPreviewType">
-                       <member name="GTK_PREVIEW_COLOR" value="0"/>
-                       <member name="GTK_PREVIEW_GRAYSCALE" value="1"/>
-               </enum>
-               <enum name="GtkPrintDuplex">
-                       <member name="GTK_PRINT_DUPLEX_SIMPLEX" value="0"/>
-                       <member name="GTK_PRINT_DUPLEX_HORIZONTAL" value="1"/>
-                       <member name="GTK_PRINT_DUPLEX_VERTICAL" value="2"/>
-               </enum>
-               <enum name="GtkPrintError">
-                       <member name="GTK_PRINT_ERROR_GENERAL" value="0"/>
-                       <member name="GTK_PRINT_ERROR_INTERNAL_ERROR" value="1"/>
-                       <member name="GTK_PRINT_ERROR_NOMEM" value="2"/>
-                       <member name="GTK_PRINT_ERROR_INVALID_FILE" value="3"/>
-               </enum>
-               <enum name="GtkPrintOperationAction">
-                       <member name="GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG" value="0"/>
-                       <member name="GTK_PRINT_OPERATION_ACTION_PRINT" value="1"/>
-                       <member name="GTK_PRINT_OPERATION_ACTION_PREVIEW" value="2"/>
-                       <member name="GTK_PRINT_OPERATION_ACTION_EXPORT" value="3"/>
-               </enum>
-               <enum name="GtkPrintOperationResult">
-                       <member name="GTK_PRINT_OPERATION_RESULT_ERROR" value="0"/>
-                       <member name="GTK_PRINT_OPERATION_RESULT_APPLY" value="1"/>
-                       <member name="GTK_PRINT_OPERATION_RESULT_CANCEL" value="2"/>
-                       <member name="GTK_PRINT_OPERATION_RESULT_IN_PROGRESS" value="3"/>
-               </enum>
-               <enum name="GtkPrintPages">
-                       <member name="GTK_PRINT_PAGES_ALL" value="0"/>
-                       <member name="GTK_PRINT_PAGES_CURRENT" value="1"/>
-                       <member name="GTK_PRINT_PAGES_RANGES" value="2"/>
-               </enum>
-               <enum name="GtkPrintQuality">
-                       <member name="GTK_PRINT_QUALITY_LOW" value="0"/>
-                       <member name="GTK_PRINT_QUALITY_NORMAL" value="1"/>
-                       <member name="GTK_PRINT_QUALITY_HIGH" value="2"/>
-                       <member name="GTK_PRINT_QUALITY_DRAFT" value="3"/>
-               </enum>
-               <enum name="GtkPrintStatus">
-                       <member name="GTK_PRINT_STATUS_INITIAL" value="0"/>
-                       <member name="GTK_PRINT_STATUS_PREPARING" value="1"/>
-                       <member name="GTK_PRINT_STATUS_GENERATING_DATA" value="2"/>
-                       <member name="GTK_PRINT_STATUS_SENDING_DATA" value="3"/>
-                       <member name="GTK_PRINT_STATUS_PENDING" value="4"/>
-                       <member name="GTK_PRINT_STATUS_PENDING_ISSUE" value="5"/>
-                       <member name="GTK_PRINT_STATUS_PRINTING" value="6"/>
-                       <member name="GTK_PRINT_STATUS_FINISHED" value="7"/>
-                       <member name="GTK_PRINT_STATUS_FINISHED_ABORTED" value="8"/>
-               </enum>
-               <enum name="GtkProgressBarOrientation">
-                       <member name="GTK_PROGRESS_LEFT_TO_RIGHT" value="0"/>
-                       <member name="GTK_PROGRESS_RIGHT_TO_LEFT" value="1"/>
-                       <member name="GTK_PROGRESS_BOTTOM_TO_TOP" value="2"/>
-                       <member name="GTK_PROGRESS_TOP_TO_BOTTOM" value="3"/>
-               </enum>
-               <enum name="GtkProgressBarStyle">
-                       <member name="GTK_PROGRESS_CONTINUOUS" value="0"/>
-                       <member name="GTK_PROGRESS_DISCRETE" value="1"/>
-               </enum>
-               <enum name="GtkRcTokenType">
-                       <member name="GTK_RC_TOKEN_INVALID" value="270"/>
-                       <member name="GTK_RC_TOKEN_INCLUDE" value="271"/>
-                       <member name="GTK_RC_TOKEN_NORMAL" value="272"/>
-                       <member name="GTK_RC_TOKEN_ACTIVE" value="273"/>
-                       <member name="GTK_RC_TOKEN_PRELIGHT" value="274"/>
-                       <member name="GTK_RC_TOKEN_SELECTED" value="275"/>
-                       <member name="GTK_RC_TOKEN_INSENSITIVE" value="276"/>
-                       <member name="GTK_RC_TOKEN_FG" value="277"/>
-                       <member name="GTK_RC_TOKEN_BG" value="278"/>
-                       <member name="GTK_RC_TOKEN_TEXT" value="279"/>
-                       <member name="GTK_RC_TOKEN_BASE" value="280"/>
-                       <member name="GTK_RC_TOKEN_XTHICKNESS" value="281"/>
-                       <member name="GTK_RC_TOKEN_YTHICKNESS" value="282"/>
-                       <member name="GTK_RC_TOKEN_FONT" value="283"/>
-                       <member name="GTK_RC_TOKEN_FONTSET" value="284"/>
-                       <member name="GTK_RC_TOKEN_FONT_NAME" value="285"/>
-                       <member name="GTK_RC_TOKEN_BG_PIXMAP" value="286"/>
-                       <member name="GTK_RC_TOKEN_PIXMAP_PATH" value="287"/>
-                       <member name="GTK_RC_TOKEN_STYLE" value="288"/>
-                       <member name="GTK_RC_TOKEN_BINDING" value="289"/>
-                       <member name="GTK_RC_TOKEN_BIND" value="290"/>
-                       <member name="GTK_RC_TOKEN_WIDGET" value="291"/>
-                       <member name="GTK_RC_TOKEN_WIDGET_CLASS" value="292"/>
-                       <member name="GTK_RC_TOKEN_CLASS" value="293"/>
-                       <member name="GTK_RC_TOKEN_LOWEST" value="294"/>
-                       <member name="GTK_RC_TOKEN_GTK" value="295"/>
-                       <member name="GTK_RC_TOKEN_APPLICATION" value="296"/>
-                       <member name="GTK_RC_TOKEN_THEME" value="297"/>
-                       <member name="GTK_RC_TOKEN_RC" value="298"/>
-                       <member name="GTK_RC_TOKEN_HIGHEST" value="299"/>
-                       <member name="GTK_RC_TOKEN_ENGINE" value="300"/>
-                       <member name="GTK_RC_TOKEN_MODULE_PATH" value="301"/>
-                       <member name="GTK_RC_TOKEN_IM_MODULE_PATH" value="302"/>
-                       <member name="GTK_RC_TOKEN_IM_MODULE_FILE" value="303"/>
-                       <member name="GTK_RC_TOKEN_STOCK" value="304"/>
-                       <member name="GTK_RC_TOKEN_LTR" value="305"/>
-                       <member name="GTK_RC_TOKEN_RTL" value="306"/>
-                       <member name="GTK_RC_TOKEN_COLOR" value="307"/>
-                       <member name="GTK_RC_TOKEN_UNBIND" value="308"/>
-                       <member name="GTK_RC_TOKEN_LAST" value="309"/>
-               </enum>
-               <enum name="GtkRecentChooserError">
-                       <member name="GTK_RECENT_CHOOSER_ERROR_NOT_FOUND" value="0"/>
-                       <member name="GTK_RECENT_CHOOSER_ERROR_INVALID_URI" value="1"/>
-               </enum>
-               <enum name="GtkRecentManagerError">
-                       <member name="GTK_RECENT_MANAGER_ERROR_NOT_FOUND" value="0"/>
-                       <member name="GTK_RECENT_MANAGER_ERROR_INVALID_URI" value="1"/>
-                       <member name="GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING" value="2"/>
-                       <member name="GTK_RECENT_MANAGER_ERROR_NOT_REGISTERED" value="3"/>
-                       <member name="GTK_RECENT_MANAGER_ERROR_READ" value="4"/>
-                       <member name="GTK_RECENT_MANAGER_ERROR_WRITE" value="5"/>
-                       <member name="GTK_RECENT_MANAGER_ERROR_UNKNOWN" value="6"/>
-               </enum>
-               <enum name="GtkRecentSortType">
-                       <member name="GTK_RECENT_SORT_NONE" value="0"/>
-                       <member name="GTK_RECENT_SORT_MRU" value="1"/>
-                       <member name="GTK_RECENT_SORT_LRU" value="2"/>
-                       <member name="GTK_RECENT_SORT_CUSTOM" value="3"/>
-               </enum>
-               <enum name="GtkReliefStyle">
-                       <member name="GTK_RELIEF_NORMAL" value="0"/>
-                       <member name="GTK_RELIEF_HALF" value="1"/>
-                       <member name="GTK_RELIEF_NONE" value="2"/>
-               </enum>
-               <enum name="GtkResizeMode">
-                       <member name="GTK_RESIZE_PARENT" value="0"/>
-                       <member name="GTK_RESIZE_QUEUE" value="1"/>
-                       <member name="GTK_RESIZE_IMMEDIATE" value="2"/>
-               </enum>
-               <enum name="GtkResponseType">
-                       <member name="GTK_RESPONSE_NONE" value="-1"/>
-                       <member name="GTK_RESPONSE_REJECT" value="-2"/>
-                       <member name="GTK_RESPONSE_ACCEPT" value="-3"/>
-                       <member name="GTK_RESPONSE_DELETE_EVENT" value="-4"/>
-                       <member name="GTK_RESPONSE_OK" value="-5"/>
-                       <member name="GTK_RESPONSE_CANCEL" value="-6"/>
-                       <member name="GTK_RESPONSE_CLOSE" value="-7"/>
-                       <member name="GTK_RESPONSE_YES" value="-8"/>
-                       <member name="GTK_RESPONSE_NO" value="-9"/>
-                       <member name="GTK_RESPONSE_APPLY" value="-10"/>
-                       <member name="GTK_RESPONSE_HELP" value="-11"/>
-               </enum>
-               <enum name="GtkScrollStep">
-                       <member name="GTK_SCROLL_STEPS" value="0"/>
-                       <member name="GTK_SCROLL_PAGES" value="1"/>
-                       <member name="GTK_SCROLL_ENDS" value="2"/>
-                       <member name="GTK_SCROLL_HORIZONTAL_STEPS" value="3"/>
-                       <member name="GTK_SCROLL_HORIZONTAL_PAGES" value="4"/>
-                       <member name="GTK_SCROLL_HORIZONTAL_ENDS" value="5"/>
-               </enum>
-               <enum name="GtkScrollType">
-                       <member name="GTK_SCROLL_NONE" value="0"/>
-                       <member name="GTK_SCROLL_JUMP" value="1"/>
-                       <member name="GTK_SCROLL_STEP_BACKWARD" value="2"/>
-                       <member name="GTK_SCROLL_STEP_FORWARD" value="3"/>
-                       <member name="GTK_SCROLL_PAGE_BACKWARD" value="4"/>
-                       <member name="GTK_SCROLL_PAGE_FORWARD" value="5"/>
-                       <member name="GTK_SCROLL_STEP_UP" value="6"/>
-                       <member name="GTK_SCROLL_STEP_DOWN" value="7"/>
-                       <member name="GTK_SCROLL_PAGE_UP" value="8"/>
-                       <member name="GTK_SCROLL_PAGE_DOWN" value="9"/>
-                       <member name="GTK_SCROLL_STEP_LEFT" value="10"/>
-                       <member name="GTK_SCROLL_STEP_RIGHT" value="11"/>
-                       <member name="GTK_SCROLL_PAGE_LEFT" value="12"/>
-                       <member name="GTK_SCROLL_PAGE_RIGHT" value="13"/>
-                       <member name="GTK_SCROLL_START" value="14"/>
-                       <member name="GTK_SCROLL_END" value="15"/>
-               </enum>
-               <enum name="GtkSelectionMode">
-                       <member name="GTK_SELECTION_NONE" value="0"/>
-                       <member name="GTK_SELECTION_SINGLE" value="1"/>
-                       <member name="GTK_SELECTION_BROWSE" value="2"/>
-                       <member name="GTK_SELECTION_MULTIPLE" value="3"/>
-                       <member name="GTK_SELECTION_EXTENDED" value="3"/>
-               </enum>
-               <enum name="GtkSensitivityType">
-                       <member name="GTK_SENSITIVITY_AUTO" value="0"/>
-                       <member name="GTK_SENSITIVITY_ON" value="1"/>
-                       <member name="GTK_SENSITIVITY_OFF" value="2"/>
-               </enum>
-               <enum name="GtkShadowType">
-                       <member name="GTK_SHADOW_NONE" value="0"/>
-                       <member name="GTK_SHADOW_IN" value="1"/>
-                       <member name="GTK_SHADOW_OUT" value="2"/>
-                       <member name="GTK_SHADOW_ETCHED_IN" value="3"/>
-                       <member name="GTK_SHADOW_ETCHED_OUT" value="4"/>
-               </enum>
-               <enum name="GtkSideType">
-                       <member name="GTK_SIDE_TOP" value="0"/>
-                       <member name="GTK_SIDE_BOTTOM" value="1"/>
-                       <member name="GTK_SIDE_LEFT" value="2"/>
-                       <member name="GTK_SIDE_RIGHT" value="3"/>
-               </enum>
-               <enum name="GtkSizeGroupMode">
-                       <member name="GTK_SIZE_GROUP_NONE" value="0"/>
-                       <member name="GTK_SIZE_GROUP_HORIZONTAL" value="1"/>
-                       <member name="GTK_SIZE_GROUP_VERTICAL" value="2"/>
-                       <member name="GTK_SIZE_GROUP_BOTH" value="3"/>
-               </enum>
-               <enum name="GtkSortType">
-                       <member name="GTK_SORT_ASCENDING" value="0"/>
-                       <member name="GTK_SORT_DESCENDING" value="1"/>
-               </enum>
-               <enum name="GtkSpinButtonUpdatePolicy">
-                       <member name="GTK_UPDATE_ALWAYS" value="0"/>
-                       <member name="GTK_UPDATE_IF_VALID" value="1"/>
-               </enum>
-               <enum name="GtkSpinType">
-                       <member name="GTK_SPIN_STEP_FORWARD" value="0"/>
-                       <member name="GTK_SPIN_STEP_BACKWARD" value="1"/>
-                       <member name="GTK_SPIN_PAGE_FORWARD" value="2"/>
-                       <member name="GTK_SPIN_PAGE_BACKWARD" value="3"/>
-                       <member name="GTK_SPIN_HOME" value="4"/>
-                       <member name="GTK_SPIN_END" value="5"/>
-                       <member name="GTK_SPIN_USER_DEFINED" value="6"/>
-               </enum>
-               <enum name="GtkStateType">
-                       <member name="GTK_STATE_NORMAL" value="0"/>
-                       <member name="GTK_STATE_ACTIVE" value="1"/>
-                       <member name="GTK_STATE_PRELIGHT" value="2"/>
-                       <member name="GTK_STATE_SELECTED" value="3"/>
-                       <member name="GTK_STATE_INSENSITIVE" value="4"/>
-               </enum>
-               <enum name="GtkSubmenuDirection">
-                       <member name="GTK_DIRECTION_LEFT" value="0"/>
-                       <member name="GTK_DIRECTION_RIGHT" value="1"/>
-               </enum>
-               <enum name="GtkSubmenuPlacement">
-                       <member name="GTK_TOP_BOTTOM" value="0"/>
-                       <member name="GTK_LEFT_RIGHT" value="1"/>
-               </enum>
-               <enum name="GtkTextBufferTargetInfo">
-                       <member name="GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" value="-1"/>
-                       <member name="GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT" value="-2"/>
-                       <member name="GTK_TEXT_BUFFER_TARGET_INFO_TEXT" value="-3"/>
-               </enum>
-               <enum name="GtkTextDirection">
-                       <member name="GTK_TEXT_DIR_NONE" value="0"/>
-                       <member name="GTK_TEXT_DIR_LTR" value="1"/>
-                       <member name="GTK_TEXT_DIR_RTL" value="2"/>
-               </enum>
-               <enum name="GtkTextWindowType">
-                       <member name="GTK_TEXT_WINDOW_PRIVATE" value="0"/>
-                       <member name="GTK_TEXT_WINDOW_WIDGET" value="1"/>
-                       <member name="GTK_TEXT_WINDOW_TEXT" value="2"/>
-                       <member name="GTK_TEXT_WINDOW_LEFT" value="3"/>
-                       <member name="GTK_TEXT_WINDOW_RIGHT" value="4"/>
-                       <member name="GTK_TEXT_WINDOW_TOP" value="5"/>
-                       <member name="GTK_TEXT_WINDOW_BOTTOM" value="6"/>
-               </enum>
-               <enum name="GtkToolbarChildType">
-                       <member name="GTK_TOOLBAR_CHILD_SPACE" value="0"/>
-                       <member name="GTK_TOOLBAR_CHILD_BUTTON" value="1"/>
-                       <member name="GTK_TOOLBAR_CHILD_TOGGLEBUTTON" value="2"/>
-                       <member name="GTK_TOOLBAR_CHILD_RADIOBUTTON" value="3"/>
-                       <member name="GTK_TOOLBAR_CHILD_WIDGET" value="4"/>
-               </enum>
-               <enum name="GtkToolbarSpaceStyle">
-                       <member name="GTK_TOOLBAR_SPACE_EMPTY" value="0"/>
-                       <member name="GTK_TOOLBAR_SPACE_LINE" value="1"/>
-               </enum>
-               <enum name="GtkToolbarStyle">
-                       <member name="GTK_TOOLBAR_ICONS" value="0"/>
-                       <member name="GTK_TOOLBAR_TEXT" value="1"/>
-                       <member name="GTK_TOOLBAR_BOTH" value="2"/>
-                       <member name="GTK_TOOLBAR_BOTH_HORIZ" value="3"/>
-               </enum>
-               <enum name="GtkTreeViewColumnSizing">
-                       <member name="GTK_TREE_VIEW_COLUMN_GROW_ONLY" value="0"/>
-                       <member name="GTK_TREE_VIEW_COLUMN_AUTOSIZE" value="1"/>
-                       <member name="GTK_TREE_VIEW_COLUMN_FIXED" value="2"/>
-               </enum>
-               <enum name="GtkTreeViewDropPosition">
-                       <member name="GTK_TREE_VIEW_DROP_BEFORE" value="0"/>
-                       <member name="GTK_TREE_VIEW_DROP_AFTER" value="1"/>
-                       <member name="GTK_TREE_VIEW_DROP_INTO_OR_BEFORE" value="2"/>
-                       <member name="GTK_TREE_VIEW_DROP_INTO_OR_AFTER" value="3"/>
-               </enum>
-               <enum name="GtkTreeViewGridLines">
-                       <member name="GTK_TREE_VIEW_GRID_LINES_NONE" value="0"/>
-                       <member name="GTK_TREE_VIEW_GRID_LINES_HORIZONTAL" value="1"/>
-                       <member name="GTK_TREE_VIEW_GRID_LINES_VERTICAL" value="2"/>
-                       <member name="GTK_TREE_VIEW_GRID_LINES_BOTH" value="3"/>
-               </enum>
-               <enum name="GtkTreeViewMode">
-                       <member name="GTK_TREE_VIEW_LINE" value="0"/>
-                       <member name="GTK_TREE_VIEW_ITEM" value="1"/>
-               </enum>
-               <enum name="GtkUnit">
-                       <member name="GTK_UNIT_PIXEL" value="0"/>
-                       <member name="GTK_UNIT_POINTS" value="1"/>
-                       <member name="GTK_UNIT_INCH" value="2"/>
-                       <member name="GTK_UNIT_MM" value="3"/>
-               </enum>
-               <enum name="GtkUpdateType">
-                       <member name="GTK_UPDATE_CONTINUOUS" value="0"/>
-                       <member name="GTK_UPDATE_DISCONTINUOUS" value="1"/>
-                       <member name="GTK_UPDATE_DELAYED" value="2"/>
-               </enum>
-               <enum name="GtkVisibility">
-                       <member name="GTK_VISIBILITY_NONE" value="0"/>
-                       <member name="GTK_VISIBILITY_PARTIAL" value="1"/>
-                       <member name="GTK_VISIBILITY_FULL" value="2"/>
-               </enum>
-               <enum name="GtkWidgetHelpType">
-                       <member name="GTK_WIDGET_HELP_TOOLTIP" value="0"/>
-                       <member name="GTK_WIDGET_HELP_WHATS_THIS" value="1"/>
-               </enum>
-               <enum name="GtkWindowPosition">
-                       <member name="GTK_WIN_POS_NONE" value="0"/>
-                       <member name="GTK_WIN_POS_CENTER" value="1"/>
-                       <member name="GTK_WIN_POS_MOUSE" value="2"/>
-                       <member name="GTK_WIN_POS_CENTER_ALWAYS" value="3"/>
-                       <member name="GTK_WIN_POS_CENTER_ON_PARENT" value="4"/>
-               </enum>
-               <enum name="GtkWindowType">
-                       <member name="GTK_WINDOW_TOPLEVEL" value="0"/>
-                       <member name="GTK_WINDOW_POPUP" value="1"/>
-               </enum>
-               <enum name="GtkWrapMode">
-                       <member name="GTK_WRAP_NONE" value="0"/>
-                       <member name="GTK_WRAP_CHAR" value="1"/>
-                       <member name="GTK_WRAP_WORD" value="2"/>
-                       <member name="GTK_WRAP_WORD_CHAR" value="3"/>
-               </enum>
-               <flags name="GtkAccelFlags">
-                       <member name="GTK_ACCEL_VISIBLE" value="1"/>
-                       <member name="GTK_ACCEL_LOCKED" value="2"/>
-                       <member name="GTK_ACCEL_MASK" value="7"/>
-               </flags>
-               <flags name="GtkArgFlags">
-                       <member name="GTK_ARG_READABLE" value="1"/>
-                       <member name="GTK_ARG_WRITABLE" value="2"/>
-                       <member name="GTK_ARG_CONSTRUCT" value="4"/>
-                       <member name="GTK_ARG_CONSTRUCT_ONLY" value="8"/>
-                       <member name="GTK_ARG_CHILD_ARG" value="16"/>
-               </flags>
-               <flags name="GtkAttachOptions">
-                       <member name="GTK_EXPAND" value="1"/>
-                       <member name="GTK_SHRINK" value="2"/>
-                       <member name="GTK_FILL" value="4"/>
-               </flags>
-               <flags name="GtkButtonAction">
-                       <member name="GTK_BUTTON_IGNORED" value="0"/>
-                       <member name="GTK_BUTTON_SELECTS" value="1"/>
-                       <member name="GTK_BUTTON_DRAGS" value="2"/>
-                       <member name="GTK_BUTTON_EXPANDS" value="4"/>
-               </flags>
-               <flags name="GtkCalendarDisplayOptions">
-                       <member name="GTK_CALENDAR_SHOW_HEADING" value="1"/>
-                       <member name="GTK_CALENDAR_SHOW_DAY_NAMES" value="2"/>
-                       <member name="GTK_CALENDAR_NO_MONTH_CHANGE" value="4"/>
-                       <member name="GTK_CALENDAR_SHOW_WEEK_NUMBERS" value="8"/>
-                       <member name="GTK_CALENDAR_WEEK_START_MONDAY" value="16"/>
-               </flags>
-               <flags name="GtkCellRendererState">
-                       <member name="GTK_CELL_RENDERER_SELECTED" value="1"/>
-                       <member name="GTK_CELL_RENDERER_PRELIT" value="2"/>
-                       <member name="GTK_CELL_RENDERER_INSENSITIVE" value="4"/>
-                       <member name="GTK_CELL_RENDERER_SORTED" value="8"/>
-                       <member name="GTK_CELL_RENDERER_FOCUSED" value="16"/>
-               </flags>
-               <flags name="GtkDebugFlag">
-                       <member name="GTK_DEBUG_MISC" value="1"/>
-                       <member name="GTK_DEBUG_PLUGSOCKET" value="2"/>
-                       <member name="GTK_DEBUG_TEXT" value="4"/>
-                       <member name="GTK_DEBUG_TREE" value="8"/>
-                       <member name="GTK_DEBUG_UPDATES" value="16"/>
-                       <member name="GTK_DEBUG_KEYBINDINGS" value="32"/>
-                       <member name="GTK_DEBUG_MULTIHEAD" value="64"/>
-                       <member name="GTK_DEBUG_MODULES" value="128"/>
-                       <member name="GTK_DEBUG_GEOMETRY" value="256"/>
-                       <member name="GTK_DEBUG_ICONTHEME" value="512"/>
-                       <member name="GTK_DEBUG_PRINTING" value="1024"/>
-                       <member name="GTK_DEBUG_BUILDER" value="2048"/>
-               </flags>
-               <flags name="GtkDestDefaults">
-                       <member name="GTK_DEST_DEFAULT_MOTION" value="1"/>
-                       <member name="GTK_DEST_DEFAULT_HIGHLIGHT" value="2"/>
-                       <member name="GTK_DEST_DEFAULT_DROP" value="4"/>
-                       <member name="GTK_DEST_DEFAULT_ALL" value="7"/>
-               </flags>
-               <flags name="GtkDialogFlags">
-                       <member name="GTK_DIALOG_MODAL" value="1"/>
-                       <member name="GTK_DIALOG_DESTROY_WITH_PARENT" value="2"/>
-                       <member name="GTK_DIALOG_NO_SEPARATOR" value="4"/>
-               </flags>
-               <flags name="GtkFileFilterFlags">
-                       <member name="GTK_FILE_FILTER_FILENAME" value="1"/>
-                       <member name="GTK_FILE_FILTER_URI" value="2"/>
-                       <member name="GTK_FILE_FILTER_DISPLAY_NAME" value="4"/>
-                       <member name="GTK_FILE_FILTER_MIME_TYPE" value="8"/>
-               </flags>
-               <flags name="GtkIconLookupFlags">
-                       <member name="GTK_ICON_LOOKUP_NO_SVG" value="1"/>
-                       <member name="GTK_ICON_LOOKUP_FORCE_SVG" value="2"/>
-                       <member name="GTK_ICON_LOOKUP_USE_BUILTIN" value="4"/>
-                       <member name="GTK_ICON_LOOKUP_GENERIC_FALLBACK" value="8"/>
-               </flags>
-               <flags name="GtkObjectFlags">
-                       <member name="GTK_IN_DESTRUCTION" value="1"/>
-                       <member name="GTK_FLOATING" value="2"/>
-                       <member name="GTK_RESERVED_1" value="4"/>
-                       <member name="GTK_RESERVED_2" value="8"/>
-               </flags>
-               <flags name="GtkPrivateFlags">
-                       <member name="PRIVATE_GTK_USER_STYLE" value="1"/>
-                       <member name="PRIVATE_GTK_RESIZE_PENDING" value="4"/>
-                       <member name="PRIVATE_GTK_LEAVE_PENDING" value="16"/>
-                       <member name="PRIVATE_GTK_HAS_SHAPE_MASK" value="32"/>
-                       <member name="PRIVATE_GTK_IN_REPARENT" value="64"/>
-                       <member name="PRIVATE_GTK_DIRECTION_SET" value="128"/>
-                       <member name="PRIVATE_GTK_DIRECTION_LTR" value="256"/>
-                       <member name="PRIVATE_GTK_ANCHORED" value="512"/>
-                       <member name="PRIVATE_GTK_CHILD_VISIBLE" value="1024"/>
-                       <member name="PRIVATE_GTK_REDRAW_ON_ALLOC" value="2048"/>
-                       <member name="PRIVATE_GTK_ALLOC_NEEDED" value="4096"/>
-                       <member name="PRIVATE_GTK_REQUEST_NEEDED" value="8192"/>
-               </flags>
-               <flags name="GtkRcFlags">
-                       <member name="GTK_RC_FG" value="1"/>
-                       <member name="GTK_RC_BG" value="2"/>
-                       <member name="GTK_RC_TEXT" value="4"/>
-                       <member name="GTK_RC_BASE" value="8"/>
-               </flags>
-               <flags name="GtkRecentFilterFlags">
-                       <member name="GTK_RECENT_FILTER_URI" value="1"/>
-                       <member name="GTK_RECENT_FILTER_DISPLAY_NAME" value="2"/>
-                       <member name="GTK_RECENT_FILTER_MIME_TYPE" value="4"/>
-                       <member name="GTK_RECENT_FILTER_APPLICATION" value="8"/>
-                       <member name="GTK_RECENT_FILTER_GROUP" value="16"/>
-                       <member name="GTK_RECENT_FILTER_AGE" value="32"/>
-               </flags>
-               <flags name="GtkSignalRunType">
-                       <member name="GTK_RUN_FIRST" value="1"/>
-                       <member name="GTK_RUN_LAST" value="2"/>
-                       <member name="GTK_RUN_BOTH" value="3"/>
-                       <member name="GTK_RUN_NO_RECURSE" value="8"/>
-                       <member name="GTK_RUN_ACTION" value="32"/>
-                       <member name="GTK_RUN_NO_HOOKS" value="64"/>
-               </flags>
-               <flags name="GtkTargetFlags">
-                       <member name="GTK_TARGET_SAME_APP" value="1"/>
-                       <member name="GTK_TARGET_SAME_WIDGET" value="2"/>
-                       <member name="GTK_TARGET_OTHER_APP" value="4"/>
-                       <member name="GTK_TARGET_OTHER_WIDGET" value="8"/>
-               </flags>
-               <flags name="GtkTextSearchFlags">
-                       <member name="GTK_TEXT_SEARCH_VISIBLE_ONLY" value="1"/>
-                       <member name="GTK_TEXT_SEARCH_TEXT_ONLY" value="2"/>
-               </flags>
-               <flags name="GtkTreeModelFlags">
-                       <member name="GTK_TREE_MODEL_ITERS_PERSIST" value="1"/>
-                       <member name="GTK_TREE_MODEL_LIST_ONLY" value="2"/>
-               </flags>
-               <flags name="GtkUIManagerItemType">
-                       <member name="GTK_UI_MANAGER_AUTO" value="0"/>
-                       <member name="GTK_UI_MANAGER_MENUBAR" value="1"/>
-                       <member name="GTK_UI_MANAGER_MENU" value="2"/>
-                       <member name="GTK_UI_MANAGER_TOOLBAR" value="4"/>
-                       <member name="GTK_UI_MANAGER_PLACEHOLDER" value="8"/>
-                       <member name="GTK_UI_MANAGER_POPUP" value="16"/>
-                       <member name="GTK_UI_MANAGER_MENUITEM" value="32"/>
-                       <member name="GTK_UI_MANAGER_TOOLITEM" value="64"/>
-                       <member name="GTK_UI_MANAGER_SEPARATOR" value="128"/>
-                       <member name="GTK_UI_MANAGER_ACCELERATOR" value="256"/>
-               </flags>
-               <flags name="GtkWidgetFlags">
-                       <member name="GTK_TOPLEVEL" value="16"/>
-                       <member name="GTK_NO_WINDOW" value="32"/>
-                       <member name="GTK_REALIZED" value="64"/>
-                       <member name="GTK_MAPPED" value="128"/>
-                       <member name="GTK_VISIBLE" value="256"/>
-                       <member name="GTK_SENSITIVE" value="512"/>
-                       <member name="GTK_PARENT_SENSITIVE" value="1024"/>
-                       <member name="GTK_CAN_FOCUS" value="2048"/>
-                       <member name="GTK_HAS_FOCUS" value="4096"/>
-                       <member name="GTK_CAN_DEFAULT" value="8192"/>
-                       <member name="GTK_HAS_DEFAULT" value="16384"/>
-                       <member name="GTK_HAS_GRAB" value="32768"/>
-                       <member name="GTK_RC_STYLE" value="65536"/>
-                       <member name="GTK_COMPOSITE_CHILD" value="131072"/>
-                       <member name="GTK_NO_REPARENT" value="262144"/>
-                       <member name="GTK_APP_PAINTABLE" value="524288"/>
-                       <member name="GTK_RECEIVES_DEFAULT" value="1048576"/>
-                       <member name="GTK_DOUBLE_BUFFERED" value="2097152"/>
-                       <member name="GTK_NO_SHOW_ALL" value="4194304"/>
-               </flags>
-               <object name="GtkAboutDialog" parent="GtkDialog" type-name="GtkAboutDialog" get-type="gtk_about_dialog_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_artists" symbol="gtk_about_dialog_get_artists">
-                               <return-type type="gchar**"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_authors" symbol="gtk_about_dialog_get_authors">
-                               <return-type type="gchar**"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_comments" symbol="gtk_about_dialog_get_comments">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_copyright" symbol="gtk_about_dialog_get_copyright">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_documenters" symbol="gtk_about_dialog_get_documenters">
-                               <return-type type="gchar**"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_license" symbol="gtk_about_dialog_get_license">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_logo" symbol="gtk_about_dialog_get_logo">
-                               <return-type type="GdkPixbuf*"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_logo_icon_name" symbol="gtk_about_dialog_get_logo_icon_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_name" symbol="gtk_about_dialog_get_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_program_name" symbol="gtk_about_dialog_get_program_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_translator_credits" symbol="gtk_about_dialog_get_translator_credits">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_version" symbol="gtk_about_dialog_get_version">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_website" symbol="gtk_about_dialog_get_website">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_website_label" symbol="gtk_about_dialog_get_website_label">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_wrap_license" symbol="gtk_about_dialog_get_wrap_license">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_about_dialog_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="set_artists" symbol="gtk_about_dialog_set_artists">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="artists" type="gchar**"/>
-                               </parameters>
-                       </method>
-                       <method name="set_authors" symbol="gtk_about_dialog_set_authors">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="authors" type="gchar**"/>
-                               </parameters>
-                       </method>
-                       <method name="set_comments" symbol="gtk_about_dialog_set_comments">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="comments" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_copyright" symbol="gtk_about_dialog_set_copyright">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="copyright" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_documenters" symbol="gtk_about_dialog_set_documenters">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="documenters" type="gchar**"/>
-                               </parameters>
-                       </method>
-                       <method name="set_email_hook" symbol="gtk_about_dialog_set_email_hook">
-                               <return-type type="GtkAboutDialogActivateLinkFunc"/>
-                               <parameters>
-                                       <parameter name="func" type="GtkAboutDialogActivateLinkFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GDestroyNotify"/>
-                               </parameters>
-                       </method>
-                       <method name="set_license" symbol="gtk_about_dialog_set_license">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="license" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_logo" symbol="gtk_about_dialog_set_logo">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="logo" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_logo_icon_name" symbol="gtk_about_dialog_set_logo_icon_name">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_name" symbol="gtk_about_dialog_set_name">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_program_name" symbol="gtk_about_dialog_set_program_name">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_translator_credits" symbol="gtk_about_dialog_set_translator_credits">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="translator_credits" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_url_hook" symbol="gtk_about_dialog_set_url_hook">
-                               <return-type type="GtkAboutDialogActivateLinkFunc"/>
-                               <parameters>
-                                       <parameter name="func" type="GtkAboutDialogActivateLinkFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GDestroyNotify"/>
-                               </parameters>
-                       </method>
-                       <method name="set_version" symbol="gtk_about_dialog_set_version">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="version" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_website" symbol="gtk_about_dialog_set_website">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="website" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_website_label" symbol="gtk_about_dialog_set_website_label">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="website_label" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_wrap_license" symbol="gtk_about_dialog_set_wrap_license">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GtkAboutDialog*"/>
-                                       <parameter name="wrap_license" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <property name="artists" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="authors" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="comments" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="copyright" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="documenters" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="license" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="logo" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="logo-icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="program-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="translator-credits" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="version" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="website" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="website-label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="wrap-license" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkAccelGroup" parent="GObject" type-name="GtkAccelGroup" get-type="gtk_accel_group_get_type">
-                       <method name="activate" symbol="gtk_accel_group_activate">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                                       <parameter name="accel_quark" type="GQuark"/>
-                                       <parameter name="acceleratable" type="GObject*"/>
-                                       <parameter name="accel_key" type="guint"/>
-                                       <parameter name="accel_mods" type="GdkModifierType"/>
-                               </parameters>
-                       </method>
-                       <method name="connect" symbol="gtk_accel_group_connect">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                                       <parameter name="accel_key" type="guint"/>
-                                       <parameter name="accel_mods" type="GdkModifierType"/>
-                                       <parameter name="accel_flags" type="GtkAccelFlags"/>
-                                       <parameter name="closure" type="GClosure*"/>
-                               </parameters>
-                       </method>
-                       <method name="connect_by_path" symbol="gtk_accel_group_connect_by_path">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                                       <parameter name="accel_path" type="gchar*"/>
-                                       <parameter name="closure" type="GClosure*"/>
-                               </parameters>
-                       </method>
-                       <method name="disconnect" symbol="gtk_accel_group_disconnect">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                                       <parameter name="closure" type="GClosure*"/>
-                               </parameters>
-                       </method>
-                       <method name="disconnect_key" symbol="gtk_accel_group_disconnect_key">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                                       <parameter name="accel_key" type="guint"/>
-                                       <parameter name="accel_mods" type="GdkModifierType"/>
-                               </parameters>
-                       </method>
-                       <method name="find" symbol="gtk_accel_group_find">
-                               <return-type type="GtkAccelKey*"/>
-                               <parameters>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                                       <parameter name="find_func" type="GtkAccelGroupFindFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="from_accel_closure" symbol="gtk_accel_group_from_accel_closure">
-                               <return-type type="GtkAccelGroup*"/>
-                               <parameters>
-                                       <parameter name="closure" type="GClosure*"/>
-                               </parameters>
-                       </method>
-                       <method name="lock" symbol="gtk_accel_group_lock">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_accel_group_new">
-                               <return-type type="GtkAccelGroup*"/>
-                       </constructor>
-                       <method name="query" symbol="gtk_accel_group_query">
-                               <return-type type="GtkAccelGroupEntry*"/>
-                               <parameters>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                                       <parameter name="accel_key" type="guint"/>
-                                       <parameter name="accel_mods" type="GdkModifierType"/>
-                                       <parameter name="n_entries" type="guint*"/>
-                               </parameters>
-                       </method>
-                       <method name="unlock" symbol="gtk_accel_group_unlock">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                               </parameters>
-                       </method>
-                       <signal name="accel-activate" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="object" type="GtkAccelGroup*"/>
-                                       <parameter name="p0" type="GObject*"/>
-                                       <parameter name="p1" type="guint"/>
-                                       <parameter name="p2" type="GdkModifierType"/>
-                               </parameters>
-                       </signal>
-                       <signal name="accel-changed" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                                       <parameter name="keyval" type="guint"/>
-                                       <parameter name="modifier" type="GdkModifierType"/>
-                                       <parameter name="accel_closure" type="GClosure*"/>
-                               </parameters>
-                       </signal>
-                       <field name="lock_count" type="guint"/>
-                       <field name="modifier_mask" type="GdkModifierType"/>
-                       <field name="acceleratables" type="GSList*"/>
-                       <field name="n_accels" type="guint"/>
-               </object>
-               <object name="GtkAccelLabel" parent="GtkLabel" type-name="GtkAccelLabel" get-type="gtk_accel_label_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_accel_widget" symbol="gtk_accel_label_get_accel_widget">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="accel_label" type="GtkAccelLabel*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_accel_width" symbol="gtk_accel_label_get_accel_width">
-                               <return-type type="guint"/>
-                               <parameters>
-                                       <parameter name="accel_label" type="GtkAccelLabel*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_accel_label_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="string" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="refetch" symbol="gtk_accel_label_refetch">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="accel_label" type="GtkAccelLabel*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_accel_closure" symbol="gtk_accel_label_set_accel_closure">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="accel_label" type="GtkAccelLabel*"/>
-                                       <parameter name="accel_closure" type="GClosure*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_accel_widget" symbol="gtk_accel_label_set_accel_widget">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="accel_label" type="GtkAccelLabel*"/>
-                                       <parameter name="accel_widget" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <property name="accel-closure" type="GClosure*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="accel-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <field name="gtk_reserved" type="guint"/>
-                       <field name="accel_padding" type="guint"/>
-                       <field name="accel_widget" type="GtkWidget*"/>
-                       <field name="accel_closure" type="GClosure*"/>
-                       <field name="accel_group" type="GtkAccelGroup*"/>
-                       <field name="accel_string" type="gchar*"/>
-                       <field name="accel_string_width" type="guint16"/>
-               </object>
-               <object name="GtkAccelMap" parent="GObject" type-name="GtkAccelMap" get-type="gtk_accel_map_get_type">
-                       <method name="add_entry" symbol="gtk_accel_map_add_entry">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="accel_path" type="gchar*"/>
-                                       <parameter name="accel_key" type="guint"/>
-                                       <parameter name="accel_mods" type="GdkModifierType"/>
-                               </parameters>
-                       </method>
-                       <method name="add_filter" symbol="gtk_accel_map_add_filter">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="filter_pattern" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="change_entry" symbol="gtk_accel_map_change_entry">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="accel_path" type="gchar*"/>
-                                       <parameter name="accel_key" type="guint"/>
-                                       <parameter name="accel_mods" type="GdkModifierType"/>
-                                       <parameter name="replace" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="foreach" symbol="gtk_accel_map_foreach">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="foreach_func" type="GtkAccelMapForeach"/>
-                               </parameters>
-                       </method>
-                       <method name="foreach_unfiltered" symbol="gtk_accel_map_foreach_unfiltered">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="foreach_func" type="GtkAccelMapForeach"/>
-                               </parameters>
-                       </method>
-                       <method name="get" symbol="gtk_accel_map_get">
-                               <return-type type="GtkAccelMap*"/>
-                       </method>
-                       <method name="load" symbol="gtk_accel_map_load">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="file_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="load_fd" symbol="gtk_accel_map_load_fd">
+               <struct name="GtkAccelGroupEntry">
+                       <field name="key" type="GtkAccelKey"/>
+                       <field name="closure" type="GClosure*"/>
+                       <field name="accel_path_quark" type="GQuark"/>
+               </struct>
+               <struct name="GtkAccelKey">
+                       <field name="accel_key" type="guint"/>
+                       <field name="accel_mods" type="GdkModifierType"/>
+                       <field name="accel_flags" type="guint"/>
+               </struct>
+               <struct name="GtkAccelMapClass">
+               </struct>
+               <struct name="GtkActionEntry">
+                       <field name="name" type="gchar*"/>
+                       <field name="stock_id" type="gchar*"/>
+                       <field name="label" type="gchar*"/>
+                       <field name="accelerator" type="gchar*"/>
+                       <field name="tooltip" type="gchar*"/>
+                       <field name="callback" type="GCallback"/>
+               </struct>
+               <struct name="GtkAllocation">
+               </struct>
+               <struct name="GtkArg">
+               </struct>
+               <struct name="GtkBindingArg">
+                       <field name="arg_type" type="GType"/>
+                       <field name="d" type="gpointer"/>
+               </struct>
+               <struct name="GtkBindingEntry">
+                       <method name="add_signal" symbol="gtk_binding_entry_add_signal">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="fd" type="gint"/>
+                                       <parameter name="binding_set" type="GtkBindingSet*"/>
+                                       <parameter name="keyval" type="guint"/>
+                                       <parameter name="modifiers" type="GdkModifierType"/>
+                                       <parameter name="signal_name" type="gchar*"/>
+                                       <parameter name="n_args" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="load_scanner" symbol="gtk_accel_map_load_scanner">
+                       <method name="remove" symbol="gtk_binding_entry_remove">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="scanner" type="GScanner*"/>
+                                       <parameter name="binding_set" type="GtkBindingSet*"/>
+                                       <parameter name="keyval" type="guint"/>
+                                       <parameter name="modifiers" type="GdkModifierType"/>
                                </parameters>
                        </method>
-                       <method name="lock_path" symbol="gtk_accel_map_lock_path">
+                       <method name="skip" symbol="gtk_binding_entry_skip">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="accel_path" type="gchar*"/>
+                                       <parameter name="binding_set" type="GtkBindingSet*"/>
+                                       <parameter name="keyval" type="guint"/>
+                                       <parameter name="modifiers" type="GdkModifierType"/>
                                </parameters>
                        </method>
-                       <method name="lookup_entry" symbol="gtk_accel_map_lookup_entry">
+                       <field name="keyval" type="guint"/>
+                       <field name="modifiers" type="GdkModifierType"/>
+                       <field name="binding_set" type="GtkBindingSet*"/>
+                       <field name="destroyed" type="guint"/>
+                       <field name="in_emission" type="guint"/>
+                       <field name="marks_unbound" type="guint"/>
+                       <field name="set_next" type="GtkBindingEntry*"/>
+                       <field name="hash_next" type="GtkBindingEntry*"/>
+                       <field name="signals" type="GtkBindingSignal*"/>
+               </struct>
+               <struct name="GtkBindingSet">
+                       <method name="activate" symbol="gtk_binding_set_activate">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="accel_path" type="gchar*"/>
-                                       <parameter name="key" type="GtkAccelKey*"/>
-                               </parameters>
-                       </method>
-                       <method name="save" symbol="gtk_accel_map_save">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="file_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="save_fd" symbol="gtk_accel_map_save_fd">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fd" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="unlock_path" symbol="gtk_accel_map_unlock_path">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="accel_path" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <signal name="changed" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="object" type="GtkAccelMap*"/>
-                                       <parameter name="p0" type="char*"/>
-                                       <parameter name="p1" type="guint"/>
-                                       <parameter name="p2" type="GdkModifierType"/>
-                               </parameters>
-                       </signal>
-               </object>
-               <object name="GtkAccessible" parent="AtkObject" type-name="GtkAccessible" get-type="gtk_accessible_get_type">
-                       <method name="connect_widget_destroyed" symbol="gtk_accessible_connect_widget_destroyed">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="accessible" type="GtkAccessible*"/>
-                               </parameters>
-                       </method>
-                       <vfunc name="connect_widget_destroyed">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="accessible" type="GtkAccessible*"/>
-                               </parameters>
-                       </vfunc>
-                       <field name="widget" type="GtkWidget*"/>
-               </object>
-               <object name="GtkAction" parent="GObject" type-name="GtkAction" get-type="gtk_action_get_type">
-                       <implements>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="activate" symbol="gtk_action_activate">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                               </parameters>
-                       </method>
-                       <method name="block_activate_from" symbol="gtk_action_block_activate_from">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="proxy" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <method name="connect_accelerator" symbol="gtk_action_connect_accelerator">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="binding_set" type="GtkBindingSet*"/>
+                                       <parameter name="keyval" type="guint"/>
+                                       <parameter name="modifiers" type="GdkModifierType"/>
+                                       <parameter name="object" type="GtkObject*"/>
                                </parameters>
                        </method>
-                       <method name="connect_proxy" symbol="gtk_action_connect_proxy">
+                       <method name="add_path" symbol="gtk_binding_set_add_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="proxy" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <method name="create_icon" symbol="gtk_action_create_icon">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="icon_size" type="GtkIconSize"/>
-                               </parameters>
-                       </method>
-                       <method name="create_menu" symbol="gtk_action_create_menu">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="binding_set" type="GtkBindingSet*"/>
+                                       <parameter name="path_type" type="GtkPathType"/>
+                                       <parameter name="path_pattern" type="gchar*"/>
+                                       <parameter name="priority" type="GtkPathPriorityType"/>
                                </parameters>
                        </method>
-                       <method name="create_menu_item" symbol="gtk_action_create_menu_item">
-                               <return-type type="GtkWidget*"/>
+                       <method name="by_class" symbol="gtk_binding_set_by_class">
+                               <return-type type="GtkBindingSet*"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="object_class" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="create_tool_item" symbol="gtk_action_create_tool_item">
-                               <return-type type="GtkWidget*"/>
+                       <method name="find" symbol="gtk_binding_set_find">
+                               <return-type type="GtkBindingSet*"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="set_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="disconnect_accelerator" symbol="gtk_action_disconnect_accelerator">
-                               <return-type type="void"/>
+                       <method name="new" symbol="gtk_binding_set_new">
+                               <return-type type="GtkBindingSet*"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="set_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="disconnect_proxy" symbol="gtk_action_disconnect_proxy">
-                               <return-type type="void"/>
+                       <field name="set_name" type="gchar*"/>
+                       <field name="priority" type="gint"/>
+                       <field name="widget_path_pspecs" type="GSList*"/>
+                       <field name="widget_class_pspecs" type="GSList*"/>
+                       <field name="class_branch_pspecs" type="GSList*"/>
+                       <field name="entries" type="GtkBindingEntry*"/>
+                       <field name="current" type="GtkBindingEntry*"/>
+                       <field name="parsed" type="guint"/>
+               </struct>
+               <struct name="GtkBindingSignal">
+                       <field name="next" type="GtkBindingSignal*"/>
+                       <field name="signal_name" type="gchar*"/>
+                       <field name="n_args" type="guint"/>
+                       <field name="args" type="GtkBindingArg*"/>
+               </struct>
+               <struct name="GtkBoxChild">
+                       <field name="widget" type="GtkWidget*"/>
+                       <field name="padding" type="guint16"/>
+                       <field name="expand" type="guint"/>
+                       <field name="fill" type="guint"/>
+                       <field name="pack" type="guint"/>
+                       <field name="is_secondary" type="guint"/>
+               </struct>
+               <struct name="GtkFileFilterInfo">
+                       <field name="contains" type="GtkFileFilterFlags"/>
+                       <field name="filename" type="gchar*"/>
+                       <field name="uri" type="gchar*"/>
+                       <field name="display_name" type="gchar*"/>
+                       <field name="mime_type" type="gchar*"/>
+               </struct>
+               <struct name="GtkFixedChild">
+                       <field name="widget" type="GtkWidget*"/>
+                       <field name="x" type="gint"/>
+                       <field name="y" type="gint"/>
+               </struct>
+               <struct name="GtkIMContextInfo">
+                       <field name="context_id" type="gchar*"/>
+                       <field name="context_name" type="gchar*"/>
+                       <field name="domain" type="gchar*"/>
+                       <field name="domain_dirname" type="gchar*"/>
+                       <field name="default_locales" type="gchar*"/>
+               </struct>
+               <struct name="GtkImageAnimationData">
+                       <field name="anim" type="GdkPixbufAnimation*"/>
+                       <field name="iter" type="GdkPixbufAnimationIter*"/>
+                       <field name="frame_timeout" type="guint"/>
+               </struct>
+               <struct name="GtkImageIconNameData">
+                       <field name="icon_name" type="gchar*"/>
+                       <field name="pixbuf" type="GdkPixbuf*"/>
+                       <field name="theme_change_id" type="guint"/>
+               </struct>
+               <struct name="GtkImageIconSetData">
+                       <field name="icon_set" type="GtkIconSet*"/>
+               </struct>
+               <struct name="GtkImageImageData">
+                       <field name="image" type="GdkImage*"/>
+               </struct>
+               <struct name="GtkImagePixbufData">
+                       <field name="pixbuf" type="GdkPixbuf*"/>
+               </struct>
+               <struct name="GtkImagePixmapData">
+                       <field name="pixmap" type="GdkPixmap*"/>
+               </struct>
+               <struct name="GtkImageStockData">
+                       <field name="stock_id" type="gchar*"/>
+               </struct>
+               <struct name="GtkLabelSelectionInfo">
+               </struct>
+               <struct name="GtkNotebookPage">
+                       <method name="num" symbol="gtk_notebook_page_num">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="proxy" type="GtkWidget*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_accel_closure" symbol="gtk_action_get_accel_closure">
-                               <return-type type="GClosure*"/>
+               </struct>
+               <struct name="GtkPageRange">
+                       <field name="start" type="gint"/>
+                       <field name="end" type="gint"/>
+               </struct>
+               <struct name="GtkProgress">
+                       <field name="widget" type="GtkWidget"/>
+                       <field name="adjustment" type="GtkAdjustment*"/>
+                       <field name="offscreen_pixmap" type="GdkPixmap*"/>
+                       <field name="format" type="gchar*"/>
+                       <field name="x_align" type="gfloat"/>
+                       <field name="y_align" type="gfloat"/>
+                       <field name="show_text" type="guint"/>
+                       <field name="activity_mode" type="guint"/>
+                       <field name="use_text_format" type="guint"/>
+               </struct>
+               <struct name="GtkProgressClass">
+                       <field name="parent_class" type="GtkWidgetClass"/>
+                       <field name="paint" type="GCallback"/>
+                       <field name="update" type="GCallback"/>
+                       <field name="act_mode_enter" type="GCallback"/>
+                       <field name="_gtk_reserved1" type="GCallback"/>
+                       <field name="_gtk_reserved2" type="GCallback"/>
+                       <field name="_gtk_reserved3" type="GCallback"/>
+                       <field name="_gtk_reserved4" type="GCallback"/>
+               </struct>
+               <struct name="GtkRadioActionEntry">
+                       <field name="name" type="gchar*"/>
+                       <field name="stock_id" type="gchar*"/>
+                       <field name="label" type="gchar*"/>
+                       <field name="accelerator" type="gchar*"/>
+                       <field name="tooltip" type="gchar*"/>
+                       <field name="value" type="gint"/>
+               </struct>
+               <struct name="GtkRangeLayout">
+               </struct>
+               <struct name="GtkRangeStepTimer">
+               </struct>
+               <struct name="GtkRcContext">
+               </struct>
+               <struct name="GtkRcProperty">
+                       <method name="parse_border" symbol="gtk_rc_property_parse_border">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="gstring" type="GString*"/>
+                                       <parameter name="property_value" type="GValue*"/>
                                </parameters>
                        </method>
-                       <method name="get_accel_path" symbol="gtk_action_get_accel_path">
-                               <return-type type="gchar*"/>
+                       <method name="parse_color" symbol="gtk_rc_property_parse_color">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="gstring" type="GString*"/>
+                                       <parameter name="property_value" type="GValue*"/>
                                </parameters>
                        </method>
-                       <method name="get_name" symbol="gtk_action_get_name">
-                               <return-type type="gchar*"/>
+                       <method name="parse_enum" symbol="gtk_rc_property_parse_enum">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="gstring" type="GString*"/>
+                                       <parameter name="property_value" type="GValue*"/>
                                </parameters>
                        </method>
-                       <method name="get_proxies" symbol="gtk_action_get_proxies">
-                               <return-type type="GSList*"/>
+                       <method name="parse_flags" symbol="gtk_rc_property_parse_flags">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="gstring" type="GString*"/>
+                                       <parameter name="property_value" type="GValue*"/>
                                </parameters>
                        </method>
-                       <method name="get_sensitive" symbol="gtk_action_get_sensitive">
+                       <method name="parse_requisition" symbol="gtk_rc_property_parse_requisition">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="gstring" type="GString*"/>
+                                       <parameter name="property_value" type="GValue*"/>
                                </parameters>
                        </method>
-                       <method name="get_visible" symbol="gtk_action_get_visible">
-                               <return-type type="gboolean"/>
+                       <field name="type_name" type="GQuark"/>
+                       <field name="property_name" type="GQuark"/>
+                       <field name="origin" type="gchar*"/>
+                       <field name="value" type="GValue"/>
+               </struct>
+               <struct name="GtkRecentData">
+                       <field name="display_name" type="gchar*"/>
+                       <field name="description" type="gchar*"/>
+                       <field name="mime_type" type="gchar*"/>
+                       <field name="app_name" type="gchar*"/>
+                       <field name="app_exec" type="gchar*"/>
+                       <field name="groups" type="gchar**"/>
+                       <field name="is_private" type="gboolean"/>
+               </struct>
+               <struct name="GtkRecentFilterInfo">
+                       <field name="contains" type="GtkRecentFilterFlags"/>
+                       <field name="uri" type="gchar*"/>
+                       <field name="display_name" type="gchar*"/>
+                       <field name="mime_type" type="gchar*"/>
+                       <field name="applications" type="gchar**"/>
+                       <field name="groups" type="gchar**"/>
+                       <field name="age" 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"/>
+               </struct>
+               <struct name="GtkStockItem">
+                       <method name="copy" symbol="gtk_stock_item_copy">
+                               <return-type type="GtkStockItem*"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="item" type="GtkStockItem*"/>
                                </parameters>
                        </method>
-                       <method name="is_sensitive" symbol="gtk_action_is_sensitive">
-                               <return-type type="gboolean"/>
+                       <method name="free" symbol="gtk_stock_item_free">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="item" type="GtkStockItem*"/>
                                </parameters>
                        </method>
-                       <method name="is_visible" symbol="gtk_action_is_visible">
-                               <return-type type="gboolean"/>
+                       <field name="stock_id" type="gchar*"/>
+                       <field name="label" type="gchar*"/>
+                       <field name="modifier" type="GdkModifierType"/>
+                       <field name="keyval" type="guint"/>
+                       <field name="translation_domain" type="gchar*"/>
+               </struct>
+               <struct name="GtkTableChild">
+                       <field name="widget" type="GtkWidget*"/>
+                       <field name="left_attach" type="guint16"/>
+                       <field name="right_attach" type="guint16"/>
+                       <field name="top_attach" type="guint16"/>
+                       <field name="bottom_attach" type="guint16"/>
+                       <field name="xpadding" type="guint16"/>
+                       <field name="ypadding" type="guint16"/>
+                       <field name="xexpand" type="guint"/>
+                       <field name="yexpand" type="guint"/>
+                       <field name="xshrink" type="guint"/>
+                       <field name="yshrink" type="guint"/>
+                       <field name="xfill" type="guint"/>
+                       <field name="yfill" type="guint"/>
+               </struct>
+               <struct name="GtkTableRowCol">
+                       <field name="requisition" type="guint16"/>
+                       <field name="allocation" type="guint16"/>
+                       <field name="spacing" type="guint16"/>
+                       <field name="need_expand" type="guint"/>
+                       <field name="need_shrink" type="guint"/>
+                       <field name="expand" type="guint"/>
+                       <field name="shrink" type="guint"/>
+                       <field name="empty" type="guint"/>
+               </struct>
+               <struct name="GtkTargetEntry">
+                       <field name="target" type="gchar*"/>
+                       <field name="flags" type="guint"/>
+                       <field name="info" type="guint"/>
+               </struct>
+               <struct name="GtkTargetPair">
+                       <field name="target" type="GdkAtom"/>
+                       <field name="flags" type="guint"/>
+                       <field name="info" type="guint"/>
+               </struct>
+               <struct name="GtkTextAppearance">
+                       <field name="bg_color" type="GdkColor"/>
+                       <field name="fg_color" type="GdkColor"/>
+                       <field name="bg_stipple" type="GdkBitmap*"/>
+                       <field name="fg_stipple" type="GdkBitmap*"/>
+                       <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"/>
+               </struct>
+               <struct name="GtkTextBTree">
+               </struct>
+               <struct name="GtkTextLogAttrCache">
+               </struct>
+               <struct name="GtkTextPendingScroll">
+               </struct>
+               <struct name="GtkTextWindow">
+               </struct>
+               <struct name="GtkThemeEngine">
+               </struct>
+               <struct name="GtkToggleActionEntry">
+                       <field name="name" type="gchar*"/>
+                       <field name="stock_id" type="gchar*"/>
+                       <field name="label" type="gchar*"/>
+                       <field name="accelerator" type="gchar*"/>
+                       <field name="tooltip" type="gchar*"/>
+                       <field name="callback" type="GCallback"/>
+                       <field name="is_active" type="gboolean"/>
+               </struct>
+               <struct name="GtkType">
+                       <method name="class" symbol="gtk_type_class">
+                               <return-type type="gpointer"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="type" type="GtkType"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_action_new">
-                               <return-type type="GtkAction*"/>
-                               <parameters>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="label" type="gchar*"/>
-                                       <parameter name="tooltip" type="gchar*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_accel_group" symbol="gtk_action_set_accel_group">
-                               <return-type type="void"/>
+               </struct>
+               <struct name="GtkWidgetAuxInfo">
+                       <field name="x" type="gint"/>
+                       <field name="y" type="gint"/>
+                       <field name="width" type="gint"/>
+                       <field name="height" type="gint"/>
+                       <field name="x_set" type="guint"/>
+                       <field name="y_set" type="guint"/>
+               </struct>
+               <struct name="GtkWidgetShapeInfo">
+                       <field name="offset_x" type="gint16"/>
+                       <field name="offset_y" type="gint16"/>
+                       <field name="shape_mask" type="GdkBitmap*"/>
+               </struct>
+               <struct name="GtkWindowGeometryInfo">
+               </struct>
+               <boxed name="GtkBorder" type-name="GtkBorder" get-type="gtk_border_get_type">
+                       <method name="copy" symbol="gtk_border_copy">
+                               <return-type type="GtkBorder*"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="border_" type="GtkBorder*"/>
                                </parameters>
                        </method>
-                       <method name="set_accel_path" symbol="gtk_action_set_accel_path">
+                       <method name="free" symbol="gtk_border_free">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="accel_path" type="gchar*"/>
+                                       <parameter name="border_" type="GtkBorder*"/>
                                </parameters>
                        </method>
-                       <method name="set_sensitive" symbol="gtk_action_set_sensitive">
-                               <return-type type="void"/>
+                       <field name="left" type="gint"/>
+                       <field name="right" type="gint"/>
+                       <field name="top" type="gint"/>
+                       <field name="bottom" type="gint"/>
+               </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*"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="sensitive" type="gboolean"/>
+                                       <parameter name="icon_info" type="GtkIconInfo*"/>
                                </parameters>
                        </method>
-                       <method name="set_visible" symbol="gtk_action_set_visible">
+                       <method name="free" symbol="gtk_icon_info_free">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="visible" type="gboolean"/>
+                                       <parameter name="icon_info" type="GtkIconInfo*"/>
                                </parameters>
                        </method>
-                       <method name="unblock_activate_from" symbol="gtk_action_unblock_activate_from">
-                               <return-type type="void"/>
+                       <method name="get_attach_points" symbol="gtk_icon_info_get_attach_points">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="proxy" type="GtkWidget*"/>
+                                       <parameter name="icon_info" type="GtkIconInfo*"/>
+                                       <parameter name="points" type="GdkPoint**"/>
+                                       <parameter name="n_points" type="gint*"/>
                                </parameters>
                        </method>
-                       <property name="action-group" type="GtkActionGroup*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="hide-if-empty" 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="is-important" type="gboolean" 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="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="short-label" 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="tooltip" 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"/>
-                       <property name="visible-horizontal" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="visible-overflown" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="visible-vertical" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="activate" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                               </parameters>
-                       </signal>
-                       <vfunc name="connect_proxy">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="proxy" type="GtkWidget*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="create_menu">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="create_menu_item">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="create_tool_item">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="disconnect_proxy">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="proxy" type="GtkWidget*"/>
-                               </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkActionGroup" parent="GObject" type-name="GtkActionGroup" get-type="gtk_action_group_get_type">
-                       <implements>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="add_action" symbol="gtk_action_group_add_action">
-                               <return-type type="void"/>
+                       <method name="get_base_size" symbol="gtk_icon_info_get_base_size">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="icon_info" type="GtkIconInfo*"/>
                                </parameters>
                        </method>
-                       <method name="add_action_with_accel" symbol="gtk_action_group_add_action_with_accel">
-                               <return-type type="void"/>
+                       <method name="get_builtin_pixbuf" symbol="gtk_icon_info_get_builtin_pixbuf">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="action" type="GtkAction*"/>
-                                       <parameter name="accelerator" type="gchar*"/>
+                                       <parameter name="icon_info" type="GtkIconInfo*"/>
                                </parameters>
                        </method>
-                       <method name="add_actions" symbol="gtk_action_group_add_actions">
-                               <return-type type="void"/>
+                       <method name="get_display_name" symbol="gtk_icon_info_get_display_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="entries" type="GtkActionEntry*"/>
-                                       <parameter name="n_entries" type="guint"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="icon_info" type="GtkIconInfo*"/>
                                </parameters>
                        </method>
-                       <method name="add_actions_full" symbol="gtk_action_group_add_actions_full">
-                               <return-type type="void"/>
+                       <method name="get_embedded_rect" symbol="gtk_icon_info_get_embedded_rect">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="entries" type="GtkActionEntry*"/>
-                                       <parameter name="n_entries" type="guint"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                                       <parameter name="destroy" type="GDestroyNotify"/>
+                                       <parameter name="icon_info" type="GtkIconInfo*"/>
+                                       <parameter name="rectangle" type="GdkRectangle*"/>
                                </parameters>
                        </method>
-                       <method name="add_radio_actions" symbol="gtk_action_group_add_radio_actions">
-                               <return-type type="void"/>
+                       <method name="get_filename" symbol="gtk_icon_info_get_filename">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="entries" type="GtkRadioActionEntry*"/>
-                                       <parameter name="n_entries" type="guint"/>
-                                       <parameter name="value" type="gint"/>
-                                       <parameter name="on_change" type="GCallback"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="icon_info" type="GtkIconInfo*"/>
                                </parameters>
                        </method>
-                       <method name="add_radio_actions_full" symbol="gtk_action_group_add_radio_actions_full">
-                               <return-type type="void"/>
+                       <method name="load_icon" symbol="gtk_icon_info_load_icon">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="entries" type="GtkRadioActionEntry*"/>
-                                       <parameter name="n_entries" type="guint"/>
-                                       <parameter name="value" type="gint"/>
-                                       <parameter name="on_change" type="GCallback"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                                       <parameter name="destroy" type="GDestroyNotify"/>
+                                       <parameter name="icon_info" type="GtkIconInfo*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="add_toggle_actions" symbol="gtk_action_group_add_toggle_actions">
+                       <method name="set_raw_coordinates" symbol="gtk_icon_info_set_raw_coordinates">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="entries" type="GtkToggleActionEntry*"/>
-                                       <parameter name="n_entries" type="guint"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="icon_info" type="GtkIconInfo*"/>
+                                       <parameter name="raw_coordinates" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="add_toggle_actions_full" symbol="gtk_action_group_add_toggle_actions_full">
+               </boxed>
+               <boxed name="GtkIconSet" type-name="GtkIconSet" get-type="gtk_icon_set_get_type">
+                       <method name="add_source" symbol="gtk_icon_set_add_source">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="entries" type="GtkToggleActionEntry*"/>
-                                       <parameter name="n_entries" type="guint"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                                       <parameter name="destroy" type="GDestroyNotify"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
                                </parameters>
                        </method>
-                       <method name="get_action" symbol="gtk_action_group_get_action">
-                               <return-type type="GtkAction*"/>
+                       <method name="copy" symbol="gtk_icon_set_copy">
+                               <return-type type="GtkIconSet*"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="action_name" type="gchar*"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
                                </parameters>
                        </method>
-                       <method name="get_name" symbol="gtk_action_group_get_name">
-                               <return-type type="gchar*"/>
+                       <method name="get_sizes" symbol="gtk_icon_set_get_sizes">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
+                                       <parameter name="sizes" type="GtkIconSize**"/>
+                                       <parameter name="n_sizes" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="get_sensitive" symbol="gtk_action_group_get_sensitive">
-                               <return-type type="gboolean"/>
+                       <constructor name="new" symbol="gtk_icon_set_new">
+                               <return-type type="GtkIconSet*"/>
+                       </constructor>
+                       <constructor name="new_from_pixbuf" symbol="gtk_icon_set_new_from_pixbuf">
+                               <return-type type="GtkIconSet*"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
-                       </method>
-                       <method name="get_visible" symbol="gtk_action_group_get_visible">
-                               <return-type type="gboolean"/>
+                       </constructor>
+                       <method name="ref" symbol="gtk_icon_set_ref">
+                               <return-type type="GtkIconSet*"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
                                </parameters>
                        </method>
-                       <method name="list_actions" symbol="gtk_action_group_list_actions">
-                               <return-type type="GList*"/>
+                       <method name="render_icon" symbol="gtk_icon_set_render_icon">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
+                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="direction" type="GtkTextDirection"/>
+                                       <parameter name="state" type="GtkStateType"/>
+                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="detail" type="char*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_action_group_new">
-                               <return-type type="GtkActionGroup*"/>
-                               <parameters>
-                                       <parameter name="name" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="remove_action" symbol="gtk_action_group_remove_action">
+                       <method name="unref" symbol="gtk_icon_set_unref">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
                                </parameters>
                        </method>
-                       <method name="set_sensitive" symbol="gtk_action_group_set_sensitive">
-                               <return-type type="void"/>
+               </boxed>
+               <boxed name="GtkIconSource" type-name="GtkIconSource" get-type="gtk_icon_source_get_type">
+                       <method name="copy" symbol="gtk_icon_source_copy">
+                               <return-type type="GtkIconSource*"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="sensitive" type="gboolean"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
                                </parameters>
                        </method>
-                       <method name="set_translate_func" symbol="gtk_action_group_set_translate_func">
+                       <method name="free" symbol="gtk_icon_source_free">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="func" type="GtkTranslateFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="notify" type="GtkDestroyNotify"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
                                </parameters>
                        </method>
-                       <method name="set_translation_domain" symbol="gtk_action_group_set_translation_domain">
-                               <return-type type="void"/>
+                       <method name="get_direction" symbol="gtk_icon_source_get_direction">
+                               <return-type type="GtkTextDirection"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="domain" type="gchar*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
                                </parameters>
                        </method>
-                       <method name="set_visible" symbol="gtk_action_group_set_visible">
-                               <return-type type="void"/>
+                       <method name="get_direction_wildcarded" symbol="gtk_icon_source_get_direction_wildcarded">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="visible" type="gboolean"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
                                </parameters>
                        </method>
-                       <method name="translate_string" symbol="gtk_action_group_translate_string">
+                       <method name="get_filename" symbol="gtk_icon_source_get_filename">
                                <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="string" type="gchar*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
                                </parameters>
                        </method>
-                       <property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <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"/>
-                       <signal name="connect-proxy" when="LAST">
-                               <return-type type="void"/>
+                       <method name="get_icon_name" symbol="gtk_icon_source_get_icon_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="object" type="GtkActionGroup*"/>
-                                       <parameter name="p0" type="GtkAction*"/>
-                                       <parameter name="p1" type="GtkWidget*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
                                </parameters>
-                       </signal>
-                       <signal name="disconnect-proxy" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_pixbuf" symbol="gtk_icon_source_get_pixbuf">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="object" type="GtkActionGroup*"/>
-                                       <parameter name="p0" type="GtkAction*"/>
-                                       <parameter name="p1" type="GtkWidget*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
                                </parameters>
-                       </signal>
-                       <signal name="post-activate" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_size" symbol="gtk_icon_source_get_size">
+                               <return-type type="GtkIconSize"/>
                                <parameters>
-                                       <parameter name="object" type="GtkActionGroup*"/>
-                                       <parameter name="p0" type="GtkAction*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
                                </parameters>
-                       </signal>
-                       <signal name="pre-activate" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_size_wildcarded" symbol="gtk_icon_source_get_size_wildcarded">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="object" type="GtkActionGroup*"/>
-                                       <parameter name="p0" type="GtkAction*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="get_action">
-                               <return-type type="GtkAction*"/>
+                       </method>
+                       <method name="get_state" symbol="gtk_icon_source_get_state">
+                               <return-type type="GtkStateType"/>
                                <parameters>
-                                       <parameter name="action_group" type="GtkActionGroup*"/>
-                                       <parameter name="action_name" type="gchar*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
                                </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkAdjustment" parent="GtkObject" type-name="GtkAdjustment" get-type="gtk_adjustment_get_type">
-                       <method name="changed" symbol="gtk_adjustment_changed">
+                       </method>
+                       <method name="get_state_wildcarded" symbol="gtk_icon_source_get_state_wildcarded">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_icon_source_new">
+                               <return-type type="GtkIconSource*"/>
+                       </constructor>
+                       <method name="set_direction" symbol="gtk_icon_source_set_direction">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="direction" type="GtkTextDirection"/>
                                </parameters>
                        </method>
-                       <method name="clamp_page" symbol="gtk_adjustment_clamp_page">
+                       <method name="set_direction_wildcarded" symbol="gtk_icon_source_set_direction_wildcarded">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
-                                       <parameter name="lower" type="gdouble"/>
-                                       <parameter name="upper" type="gdouble"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_value" symbol="gtk_adjustment_get_value">
-                               <return-type type="gdouble"/>
+                       <method name="set_filename" symbol="gtk_icon_source_set_filename">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="filename" type="gchar*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_adjustment_new">
-                               <return-type type="GtkObject*"/>
+                       <method name="set_icon_name" symbol="gtk_icon_source_set_icon_name">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="value" type="gdouble"/>
-                                       <parameter name="lower" type="gdouble"/>
-                                       <parameter name="upper" type="gdouble"/>
-                                       <parameter name="step_increment" type="gdouble"/>
-                                       <parameter name="page_increment" type="gdouble"/>
-                                       <parameter name="page_size" type="gdouble"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_value" symbol="gtk_adjustment_set_value">
+                       </method>
+                       <method name="set_pixbuf" symbol="gtk_icon_source_set_pixbuf">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
-                                       <parameter name="value" type="gdouble"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
                        </method>
-                       <method name="value_changed" symbol="gtk_adjustment_value_changed">
+                       <method name="set_size" symbol="gtk_icon_source_set_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
                        </method>
-                       <property name="lower" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="page-increment" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="page-size" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="step-increment" 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"/>
-                       <property name="value" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="changed" when="FIRST">
+                       <method name="set_size_wildcarded" symbol="gtk_icon_source_set_size_wildcarded">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
-                       </signal>
-                       <signal name="value-changed" when="FIRST">
+                       </method>
+                       <method name="set_state" symbol="gtk_icon_source_set_state">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="state" type="GtkStateType"/>
                                </parameters>
-                       </signal>
-                       <field name="lower" type="gdouble"/>
-                       <field name="upper" type="gdouble"/>
-                       <field name="value" type="gdouble"/>
-                       <field name="step_increment" type="gdouble"/>
-                       <field name="page_increment" type="gdouble"/>
-                       <field name="page_size" type="gdouble"/>
-               </object>
-               <object name="GtkAlignment" parent="GtkBin" type-name="GtkAlignment" get-type="gtk_alignment_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_padding" symbol="gtk_alignment_get_padding">
+                       </method>
+                       <method name="set_state_wildcarded" symbol="gtk_icon_source_set_state_wildcarded">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="alignment" type="GtkAlignment*"/>
-                                       <parameter name="padding_top" type="guint*"/>
-                                       <parameter name="padding_bottom" type="guint*"/>
-                                       <parameter name="padding_left" type="guint*"/>
-                                       <parameter name="padding_right" type="guint*"/>
+                                       <parameter name="source" type="GtkIconSource*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_alignment_new">
-                               <return-type type="GtkWidget*"/>
+               </boxed>
+               <boxed name="GtkPaperSize" type-name="GtkPaperSize" get-type="gtk_paper_size_get_type">
+                       <method name="copy" symbol="gtk_paper_size_copy">
+                               <return-type type="GtkPaperSize*"/>
                                <parameters>
-                                       <parameter name="xalign" type="gfloat"/>
-                                       <parameter name="yalign" type="gfloat"/>
-                                       <parameter name="xscale" type="gfloat"/>
-                                       <parameter name="yscale" type="gfloat"/>
+                                       <parameter name="other" type="GtkPaperSize*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set" symbol="gtk_alignment_set">
+                       </method>
+                       <method name="free" symbol="gtk_paper_size_free">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="alignment" type="GtkAlignment*"/>
-                                       <parameter name="xalign" type="gfloat"/>
-                                       <parameter name="yalign" type="gfloat"/>
-                                       <parameter name="xscale" type="gfloat"/>
-                                       <parameter name="yscale" type="gfloat"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
                                </parameters>
                        </method>
-                       <method name="set_padding" symbol="gtk_alignment_set_padding">
-                               <return-type type="void"/>
+                       <method name="get_default" symbol="gtk_paper_size_get_default">
+                               <return-type type="gchar*"/>
+                       </method>
+                       <method name="get_default_bottom_margin" symbol="gtk_paper_size_get_default_bottom_margin">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="alignment" type="GtkAlignment*"/>
-                                       <parameter name="padding_top" type="guint"/>
-                                       <parameter name="padding_bottom" type="guint"/>
-                                       <parameter name="padding_left" type="guint"/>
-                                       <parameter name="padding_right" type="guint"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <property name="bottom-padding" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="left-padding" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="right-padding" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="top-padding" type="guint" 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="xscale" type="gfloat" 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="yscale" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <field name="xalign" type="gfloat"/>
-                       <field name="yalign" type="gfloat"/>
-                       <field name="xscale" type="gfloat"/>
-                       <field name="yscale" type="gfloat"/>
-               </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*"/>
+                       <method name="get_default_left_margin" symbol="gtk_paper_size_get_default_left_margin">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="arrow_type" type="GtkArrowType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
-                       </constructor>
-                       <method name="set" symbol="gtk_arrow_set">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_default_right_margin" symbol="gtk_paper_size_get_default_right_margin">
+                               <return-type type="gdouble"/>
+                               <parameters>
+                                       <parameter name="size" type="GtkPaperSize*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
+                               </parameters>
+                       </method>
+                       <method name="get_default_top_margin" symbol="gtk_paper_size_get_default_top_margin">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="arrow" type="GtkArrow*"/>
-                                       <parameter name="arrow_type" type="GtkArrowType"/>
-                                       <parameter name="shadow_type" type="GtkShadowType"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </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"/>
-                       <field name="arrow_type" type="gint16"/>
-                       <field name="shadow_type" type="gint16"/>
-               </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*"/>
+                       <method name="get_display_name" symbol="gtk_paper_size_get_display_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
-                                       <parameter name="xalign" type="gfloat"/>
-                                       <parameter name="yalign" type="gfloat"/>
-                                       <parameter name="ratio" type="gfloat"/>
-                                       <parameter name="obey_child" type="gboolean"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set" symbol="gtk_aspect_frame_set">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_height" symbol="gtk_paper_size_get_height">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="aspect_frame" type="GtkAspectFrame*"/>
-                                       <parameter name="xalign" type="gfloat"/>
-                                       <parameter name="yalign" type="gfloat"/>
-                                       <parameter name="ratio" type="gfloat"/>
-                                       <parameter name="obey_child" type="gboolean"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <property name="obey-child" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="ratio" type="gfloat" 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="yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <field name="xalign" type="gfloat"/>
-                       <field name="yalign" type="gfloat"/>
-                       <field name="ratio" type="gfloat"/>
-                       <field name="obey_child" type="gboolean"/>
-                       <field name="center_allocation" type="GtkAllocation"/>
-               </object>
-               <object name="GtkAssistant" parent="GtkWindow" type-name="GtkAssistant" get-type="gtk_assistant_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="add_action_widget" symbol="gtk_assistant_add_action_widget">
-                               <return-type type="void"/>
+                       <method name="get_name" symbol="gtk_paper_size_get_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
                                </parameters>
                        </method>
-                       <method name="append_page" symbol="gtk_assistant_append_page">
-                               <return-type type="gint"/>
+                       <method name="get_paper_sizes" symbol="gtk_paper_size_get_paper_sizes">
+                               <return-type type="GList*"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="include_custom" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_current_page" symbol="gtk_assistant_get_current_page">
-                               <return-type type="gint"/>
+                       <method name="get_ppd_name" symbol="gtk_paper_size_get_ppd_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
                                </parameters>
                        </method>
-                       <method name="get_n_pages" symbol="gtk_assistant_get_n_pages">
-                               <return-type type="gint"/>
+                       <method name="get_width" symbol="gtk_paper_size_get_width">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="get_nth_page" symbol="gtk_assistant_get_nth_page">
-                               <return-type type="GtkWidget*"/>
+                       <method name="is_custom" symbol="gtk_paper_size_is_custom">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page_num" type="gint"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
                                </parameters>
                        </method>
-                       <method name="get_page_complete" symbol="gtk_assistant_get_page_complete">
+                       <method name="is_equal" symbol="gtk_paper_size_is_equal">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="size1" type="GtkPaperSize*"/>
+                                       <parameter name="size2" type="GtkPaperSize*"/>
                                </parameters>
                        </method>
-                       <method name="get_page_header_image" symbol="gtk_assistant_get_page_header_image">
-                               <return-type type="GdkPixbuf*"/>
+                       <constructor name="new" symbol="gtk_paper_size_new">
+                               <return-type type="GtkPaperSize*"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="name" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_custom" symbol="gtk_paper_size_new_custom">
+                               <return-type type="GtkPaperSize*"/>
+                               <parameters>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="display_name" type="gchar*"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                                       <parameter name="unit" type="GtkUnit"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_from_key_file" symbol="gtk_paper_size_new_from_key_file">
+                               <return-type type="GtkPaperSize*"/>
+                               <parameters>
+                                       <parameter name="key_file" type="GKeyFile*"/>
+                                       <parameter name="group_name" type="gchar*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_from_ppd" symbol="gtk_paper_size_new_from_ppd">
+                               <return-type type="GtkPaperSize*"/>
+                               <parameters>
+                                       <parameter name="ppd_name" type="gchar*"/>
+                                       <parameter name="ppd_display_name" type="gchar*"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_size" symbol="gtk_paper_size_set_size">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="size" type="GtkPaperSize*"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="height" type="gdouble"/>
+                                       <parameter name="unit" type="GtkUnit"/>
                                </parameters>
                        </method>
-                       <method name="get_page_side_image" symbol="gtk_assistant_get_page_side_image">
-                               <return-type type="GdkPixbuf*"/>
+                       <method name="to_key_file" symbol="gtk_paper_size_to_key_file">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="size" type="GtkPaperSize*"/>
+                                       <parameter name="key_file" type="GKeyFile*"/>
+                                       <parameter name="group_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_page_title" symbol="gtk_assistant_get_page_title">
-                               <return-type type="gchar*"/>
+               </boxed>
+               <boxed name="GtkRecentInfo" type-name="GtkRecentInfo" get-type="gtk_recent_info_get_type">
+                       <method name="exists" symbol="gtk_recent_info_exists">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="get_page_type" symbol="gtk_assistant_get_page_type">
-                               <return-type type="GtkAssistantPageType"/>
+                       <method name="get_added" symbol="gtk_recent_info_get_added">
+                               <return-type type="time_t"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="insert_page" symbol="gtk_assistant_insert_page">
+                       <method name="get_age" symbol="gtk_recent_info_get_age">
                                <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_assistant_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="prepend_page" symbol="gtk_assistant_prepend_page">
-                               <return-type type="gint"/>
+                       <method name="get_application_info" symbol="gtk_recent_info_get_application_info">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
+                                       <parameter name="app_name" type="gchar*"/>
+                                       <parameter name="app_exec" type="gchar**"/>
+                                       <parameter name="count" type="guint*"/>
+                                       <parameter name="time_" type="time_t*"/>
                                </parameters>
                        </method>
-                       <method name="remove_action_widget" symbol="gtk_assistant_remove_action_widget">
-                               <return-type type="void"/>
+                       <method name="get_applications" symbol="gtk_recent_info_get_applications">
+                               <return-type type="gchar**"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
+                                       <parameter name="length" type="gsize*"/>
                                </parameters>
                        </method>
-                       <method name="set_current_page" symbol="gtk_assistant_set_current_page">
-                               <return-type type="void"/>
+                       <method name="get_description" symbol="gtk_recent_info_get_description">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page_num" type="gint"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="set_forward_page_func" symbol="gtk_assistant_set_forward_page_func">
-                               <return-type type="void"/>
+                       <method name="get_display_name" symbol="gtk_recent_info_get_display_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page_func" type="GtkAssistantPageFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GDestroyNotify"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="set_page_complete" symbol="gtk_assistant_set_page_complete">
-                               <return-type type="void"/>
+                       <method name="get_groups" symbol="gtk_recent_info_get_groups">
+                               <return-type type="gchar**"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
-                                       <parameter name="complete" type="gboolean"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
+                                       <parameter name="length" type="gsize*"/>
                                </parameters>
                        </method>
-                       <method name="set_page_header_image" symbol="gtk_assistant_set_page_header_image">
-                               <return-type type="void"/>
+                       <method name="get_icon" symbol="gtk_recent_info_get_icon">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
+                                       <parameter name="size" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_page_side_image" symbol="gtk_assistant_set_page_side_image">
-                               <return-type type="void"/>
+                       <method name="get_mime_type" symbol="gtk_recent_info_get_mime_type">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="set_page_title" symbol="gtk_assistant_set_page_title">
-                               <return-type type="void"/>
+                       <method name="get_modified" symbol="gtk_recent_info_get_modified">
+                               <return-type type="time_t"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="set_page_type" symbol="gtk_assistant_set_page_type">
-                               <return-type type="void"/>
+                       <method name="get_private_hint" symbol="gtk_recent_info_get_private_hint">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
-                                       <parameter name="type" type="GtkAssistantPageType"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="update_buttons_state" symbol="gtk_assistant_update_buttons_state">
-                               <return-type type="void"/>
+                       <method name="get_short_name" symbol="gtk_recent_info_get_short_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <signal name="apply" when="LAST">
-                               <return-type type="void"/>
+                       <method name="get_uri" symbol="gtk_recent_info_get_uri">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
-                       </signal>
-                       <signal name="cancel" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_uri_display" symbol="gtk_recent_info_get_uri_display">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
-                       </signal>
-                       <signal name="close" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_visited" symbol="gtk_recent_info_get_visited">
+                               <return-type type="time_t"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
-                       </signal>
-                       <signal name="prepare" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="has_application" symbol="gtk_recent_info_has_application">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="assistant" type="GtkAssistant*"/>
-                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
+                                       <parameter name="app_name" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <field name="cancel" type="GtkWidget*"/>
-                       <field name="forward" type="GtkWidget*"/>
-                       <field name="back" type="GtkWidget*"/>
-                       <field name="apply" type="GtkWidget*"/>
-                       <field name="close" type="GtkWidget*"/>
-                       <field name="last" type="GtkWidget*"/>
-               </object>
-               <object name="GtkBin" parent="GtkContainer" type-name="GtkBin" get-type="gtk_bin_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_child" symbol="gtk_bin_get_child">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="has_group" symbol="gtk_recent_info_has_group">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="bin" type="GtkBin*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
+                                       <parameter name="group_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <field name="child" type="GtkWidget*"/>
-               </object>
-               <object name="GtkBox" parent="GtkContainer" type-name="GtkBox" get-type="gtk_box_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_homogeneous" symbol="gtk_box_get_homogeneous">
+                       <method name="is_local" symbol="gtk_recent_info_is_local">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="box" type="GtkBox*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="get_spacing" symbol="gtk_box_get_spacing">
-                               <return-type type="gint"/>
+                       <method name="last_application" symbol="gtk_recent_info_last_application">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="box" type="GtkBox*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="pack_end" symbol="gtk_box_pack_end">
-                               <return-type type="void"/>
+                       <method name="match" symbol="gtk_recent_info_match">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="box" type="GtkBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="expand" type="gboolean"/>
-                                       <parameter name="fill" type="gboolean"/>
-                                       <parameter name="padding" type="guint"/>
+                                       <parameter name="info_a" type="GtkRecentInfo*"/>
+                                       <parameter name="info_b" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="pack_end_defaults" symbol="gtk_box_pack_end_defaults">
-                               <return-type type="void"/>
+                       <method name="ref" symbol="gtk_recent_info_ref">
+                               <return-type type="GtkRecentInfo*"/>
                                <parameters>
-                                       <parameter name="box" type="GtkBox*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="pack_start" symbol="gtk_box_pack_start">
+                       <method name="unref" symbol="gtk_recent_info_unref">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="box" type="GtkBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="expand" type="gboolean"/>
-                                       <parameter name="fill" type="gboolean"/>
-                                       <parameter name="padding" type="guint"/>
+                                       <parameter name="info" type="GtkRecentInfo*"/>
                                </parameters>
                        </method>
-                       <method name="pack_start_defaults" symbol="gtk_box_pack_start_defaults">
-                               <return-type type="void"/>
+               </boxed>
+               <boxed name="GtkRequisition" type-name="GtkRequisition" get-type="gtk_requisition_get_type">
+                       <method name="copy" symbol="gtk_requisition_copy">
+                               <return-type type="GtkRequisition*"/>
                                <parameters>
-                                       <parameter name="box" type="GtkBox*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="requisition" type="GtkRequisition*"/>
                                </parameters>
                        </method>
-                       <method name="query_child_packing" symbol="gtk_box_query_child_packing">
+                       <method name="free" symbol="gtk_requisition_free">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="box" type="GtkBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="expand" type="gboolean*"/>
-                                       <parameter name="fill" type="gboolean*"/>
-                                       <parameter name="padding" type="guint*"/>
-                                       <parameter name="pack_type" type="GtkPackType*"/>
+                                       <parameter name="requisition" type="GtkRequisition*"/>
                                </parameters>
                        </method>
-                       <method name="reorder_child" symbol="gtk_box_reorder_child">
-                               <return-type type="void"/>
+                       <field name="width" type="gint"/>
+                       <field name="height" type="gint"/>
+               </boxed>
+               <boxed name="GtkSelectionData" type-name="GtkSelectionData" get-type="gtk_selection_data_get_type">
+                       <method name="copy" symbol="gtk_selection_data_copy">
+                               <return-type type="GtkSelectionData*"/>
                                <parameters>
-                                       <parameter name="box" type="GtkBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="data" type="GtkSelectionData*"/>
                                </parameters>
                        </method>
-                       <method name="set_child_packing" symbol="gtk_box_set_child_packing">
+                       <method name="free" symbol="gtk_selection_data_free">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="box" type="GtkBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="expand" type="gboolean"/>
-                                       <parameter name="fill" type="gboolean"/>
-                                       <parameter name="padding" type="guint"/>
-                                       <parameter name="pack_type" type="GtkPackType"/>
+                                       <parameter name="data" type="GtkSelectionData*"/>
                                </parameters>
                        </method>
-                       <method name="set_homogeneous" symbol="gtk_box_set_homogeneous">
-                               <return-type type="void"/>
+                       <method name="get_pixbuf" symbol="gtk_selection_data_get_pixbuf">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="box" type="GtkBox*"/>
-                                       <parameter name="homogeneous" type="gboolean"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
                                </parameters>
                        </method>
-                       <method name="set_spacing" symbol="gtk_box_set_spacing">
-                               <return-type type="void"/>
+                       <method name="get_targets" symbol="gtk_selection_data_get_targets">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="box" type="GtkBox*"/>
-                                       <parameter name="spacing" type="gint"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
+                                       <parameter name="targets" type="GdkAtom**"/>
+                                       <parameter name="n_atoms" type="gint*"/>
                                </parameters>
                        </method>
-                       <property name="homogeneous" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <field name="children" type="GList*"/>
-                       <field name="spacing" type="gint16"/>
-                       <field name="homogeneous" type="guint"/>
-               </object>
-               <object name="GtkBuilder" parent="GObject" type-name="GtkBuilder" get-type="gtk_builder_get_type">
-                       <method name="add_from_file" symbol="gtk_builder_add_from_file">
-                               <return-type type="guint"/>
+                       <method name="get_text" symbol="gtk_selection_data_get_text">
+                               <return-type type="guchar*"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
-                                       <parameter name="filename" type="gchar*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
                                </parameters>
                        </method>
-                       <method name="add_from_string" symbol="gtk_builder_add_from_string">
-                               <return-type type="guint"/>
+                       <method name="get_uris" symbol="gtk_selection_data_get_uris">
+                               <return-type type="gchar**"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
-                                       <parameter name="buffer" type="gchar*"/>
-                                       <parameter name="length" type="gsize"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
                                </parameters>
                        </method>
-                       <method name="connect_signals" symbol="gtk_builder_connect_signals">
+                       <method name="set" symbol="gtk_selection_data_set">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
+                                       <parameter name="type" type="GdkAtom"/>
+                                       <parameter name="format" type="gint"/>
+                                       <parameter name="data" type="guchar*"/>
+                                       <parameter name="length" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="connect_signals_full" symbol="gtk_builder_connect_signals_full">
-                               <return-type type="void"/>
+                       <method name="set_pixbuf" symbol="gtk_selection_data_set_pixbuf">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
-                                       <parameter name="func" type="GtkBuilderConnectFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
                        </method>
-                       <method name="error_quark" symbol="gtk_builder_error_quark">
-                               <return-type type="GQuark"/>
-                       </method>
-                       <method name="get_object" symbol="gtk_builder_get_object">
-                               <return-type type="GObject*"/>
+                       <method name="set_text" symbol="gtk_selection_data_set_text">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
-                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
+                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="len" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_objects" symbol="gtk_builder_get_objects">
-                               <return-type type="GSList*"/>
+                       <method name="set_uris" symbol="gtk_selection_data_set_uris">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
+                                       <parameter name="uris" type="gchar**"/>
                                </parameters>
                        </method>
-                       <method name="get_translation_domain" symbol="gtk_builder_get_translation_domain">
-                               <return-type type="gchar*"/>
+                       <method name="targets_include_image" symbol="gtk_selection_data_targets_include_image">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
+                                       <parameter name="writable" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_type_from_name" symbol="gtk_builder_get_type_from_name">
-                               <return-type type="GType"/>
+                       <method name="targets_include_rich_text" symbol="gtk_selection_data_targets_include_rich_text">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
-                                       <parameter name="type_name" type="char*"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
+                                       <parameter name="buffer" type="GtkTextBuffer*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_builder_new">
-                               <return-type type="GtkBuilder*"/>
-                       </constructor>
-                       <method name="set_translation_domain" symbol="gtk_builder_set_translation_domain">
-                               <return-type type="void"/>
+                       <method name="targets_include_text" symbol="gtk_selection_data_targets_include_text">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
-                                       <parameter name="domain" type="gchar*"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
                                </parameters>
                        </method>
-                       <method name="value_from_string" symbol="gtk_builder_value_from_string">
+                       <method name="targets_include_uri" symbol="gtk_selection_data_targets_include_uri">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
-                                       <parameter name="pspec" type="GParamSpec*"/>
-                                       <parameter name="string" type="gchar*"/>
-                                       <parameter name="value" type="GValue*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="selection_data" type="GtkSelectionData*"/>
                                </parameters>
                        </method>
-                       <method name="value_from_string_type" symbol="gtk_builder_value_from_string_type">
-                               <return-type type="gboolean"/>
+                       <field name="selection" type="GdkAtom"/>
+                       <field name="target" type="GdkAtom"/>
+                       <field name="type" type="GdkAtom"/>
+                       <field name="format" type="gint"/>
+                       <field name="data" type="guchar*"/>
+                       <field name="length" type="gint"/>
+                       <field name="display" type="GdkDisplay*"/>
+               </boxed>
+               <boxed name="GtkTargetList" type-name="GtkTargetList" get-type="gtk_target_list_get_type">
+                       <method name="add" symbol="gtk_target_list_add">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
-                                       <parameter name="type" type="GType"/>
-                                       <parameter name="string" type="gchar*"/>
-                                       <parameter name="value" type="GValue*"/>
-                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="list" type="GtkTargetList*"/>
+                                       <parameter name="target" type="GdkAtom"/>
+                                       <parameter name="flags" type="guint"/>
+                                       <parameter name="info" type="guint"/>
                                </parameters>
                        </method>
-                       <property name="translation-domain" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <vfunc name="get_type_from_name">
-                               <return-type type="GType"/>
+                       <method name="add_image_targets" symbol="gtk_target_list_add_image_targets">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="builder" type="GtkBuilder*"/>
-                                       <parameter name="type_name" type="char*"/>
+                                       <parameter name="list" type="GtkTargetList*"/>
+                                       <parameter name="info" type="guint"/>
+                                       <parameter name="writable" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-               </object>
-               <object name="GtkButton" parent="GtkBin" type-name="GtkButton" get-type="gtk_button_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="clicked" symbol="gtk_button_clicked">
+                       </method>
+                       <method name="add_rich_text_targets" symbol="gtk_target_list_add_rich_text_targets">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="list" type="GtkTargetList*"/>
+                                       <parameter name="info" type="guint"/>
+                                       <parameter name="deserializable" type="gboolean"/>
+                                       <parameter name="buffer" type="GtkTextBuffer*"/>
                                </parameters>
                        </method>
-                       <method name="enter" symbol="gtk_button_enter">
+                       <method name="add_table" symbol="gtk_target_list_add_table">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="list" type="GtkTargetList*"/>
+                                       <parameter name="targets" type="GtkTargetEntry*"/>
+                                       <parameter name="ntargets" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="get_alignment" symbol="gtk_button_get_alignment">
+                       <method name="add_text_targets" symbol="gtk_target_list_add_text_targets">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
-                                       <parameter name="xalign" type="gfloat*"/>
-                                       <parameter name="yalign" type="gfloat*"/>
+                                       <parameter name="list" type="GtkTargetList*"/>
+                                       <parameter name="info" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="get_focus_on_click" symbol="gtk_button_get_focus_on_click">
-                               <return-type type="gboolean"/>
+                       <method name="add_uri_targets" symbol="gtk_target_list_add_uri_targets">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="list" type="GtkTargetList*"/>
+                                       <parameter name="info" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="get_image" symbol="gtk_button_get_image">
-                               <return-type type="GtkWidget*"/>
+                       <method name="find" symbol="gtk_target_list_find">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="list" type="GtkTargetList*"/>
+                                       <parameter name="target" type="GdkAtom"/>
+                                       <parameter name="info" type="guint*"/>
                                </parameters>
                        </method>
-                       <method name="get_image_position" symbol="gtk_button_get_image_position">
-                               <return-type type="GtkPositionType"/>
+                       <constructor name="new" symbol="gtk_target_list_new">
+                               <return-type type="GtkTargetList*"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="targets" type="GtkTargetEntry*"/>
+                                       <parameter name="ntargets" type="guint"/>
                                </parameters>
-                       </method>
-                       <method name="get_label" symbol="gtk_button_get_label">
-                               <return-type type="gchar*"/>
+                       </constructor>
+                       <method name="ref" symbol="gtk_target_list_ref">
+                               <return-type type="GtkTargetList*"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="list" type="GtkTargetList*"/>
                                </parameters>
                        </method>
-                       <method name="get_relief" symbol="gtk_button_get_relief">
-                               <return-type type="GtkReliefStyle"/>
+                       <method name="remove" symbol="gtk_target_list_remove">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="list" type="GtkTargetList*"/>
+                                       <parameter name="target" type="GdkAtom"/>
                                </parameters>
                        </method>
-                       <method name="get_use_stock" symbol="gtk_button_get_use_stock">
-                               <return-type type="gboolean"/>
+                       <method name="unref" symbol="gtk_target_list_unref">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="list" type="GtkTargetList*"/>
                                </parameters>
                        </method>
-                       <method name="get_use_underline" symbol="gtk_button_get_use_underline">
-                               <return-type type="gboolean"/>
+                       <field name="list" type="GList*"/>
+                       <field name="ref_count" type="guint"/>
+               </boxed>
+               <boxed name="GtkTextAttributes" type-name="GtkTextAttributes" get-type="gtk_text_attributes_get_type">
+                       <method name="copy" symbol="gtk_text_attributes_copy">
+                               <return-type type="GtkTextAttributes*"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="src" type="GtkTextAttributes*"/>
                                </parameters>
                        </method>
-                       <method name="leave" symbol="gtk_button_leave">
+                       <method name="copy_values" symbol="gtk_text_attributes_copy_values">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="src" type="GtkTextAttributes*"/>
+                                       <parameter name="dest" type="GtkTextAttributes*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_button_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_from_stock" symbol="gtk_button_new_from_stock">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="stock_id" type="gchar*"/>
-                               </parameters>
+                       <constructor name="new" symbol="gtk_text_attributes_new">
+                               <return-type type="GtkTextAttributes*"/>
                        </constructor>
-                       <constructor name="new_with_label" symbol="gtk_button_new_with_label">
-                               <return-type type="GtkWidget*"/>
+                       <method name="ref" symbol="gtk_text_attributes_ref">
+                               <return-type type="GtkTextAttributes*"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="values" type="GtkTextAttributes*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_button_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="unref" symbol="gtk_text_attributes_unref">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="values" type="GtkTextAttributes*"/>
                                </parameters>
-                       </constructor>
-                       <method name="pressed" symbol="gtk_button_pressed">
-                               <return-type type="void"/>
+                       </method>
+                       <field name="refcount" type="guint"/>
+                       <field name="appearance" type="GtkTextAppearance"/>
+                       <field name="justification" type="GtkJustification"/>
+                       <field name="direction" type="GtkTextDirection"/>
+                       <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="pixels_above_lines" type="gint"/>
+                       <field name="pixels_below_lines" type="gint"/>
+                       <field name="pixels_inside_wrap" type="gint"/>
+                       <field name="tabs" type="PangoTabArray*"/>
+                       <field name="wrap_mode" type="GtkWrapMode"/>
+                       <field name="language" type="PangoLanguage*"/>
+                       <field name="pg_bg_color" type="GdkColor*"/>
+                       <field name="invisible" type="guint"/>
+                       <field name="bg_full_height" type="guint"/>
+                       <field name="editable" type="guint"/>
+                       <field name="realized" type="guint"/>
+                       <field name="pad1" type="guint"/>
+                       <field name="pad2" type="guint"/>
+                       <field name="pad3" type="guint"/>
+                       <field name="pad4" 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">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="released" symbol="gtk_button_released">
-                               <return-type type="void"/>
+                       <method name="backward_chars" symbol="gtk_text_iter_backward_chars">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_alignment" symbol="gtk_button_set_alignment">
-                               <return-type type="void"/>
+                       <method name="backward_cursor_position" symbol="gtk_text_iter_backward_cursor_position">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
-                                       <parameter name="xalign" type="gfloat"/>
-                                       <parameter name="yalign" type="gfloat"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_focus_on_click" symbol="gtk_button_set_focus_on_click">
-                               <return-type type="void"/>
+                       <method name="backward_cursor_positions" symbol="gtk_text_iter_backward_cursor_positions">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
-                                       <parameter name="focus_on_click" type="gboolean"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_image" symbol="gtk_button_set_image">
-                               <return-type type="void"/>
+                       <method name="backward_find_char" symbol="gtk_text_iter_backward_find_char">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
-                                       <parameter name="image" type="GtkWidget*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="pred" type="GtkTextCharPredicate"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="limit" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_image_position" symbol="gtk_button_set_image_position">
-                               <return-type type="void"/>
+                       <method name="backward_line" symbol="gtk_text_iter_backward_line">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
-                                       <parameter name="position" type="GtkPositionType"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_label" symbol="gtk_button_set_label">
-                               <return-type type="void"/>
+                       <method name="backward_lines" symbol="gtk_text_iter_backward_lines">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_relief" symbol="gtk_button_set_relief">
-                               <return-type type="void"/>
+                       <method name="backward_search" symbol="gtk_text_iter_backward_search">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
-                                       <parameter name="newstyle" type="GtkReliefStyle"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="flags" type="GtkTextSearchFlags"/>
+                                       <parameter name="match_start" type="GtkTextIter*"/>
+                                       <parameter name="match_end" type="GtkTextIter*"/>
+                                       <parameter name="limit" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_stock" symbol="gtk_button_set_use_stock">
-                               <return-type type="void"/>
+                       <method name="backward_sentence_start" symbol="gtk_text_iter_backward_sentence_start">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
-                                       <parameter name="use_stock" type="gboolean"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_underline" symbol="gtk_button_set_use_underline">
-                               <return-type type="void"/>
+                       <method name="backward_sentence_starts" symbol="gtk_text_iter_backward_sentence_starts">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
-                                       <parameter name="use_underline" type="gboolean"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <property name="focus-on-click" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="image" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="image-position" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="label" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="relief" type="GtkReliefStyle" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="use-stock" 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"/>
-                       <property name="xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="activate" when="FIRST">
-                               <return-type type="void"/>
+                       <method name="backward_to_tag_toggle" symbol="gtk_text_iter_backward_to_tag_toggle">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="tag" type="GtkTextTag*"/>
                                </parameters>
-                       </signal>
-                       <signal name="clicked" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="backward_visible_cursor_position" symbol="gtk_text_iter_backward_visible_cursor_position">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
-                       </signal>
-                       <signal name="enter" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="backward_visible_cursor_positions" symbol="gtk_text_iter_backward_visible_cursor_positions">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
-                       </signal>
-                       <signal name="leave" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="backward_visible_line" symbol="gtk_text_iter_backward_visible_line">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
-                       </signal>
-                       <signal name="pressed" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="backward_visible_lines" symbol="gtk_text_iter_backward_visible_lines">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
-                       </signal>
-                       <signal name="released" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="backward_visible_word_start" symbol="gtk_text_iter_backward_visible_word_start">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
-                       </signal>
-                       <field name="event_window" type="GdkWindow*"/>
-                       <field name="label_text" type="gchar*"/>
-                       <field name="activate_timeout" type="guint"/>
-                       <field name="constructed" type="guint"/>
-                       <field name="in_button" type="guint"/>
-                       <field name="button_down" type="guint"/>
-                       <field name="relief" type="guint"/>
-                       <field name="use_underline" type="guint"/>
-                       <field name="use_stock" type="guint"/>
-                       <field name="depressed" type="guint"/>
-                       <field name="depress_on_activate" type="guint"/>
-                       <field name="focus_on_click" type="guint"/>
-               </object>
-               <object name="GtkButtonBox" parent="GtkBox" type-name="GtkButtonBox" get-type="gtk_button_box_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_child_ipadding" symbol="gtk_button_box_get_child_ipadding">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="backward_visible_word_starts" symbol="gtk_text_iter_backward_visible_word_starts">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkButtonBox*"/>
-                                       <parameter name="ipad_x" type="gint*"/>
-                                       <parameter name="ipad_y" type="gint*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_child_secondary" symbol="gtk_button_box_get_child_secondary">
+                       <method name="backward_word_start" symbol="gtk_text_iter_backward_word_start">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkButtonBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_child_size" symbol="gtk_button_box_get_child_size">
-                               <return-type type="void"/>
+                       <method name="backward_word_starts" symbol="gtk_text_iter_backward_word_starts">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkButtonBox*"/>
-                                       <parameter name="min_width" type="gint*"/>
-                                       <parameter name="min_height" type="gint*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_layout" symbol="gtk_button_box_get_layout">
-                               <return-type type="GtkButtonBoxStyle"/>
+                       <method name="begins_tag" symbol="gtk_text_iter_begins_tag">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkButtonBox*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="tag" type="GtkTextTag*"/>
                                </parameters>
                        </method>
-                       <method name="set_child_ipadding" symbol="gtk_button_box_set_child_ipadding">
-                               <return-type type="void"/>
+                       <method name="can_insert" symbol="gtk_text_iter_can_insert">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkButtonBox*"/>
-                                       <parameter name="ipad_x" type="gint"/>
-                                       <parameter name="ipad_y" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="default_editability" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_child_secondary" symbol="gtk_button_box_set_child_secondary">
-                               <return-type type="void"/>
+                       <method name="compare" symbol="gtk_text_iter_compare">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkButtonBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="is_secondary" type="gboolean"/>
+                                       <parameter name="lhs" type="GtkTextIter*"/>
+                                       <parameter name="rhs" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_child_size" symbol="gtk_button_box_set_child_size">
-                               <return-type type="void"/>
+                       <method name="copy" symbol="gtk_text_iter_copy">
+                               <return-type type="GtkTextIter*"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkButtonBox*"/>
-                                       <parameter name="min_width" type="gint"/>
-                                       <parameter name="min_height" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_layout" symbol="gtk_button_box_set_layout">
-                               <return-type type="void"/>
+                       <method name="editable" symbol="gtk_text_iter_editable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkButtonBox*"/>
-                                       <parameter name="layout_style" type="GtkButtonBoxStyle"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="default_setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <property name="layout-style" type="GtkButtonBoxStyle" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <field name="child_min_width" type="gint"/>
-                       <field name="child_min_height" type="gint"/>
-                       <field name="child_ipad_x" type="gint"/>
-                       <field name="child_ipad_y" type="gint"/>
-                       <field name="layout_style" type="GtkButtonBoxStyle"/>
-               </object>
-               <object name="GtkCList" parent="GtkContainer" type-name="GtkCList" get-type="gtk_clist_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="append" symbol="gtk_clist_append">
-                               <return-type type="gint"/>
+                       <method name="ends_line" symbol="gtk_text_iter_ends_line">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="text" type="gchar*[]"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="clear" symbol="gtk_clist_clear">
-                               <return-type type="void"/>
+                       <method name="ends_sentence" symbol="gtk_text_iter_ends_sentence">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="columns_autosize" symbol="gtk_clist_columns_autosize">
-                               <return-type type="gint"/>
+                       <method name="ends_tag" symbol="gtk_text_iter_ends_tag">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="tag" type="GtkTextTag*"/>
                                </parameters>
                        </method>
-                       <method name="find_row_from_data" symbol="gtk_clist_find_row_from_data">
-                               <return-type type="gint"/>
+                       <method name="ends_word" symbol="gtk_text_iter_ends_word">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="freeze" symbol="gtk_clist_freeze">
-                               <return-type type="void"/>
+                       <method name="equal" symbol="gtk_text_iter_equal">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="lhs" type="GtkTextIter*"/>
+                                       <parameter name="rhs" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_cell_style" symbol="gtk_clist_get_cell_style">
-                               <return-type type="GtkStyle*"/>
+                       <method name="forward_char" symbol="gtk_text_iter_forward_char">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_cell_type" symbol="gtk_clist_get_cell_type">
-                               <return-type type="GtkCellType"/>
+                       <method name="forward_chars" symbol="gtk_text_iter_forward_chars">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_column_title" symbol="gtk_clist_get_column_title">
-                               <return-type type="gchar*"/>
+                       <method name="forward_cursor_position" symbol="gtk_text_iter_forward_cursor_position">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_column_widget" symbol="gtk_clist_get_column_widget">
-                               <return-type type="GtkWidget*"/>
+                       <method name="forward_cursor_positions" symbol="gtk_text_iter_forward_cursor_positions">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_hadjustment" symbol="gtk_clist_get_hadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       <method name="forward_find_char" symbol="gtk_text_iter_forward_find_char">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="pred" type="GtkTextCharPredicate"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="limit" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_pixmap" symbol="gtk_clist_get_pixmap">
-                               <return-type type="gint"/>
+                       <method name="forward_line" symbol="gtk_text_iter_forward_line">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="pixmap" type="GdkPixmap**"/>
-                                       <parameter name="mask" type="GdkBitmap**"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_pixtext" symbol="gtk_clist_get_pixtext">
-                               <return-type type="gint"/>
+                       <method name="forward_lines" symbol="gtk_text_iter_forward_lines">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="text" type="gchar**"/>
-                                       <parameter name="spacing" type="guint8*"/>
-                                       <parameter name="pixmap" type="GdkPixmap**"/>
-                                       <parameter name="mask" type="GdkBitmap**"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_row_data" symbol="gtk_clist_get_row_data">
-                               <return-type type="gpointer"/>
+                       <method name="forward_search" symbol="gtk_text_iter_forward_search">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="flags" type="GtkTextSearchFlags"/>
+                                       <parameter name="match_start" type="GtkTextIter*"/>
+                                       <parameter name="match_end" type="GtkTextIter*"/>
+                                       <parameter name="limit" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_row_style" symbol="gtk_clist_get_row_style">
-                               <return-type type="GtkStyle*"/>
+                       <method name="forward_sentence_end" symbol="gtk_text_iter_forward_sentence_end">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_selectable" symbol="gtk_clist_get_selectable">
+                       <method name="forward_sentence_ends" symbol="gtk_text_iter_forward_sentence_ends">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_selection_info" symbol="gtk_clist_get_selection_info">
-                               <return-type type="gint"/>
+                       <method name="forward_to_end" symbol="gtk_text_iter_forward_to_end">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="row" type="gint*"/>
-                                       <parameter name="column" type="gint*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_text" symbol="gtk_clist_get_text">
-                               <return-type type="gint"/>
+                       <method name="forward_to_line_end" symbol="gtk_text_iter_forward_to_line_end">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="text" type="gchar**"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_vadjustment" symbol="gtk_clist_get_vadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       <method name="forward_to_tag_toggle" symbol="gtk_text_iter_forward_to_tag_toggle">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="tag" type="GtkTextTag*"/>
                                </parameters>
                        </method>
-                       <method name="insert" symbol="gtk_clist_insert">
-                               <return-type type="gint"/>
+                       <method name="forward_visible_cursor_position" symbol="gtk_text_iter_forward_visible_cursor_position">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="text" type="gchar*[]"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="moveto" symbol="gtk_clist_moveto">
-                               <return-type type="void"/>
+                       <method name="forward_visible_cursor_positions" symbol="gtk_text_iter_forward_visible_cursor_positions">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="row_align" type="gfloat"/>
-                                       <parameter name="col_align" type="gfloat"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_clist_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="forward_visible_line" symbol="gtk_text_iter_forward_visible_line">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="columns" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_titles" symbol="gtk_clist_new_with_titles">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="forward_visible_lines" symbol="gtk_text_iter_forward_visible_lines">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="columns" type="gint"/>
-                                       <parameter name="titles" type="gchar*[]"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
-                       </constructor>
-                       <method name="optimal_column_width" symbol="gtk_clist_optimal_column_width">
-                               <return-type type="gint"/>
+                       </method>
+                       <method name="forward_visible_word_end" symbol="gtk_text_iter_forward_visible_word_end">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="prepend" symbol="gtk_clist_prepend">
-                               <return-type type="gint"/>
+                       <method name="forward_visible_word_ends" symbol="gtk_text_iter_forward_visible_word_ends">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="text" type="gchar*[]"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="remove" symbol="gtk_clist_remove">
-                               <return-type type="void"/>
+                       <method name="forward_word_end" symbol="gtk_text_iter_forward_word_end">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="select_all" symbol="gtk_clist_select_all">
-                               <return-type type="void"/>
+                       <method name="forward_word_ends" symbol="gtk_text_iter_forward_word_ends">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="select_row" symbol="gtk_clist_select_row">
+                       <method name="free" symbol="gtk_text_iter_free">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_auto_sort" symbol="gtk_clist_set_auto_sort">
-                               <return-type type="void"/>
+                       <method name="get_attributes" symbol="gtk_text_iter_get_attributes">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="auto_sort" type="gboolean"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="values" type="GtkTextAttributes*"/>
                                </parameters>
                        </method>
-                       <method name="set_background" symbol="gtk_clist_set_background">
-                               <return-type type="void"/>
+                       <method name="get_buffer" symbol="gtk_text_iter_get_buffer">
+                               <return-type type="GtkTextBuffer*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_button_actions" symbol="gtk_clist_set_button_actions">
-                               <return-type type="void"/>
+                       <method name="get_bytes_in_line" symbol="gtk_text_iter_get_bytes_in_line">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="button" type="guint"/>
-                                       <parameter name="button_actions" type="guint8"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_cell_style" symbol="gtk_clist_set_cell_style">
-                               <return-type type="void"/>
+                       <method name="get_char" symbol="gtk_text_iter_get_char">
+                               <return-type type="gunichar"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_auto_resize" symbol="gtk_clist_set_column_auto_resize">
-                               <return-type type="void"/>
+                       <method name="get_chars_in_line" symbol="gtk_text_iter_get_chars_in_line">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="auto_resize" type="gboolean"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_justification" symbol="gtk_clist_set_column_justification">
-                               <return-type type="void"/>
+                       <method name="get_child_anchor" symbol="gtk_text_iter_get_child_anchor">
+                               <return-type type="GtkTextChildAnchor*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="justification" type="GtkJustification"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_max_width" symbol="gtk_clist_set_column_max_width">
-                               <return-type type="void"/>
+                       <method name="get_language" symbol="gtk_text_iter_get_language">
+                               <return-type type="PangoLanguage*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="max_width" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_min_width" symbol="gtk_clist_set_column_min_width">
-                               <return-type type="void"/>
+                       <method name="get_line" symbol="gtk_text_iter_get_line">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="min_width" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_resizeable" symbol="gtk_clist_set_column_resizeable">
-                               <return-type type="void"/>
+                       <method name="get_line_index" symbol="gtk_text_iter_get_line_index">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="resizeable" type="gboolean"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_title" symbol="gtk_clist_set_column_title">
-                               <return-type type="void"/>
+                       <method name="get_line_offset" symbol="gtk_text_iter_get_line_offset">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_visibility" symbol="gtk_clist_set_column_visibility">
-                               <return-type type="void"/>
+                       <method name="get_marks" symbol="gtk_text_iter_get_marks">
+                               <return-type type="GSList*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="visible" type="gboolean"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_widget" symbol="gtk_clist_set_column_widget">
-                               <return-type type="void"/>
+                       <method name="get_offset" symbol="gtk_text_iter_get_offset">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_width" symbol="gtk_clist_set_column_width">
-                               <return-type type="void"/>
+                       <method name="get_pixbuf" symbol="gtk_text_iter_get_pixbuf">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="width" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_compare_func" symbol="gtk_clist_set_compare_func">
-                               <return-type type="void"/>
+                       <method name="get_slice" symbol="gtk_text_iter_get_slice">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="cmp_func" type="GtkCListCompareFunc"/>
+                                       <parameter name="start" type="GtkTextIter*"/>
+                                       <parameter name="end" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_foreground" symbol="gtk_clist_set_foreground">
-                               <return-type type="void"/>
+                       <method name="get_tags" symbol="gtk_text_iter_get_tags">
+                               <return-type type="GSList*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_hadjustment" symbol="gtk_clist_set_hadjustment">
-                               <return-type type="void"/>
+                       <method name="get_text" symbol="gtk_text_iter_get_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="start" type="GtkTextIter*"/>
+                                       <parameter name="end" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_pixmap" symbol="gtk_clist_set_pixmap">
-                               <return-type type="void"/>
+                       <method name="get_toggled_tags" symbol="gtk_text_iter_get_toggled_tags">
+                               <return-type type="GSList*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="pixmap" type="GdkPixmap*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="toggled_on" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_pixtext" symbol="gtk_clist_set_pixtext">
-                               <return-type type="void"/>
+                       <method name="get_visible_line_index" symbol="gtk_text_iter_get_visible_line_index">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="text" type="gchar*"/>
-                                       <parameter name="spacing" type="guint8"/>
-                                       <parameter name="pixmap" type="GdkPixmap*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_reorderable" symbol="gtk_clist_set_reorderable">
-                               <return-type type="void"/>
+                       <method name="get_visible_line_offset" symbol="gtk_text_iter_get_visible_line_offset">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="reorderable" type="gboolean"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_row_data" symbol="gtk_clist_set_row_data">
-                               <return-type type="void"/>
+                       <method name="get_visible_slice" symbol="gtk_text_iter_get_visible_slice">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="start" type="GtkTextIter*"/>
+                                       <parameter name="end" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_row_data_full" symbol="gtk_clist_set_row_data_full">
-                               <return-type type="void"/>
+                       <method name="get_visible_text" symbol="gtk_text_iter_get_visible_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GtkDestroyNotify"/>
+                                       <parameter name="start" type="GtkTextIter*"/>
+                                       <parameter name="end" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_row_height" symbol="gtk_clist_set_row_height">
-                               <return-type type="void"/>
+                       <method name="has_tag" symbol="gtk_text_iter_has_tag">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="height" type="guint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="tag" type="GtkTextTag*"/>
                                </parameters>
                        </method>
-                       <method name="set_row_style" symbol="gtk_clist_set_row_style">
-                               <return-type type="void"/>
+                       <method name="in_range" symbol="gtk_text_iter_in_range">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="style" type="GtkStyle*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="start" type="GtkTextIter*"/>
+                                       <parameter name="end" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_selectable" symbol="gtk_clist_set_selectable">
-                               <return-type type="void"/>
+                       <method name="inside_sentence" symbol="gtk_text_iter_inside_sentence">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="selectable" type="gboolean"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_selection_mode" symbol="gtk_clist_set_selection_mode">
-                               <return-type type="void"/>
+                       <method name="inside_word" symbol="gtk_text_iter_inside_word">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="mode" type="GtkSelectionMode"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_shadow_type" symbol="gtk_clist_set_shadow_type">
-                               <return-type type="void"/>
+                       <method name="is_cursor_position" symbol="gtk_text_iter_is_cursor_position">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="type" type="GtkShadowType"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_shift" symbol="gtk_clist_set_shift">
-                               <return-type type="void"/>
+                       <method name="is_end" symbol="gtk_text_iter_is_end">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="vertical" type="gint"/>
-                                       <parameter name="horizontal" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_sort_column" symbol="gtk_clist_set_sort_column">
-                               <return-type type="void"/>
+                       <method name="is_start" symbol="gtk_text_iter_is_start">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_sort_type" symbol="gtk_clist_set_sort_type">
+                       <method name="order" symbol="gtk_text_iter_order">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="sort_type" type="GtkSortType"/>
+                                       <parameter name="first" type="GtkTextIter*"/>
+                                       <parameter name="second" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_text" symbol="gtk_clist_set_text">
+                       <method name="set_line" symbol="gtk_text_iter_set_line">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="line_number" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_use_drag_icons" symbol="gtk_clist_set_use_drag_icons">
+                       <method name="set_line_index" symbol="gtk_text_iter_set_line_index">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="use_icons" type="gboolean"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="byte_on_line" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_vadjustment" symbol="gtk_clist_set_vadjustment">
+                       <method name="set_line_offset" symbol="gtk_text_iter_set_line_offset">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="char_on_line" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="sort" symbol="gtk_clist_sort">
+                       <method name="set_offset" symbol="gtk_text_iter_set_offset">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="char_offset" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="swap_rows" symbol="gtk_clist_swap_rows">
+                       <method name="set_visible_line_index" symbol="gtk_text_iter_set_visible_line_index">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row1" type="gint"/>
-                                       <parameter name="row2" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="byte_on_line" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="thaw" symbol="gtk_clist_thaw">
+                       <method name="set_visible_line_offset" symbol="gtk_text_iter_set_visible_line_offset">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="char_on_line" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="undo_selection" symbol="gtk_clist_undo_selection">
-                               <return-type type="void"/>
+                       <method name="starts_line" symbol="gtk_text_iter_starts_line">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="unselect_all" symbol="gtk_clist_unselect_all">
-                               <return-type type="void"/>
+                       <method name="starts_sentence" symbol="gtk_text_iter_starts_sentence">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <method name="unselect_row" symbol="gtk_clist_unselect_row">
-                               <return-type type="void"/>
+                       <method name="starts_word" symbol="gtk_text_iter_starts_word">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
                                </parameters>
                        </method>
-                       <property name="n-columns" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="reorderable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="row-height" type="guint" 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="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="sort-type" type="GtkSortType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="titles-active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="use-drag-icons" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="abort-column-resize" when="LAST">
-                               <return-type type="void"/>
+                       <method name="toggles_tag" symbol="gtk_text_iter_toggles_tag">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="iter" type="GtkTextIter*"/>
+                                       <parameter name="tag" type="GtkTextTag*"/>
                                </parameters>
-                       </signal>
-                       <signal name="click-column" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <field name="dummy1" type="gpointer"/>
+                       <field name="dummy2" type="gpointer"/>
+                       <field name="dummy3" type="gint"/>
+                       <field name="dummy4" type="gint"/>
+                       <field name="dummy5" type="gint"/>
+                       <field name="dummy6" type="gint"/>
+                       <field name="dummy7" type="gint"/>
+                       <field name="dummy8" type="gint"/>
+                       <field name="dummy9" type="gpointer"/>
+                       <field name="dummy10" type="gpointer"/>
+                       <field name="dummy11" type="gint"/>
+                       <field name="dummy12" type="gint"/>
+                       <field name="dummy13" type="gint"/>
+                       <field name="dummy14" type="gpointer"/>
+               </boxed>
+               <boxed name="GtkTreeIter" type-name="GtkTreeIter" get-type="gtk_tree_iter_get_type">
+                       <method name="copy" symbol="gtk_tree_iter_copy">
+                               <return-type type="GtkTreeIter*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
-                       </signal>
-                       <signal name="end-selection" when="LAST">
+                       </method>
+                       <method name="free" symbol="gtk_tree_iter_free">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
-                       </signal>
-                       <signal name="extend-selection" when="LAST">
+                       </method>
+                       <field name="stamp" type="gint"/>
+                       <field name="user_data" type="gpointer"/>
+                       <field name="user_data2" type="gpointer"/>
+                       <field name="user_data3" type="gpointer"/>
+               </boxed>
+               <boxed name="GtkTreePath" type-name="GtkTreePath" get-type="gtk_tree_path_get_type">
+                       <method name="append_index" symbol="gtk_tree_path_append_index">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="scroll_type" type="GtkScrollType"/>
-                                       <parameter name="position" type="gfloat"/>
-                                       <parameter name="auto_start_selection" type="gboolean"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="index_" type="gint"/>
                                </parameters>
-                       </signal>
-                       <signal name="resize-column" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="compare" symbol="gtk_tree_path_compare">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="width" type="gint"/>
+                                       <parameter name="a" type="GtkTreePath*"/>
+                                       <parameter name="b" type="GtkTreePath*"/>
                                </parameters>
-                       </signal>
-                       <signal name="row-move" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="copy" symbol="gtk_tree_path_copy">
+                               <return-type type="GtkTreePath*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="source_row" type="gint"/>
-                                       <parameter name="dest_row" type="gint"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </signal>
-                       <signal name="scroll-horizontal" when="LAST">
+                       </method>
+                       <method name="down" symbol="gtk_tree_path_down">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="scroll_type" type="GtkScrollType"/>
-                                       <parameter name="position" type="gfloat"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </signal>
-                       <signal name="scroll-vertical" when="LAST">
+                       </method>
+                       <method name="free" symbol="gtk_tree_path_free">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="scroll_type" type="GtkScrollType"/>
-                                       <parameter name="position" type="gfloat"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </signal>
-                       <signal name="select-all" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_depth" symbol="gtk_tree_path_get_depth">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </signal>
-                       <signal name="select-row" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_indices" symbol="gtk_tree_path_get_indices">
+                               <return-type type="gint*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </signal>
-                       <signal name="set-scroll-adjustments" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="is_ancestor" symbol="gtk_tree_path_is_ancestor">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="hadjustment" type="GtkAdjustment*"/>
-                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="descendant" type="GtkTreePath*"/>
                                </parameters>
-                       </signal>
-                       <signal name="start-selection" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="is_descendant" symbol="gtk_tree_path_is_descendant">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="ancestor" type="GtkTreePath*"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-add-mode" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <constructor name="new" symbol="gtk_tree_path_new">
+                               <return-type type="GtkTreePath*"/>
+                       </constructor>
+                       <constructor name="new_first" symbol="gtk_tree_path_new_first">
+                               <return-type type="GtkTreePath*"/>
+                       </constructor>
+                       <constructor name="new_from_indices" symbol="gtk_tree_path_new_from_indices">
+                               <return-type type="GtkTreePath*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="first_index" type="gint"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-focus-row" when="LAST">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_from_string" symbol="gtk_tree_path_new_from_string">
+                               <return-type type="GtkTreePath*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="path" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="undo-selection" when="LAST">
+                       </constructor>
+                       <method name="next" symbol="gtk_tree_path_next">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </signal>
-                       <signal name="unselect-all" when="LAST">
+                       </method>
+                       <method name="prepend_index" symbol="gtk_tree_path_prepend_index">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="index_" type="gint"/>
                                </parameters>
-                       </signal>
-                       <signal name="unselect-row" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="prev" symbol="gtk_tree_path_prev">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="cell_size_request">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="to_string" symbol="gtk_tree_path_to_string">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="clist_row" type="GtkCListRow*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="requisition" type="GtkRequisition*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="clear">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="up" symbol="gtk_tree_path_up">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_drag_highlight">
-                               <return-type type="void"/>
+                       </method>
+               </boxed>
+               <boxed name="GtkTreeRowReference" type-name="GtkTreeRowReference" get-type="gtk_tree_row_reference_get_type">
+                       <method name="copy" symbol="gtk_tree_row_reference_copy">
+                               <return-type type="GtkTreeRowReference*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="target_row" type="GtkCListRow*"/>
-                                       <parameter name="target_row_number" type="gint"/>
-                                       <parameter name="drag_pos" type="GtkCListDragPos"/>
+                                       <parameter name="reference" type="GtkTreeRowReference*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="draw_row">
+                       </method>
+                       <method name="deleted" symbol="gtk_tree_row_reference_deleted">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="area" type="GdkRectangle*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="clist_row" type="GtkCListRow*"/>
+                                       <parameter name="proxy" type="GObject*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="fake_unselect_all">
+                       </method>
+                       <method name="free" symbol="gtk_tree_row_reference_free">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
+                                       <parameter name="reference" type="GtkTreeRowReference*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="insert_row">
-                               <return-type type="gint"/>
+                       </method>
+                       <method name="get_model" symbol="gtk_tree_row_reference_get_model">
+                               <return-type type="GtkTreeModel*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
-                                       <parameter name="text" type="gchar*[]"/>
+                                       <parameter name="reference" type="GtkTreeRowReference*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="refresh">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_path" symbol="gtk_tree_row_reference_get_path">
+                               <return-type type="GtkTreePath*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="reference" type="GtkTreeRowReference*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="remove_row">
+                       </method>
+                       <method name="inserted" symbol="gtk_tree_row_reference_inserted">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row" type="gint"/>
+                                       <parameter name="proxy" type="GObject*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="resync_selection">
-                               <return-type type="void"/>
+                       </method>
+                       <constructor name="new" symbol="gtk_tree_row_reference_new">
+                               <return-type type="GtkTreeRowReference*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="event" type="GdkEvent*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="selection_find">
-                               <return-type type="GList*"/>
+                       </constructor>
+                       <constructor name="new_proxy" symbol="gtk_tree_row_reference_new_proxy">
+                               <return-type type="GtkTreeRowReference*"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="row_number" type="gint"/>
-                                       <parameter name="row_list_element" type="GList*"/>
+                                       <parameter name="proxy" type="GObject*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_cell_contents">
+                       </constructor>
+                       <method name="reordered" symbol="gtk_tree_row_reference_reordered">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
-                                       <parameter name="clist_row" type="GtkCListRow*"/>
-                                       <parameter name="column" type="gint"/>
-                                       <parameter name="type" type="GtkCellType"/>
-                                       <parameter name="text" type="gchar*"/>
-                                       <parameter name="spacing" type="guint8"/>
-                                       <parameter name="pixmap" type="GdkPixmap*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
+                                       <parameter name="proxy" type="GObject*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="new_order" type="gint*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="sort_list">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="valid" symbol="gtk_tree_row_reference_valid">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clist" type="GtkCList*"/>
+                                       <parameter name="reference" type="GtkTreeRowReference*"/>
                                </parameters>
-                       </vfunc>
-                       <field name="flags" type="guint16"/>
-                       <field name="reserved1" type="gpointer"/>
-                       <field name="reserved2" type="gpointer"/>
-                       <field name="freeze_count" type="guint"/>
-                       <field name="internal_allocation" type="GdkRectangle"/>
-                       <field name="rows" type="gint"/>
-                       <field name="row_height" type="gint"/>
-                       <field name="row_list" type="GList*"/>
-                       <field name="row_list_end" type="GList*"/>
-                       <field name="columns" type="gint"/>
-                       <field name="column_title_area" type="GdkRectangle"/>
-                       <field name="title_window" type="GdkWindow*"/>
-                       <field name="column" type="GtkCListColumn*"/>
-                       <field name="clist_window" type="GdkWindow*"/>
-                       <field name="clist_window_width" type="gint"/>
-                       <field name="clist_window_height" type="gint"/>
-                       <field name="hoffset" type="gint"/>
-                       <field name="voffset" type="gint"/>
-                       <field name="shadow_type" type="GtkShadowType"/>
-                       <field name="selection_mode" type="GtkSelectionMode"/>
-                       <field name="selection" type="GList*"/>
-                       <field name="selection_end" type="GList*"/>
-                       <field name="undo_selection" type="GList*"/>
-                       <field name="undo_unselection" type="GList*"/>
-                       <field name="undo_anchor" type="gint"/>
-                       <field name="button_actions" type="guint8[]"/>
-                       <field name="drag_button" type="guint8"/>
-                       <field name="click_cell" type="GtkCListCellInfo"/>
-                       <field name="hadjustment" type="GtkAdjustment*"/>
-                       <field name="vadjustment" type="GtkAdjustment*"/>
-                       <field name="xor_gc" type="GdkGC*"/>
-                       <field name="fg_gc" type="GdkGC*"/>
-                       <field name="bg_gc" type="GdkGC*"/>
-                       <field name="cursor_drag" type="GdkCursor*"/>
-                       <field name="x_drag" type="gint"/>
-                       <field name="focus_row" type="gint"/>
-                       <field name="focus_header_column" type="gint"/>
-                       <field name="anchor" type="gint"/>
-                       <field name="anchor_state" type="GtkStateType"/>
-                       <field name="drag_pos" type="gint"/>
-                       <field name="htimer" type="gint"/>
-                       <field name="vtimer" type="gint"/>
-                       <field name="sort_type" type="GtkSortType"/>
-                       <field name="compare" type="GtkCListCompareFunc"/>
-                       <field name="sort_column" type="gint"/>
-                       <field name="drag_highlight_row" type="gint"/>
-                       <field name="drag_highlight_pos" type="GtkCListDragPos"/>
-               </object>
-               <object name="GtkCTree" parent="GtkCList" type-name="GtkCTree" get-type="gtk_ctree_get_type">
+                       </method>
+               </boxed>
+               <enum name="GtkAnchorType">
+                       <member name="GTK_ANCHOR_CENTER" value="0"/>
+                       <member name="GTK_ANCHOR_NORTH" value="1"/>
+                       <member name="GTK_ANCHOR_NORTH_WEST" value="2"/>
+                       <member name="GTK_ANCHOR_NORTH_EAST" value="3"/>
+                       <member name="GTK_ANCHOR_SOUTH" value="4"/>
+                       <member name="GTK_ANCHOR_SOUTH_WEST" value="5"/>
+                       <member name="GTK_ANCHOR_SOUTH_EAST" value="6"/>
+                       <member name="GTK_ANCHOR_WEST" value="7"/>
+                       <member name="GTK_ANCHOR_EAST" value="8"/>
+                       <member name="GTK_ANCHOR_N" value="1"/>
+                       <member name="GTK_ANCHOR_NW" value="2"/>
+                       <member name="GTK_ANCHOR_NE" value="3"/>
+                       <member name="GTK_ANCHOR_S" value="4"/>
+                       <member name="GTK_ANCHOR_SW" value="5"/>
+                       <member name="GTK_ANCHOR_SE" value="6"/>
+                       <member name="GTK_ANCHOR_W" value="7"/>
+                       <member name="GTK_ANCHOR_E" value="8"/>
+               </enum>
+               <enum name="GtkArrowType">
+                       <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">
+                       <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"/>
+               </enum>
+               <enum name="GtkBuilderError">
+                       <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"/>
+               </enum>
+               <enum name="GtkButtonBoxStyle">
+                       <member name="GTK_BUTTONBOX_DEFAULT_STYLE" value="0"/>
+                       <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">
+                       <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>
+               <enum name="GtkCListDragPos">
+                       <member name="GTK_CLIST_DRAG_NONE" value="0"/>
+                       <member name="GTK_CLIST_DRAG_BEFORE" value="1"/>
+                       <member name="GTK_CLIST_DRAG_INTO" value="2"/>
+                       <member name="GTK_CLIST_DRAG_AFTER" value="3"/>
+               </enum>
+               <enum name="GtkCTreeExpanderStyle">
+                       <member name="GTK_CTREE_EXPANDER_NONE" value="0"/>
+                       <member name="GTK_CTREE_EXPANDER_SQUARE" value="1"/>
+                       <member name="GTK_CTREE_EXPANDER_TRIANGLE" value="2"/>
+                       <member name="GTK_CTREE_EXPANDER_CIRCULAR" value="3"/>
+               </enum>
+               <enum name="GtkCTreeExpansionType">
+                       <member name="GTK_CTREE_EXPANSION_EXPAND" value="0"/>
+                       <member name="GTK_CTREE_EXPANSION_EXPAND_RECURSIVE" value="1"/>
+                       <member name="GTK_CTREE_EXPANSION_COLLAPSE" value="2"/>
+                       <member name="GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE" value="3"/>
+                       <member name="GTK_CTREE_EXPANSION_TOGGLE" value="4"/>
+                       <member name="GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE" value="5"/>
+               </enum>
+               <enum name="GtkCTreeLineStyle">
+                       <member name="GTK_CTREE_LINES_NONE" value="0"/>
+                       <member name="GTK_CTREE_LINES_SOLID" value="1"/>
+                       <member name="GTK_CTREE_LINES_DOTTED" value="2"/>
+                       <member name="GTK_CTREE_LINES_TABBED" value="3"/>
+               </enum>
+               <enum name="GtkCTreePos">
+                       <member name="GTK_CTREE_POS_BEFORE" value="0"/>
+                       <member name="GTK_CTREE_POS_AS_CHILD" value="1"/>
+                       <member name="GTK_CTREE_POS_AFTER" value="2"/>
+               </enum>
+               <enum name="GtkCellRendererAccelMode">
+                       <member name="GTK_CELL_RENDERER_ACCEL_MODE_GTK" value="0"/>
+                       <member name="GTK_CELL_RENDERER_ACCEL_MODE_OTHER" value="1"/>
+               </enum>
+               <enum name="GtkCellRendererMode">
+                       <member name="GTK_CELL_RENDERER_MODE_INERT" value="0"/>
+                       <member name="GTK_CELL_RENDERER_MODE_ACTIVATABLE" value="1"/>
+                       <member name="GTK_CELL_RENDERER_MODE_EDITABLE" value="2"/>
+               </enum>
+               <enum name="GtkCellType">
+                       <member name="GTK_CELL_EMPTY" value="0"/>
+                       <member name="GTK_CELL_TEXT" value="1"/>
+                       <member name="GTK_CELL_PIXMAP" value="2"/>
+                       <member name="GTK_CELL_PIXTEXT" value="3"/>
+                       <member name="GTK_CELL_WIDGET" value="4"/>
+               </enum>
+               <enum name="GtkCornerType">
+                       <member name="GTK_CORNER_TOP_LEFT" value="0"/>
+                       <member name="GTK_CORNER_BOTTOM_LEFT" value="1"/>
+                       <member name="GTK_CORNER_TOP_RIGHT" value="2"/>
+                       <member name="GTK_CORNER_BOTTOM_RIGHT" value="3"/>
+               </enum>
+               <enum name="GtkCurveType">
+                       <member name="GTK_CURVE_TYPE_LINEAR" value="0"/>
+                       <member name="GTK_CURVE_TYPE_SPLINE" value="1"/>
+                       <member name="GTK_CURVE_TYPE_FREE" value="2"/>
+               </enum>
+               <enum name="GtkDeleteType">
+                       <member name="GTK_DELETE_CHARS" value="0"/>
+                       <member name="GTK_DELETE_WORD_ENDS" value="1"/>
+                       <member name="GTK_DELETE_WORDS" value="2"/>
+                       <member name="GTK_DELETE_DISPLAY_LINES" value="3"/>
+                       <member name="GTK_DELETE_DISPLAY_LINE_ENDS" value="4"/>
+                       <member name="GTK_DELETE_PARAGRAPH_ENDS" value="5"/>
+                       <member name="GTK_DELETE_PARAGRAPHS" value="6"/>
+                       <member name="GTK_DELETE_WHITESPACE" value="7"/>
+               </enum>
+               <enum name="GtkDirectionType">
+                       <member name="GTK_DIR_TAB_FORWARD" value="0"/>
+                       <member name="GTK_DIR_TAB_BACKWARD" value="1"/>
+                       <member name="GTK_DIR_UP" value="2"/>
+                       <member name="GTK_DIR_DOWN" value="3"/>
+                       <member name="GTK_DIR_LEFT" value="4"/>
+                       <member name="GTK_DIR_RIGHT" value="5"/>
+               </enum>
+               <enum name="GtkDragResult">
+                       <member name="GTK_DRAG_RESULT_SUCCESS" value="0"/>
+                       <member name="GTK_DRAG_RESULT_NO_TARGET" value="1"/>
+                       <member name="GTK_DRAG_RESULT_USER_CANCELLED" value="2"/>
+                       <member name="GTK_DRAG_RESULT_TIMEOUT_EXPIRED" value="3"/>
+                       <member name="GTK_DRAG_RESULT_GRAB_BROKEN" value="4"/>
+                       <member name="GTK_DRAG_RESULT_ERROR" value="5"/>
+               </enum>
+               <enum name="GtkExpanderStyle">
+                       <member name="GTK_EXPANDER_COLLAPSED" value="0"/>
+                       <member name="GTK_EXPANDER_SEMI_COLLAPSED" value="1"/>
+                       <member name="GTK_EXPANDER_SEMI_EXPANDED" value="2"/>
+                       <member name="GTK_EXPANDER_EXPANDED" value="3"/>
+               </enum>
+               <enum name="GtkFileChooserAction">
+                       <member name="GTK_FILE_CHOOSER_ACTION_OPEN" value="0"/>
+                       <member name="GTK_FILE_CHOOSER_ACTION_SAVE" value="1"/>
+                       <member name="GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER" value="2"/>
+                       <member name="GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER" value="3"/>
+               </enum>
+               <enum name="GtkFileChooserConfirmation">
+                       <member name="GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM" value="0"/>
+                       <member name="GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME" value="1"/>
+                       <member name="GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN" value="2"/>
+               </enum>
+               <enum name="GtkFileChooserError">
+                       <member name="GTK_FILE_CHOOSER_ERROR_NONEXISTENT" value="0"/>
+                       <member name="GTK_FILE_CHOOSER_ERROR_BAD_FILENAME" value="1"/>
+                       <member name="GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS" value="2"/>
+               </enum>
+               <enum name="GtkIMPreeditStyle">
+                       <member name="GTK_IM_PREEDIT_NOTHING" value="0"/>
+                       <member name="GTK_IM_PREEDIT_CALLBACK" value="1"/>
+                       <member name="GTK_IM_PREEDIT_NONE" value="2"/>
+               </enum>
+               <enum name="GtkIMStatusStyle">
+                       <member name="GTK_IM_STATUS_NOTHING" value="0"/>
+                       <member name="GTK_IM_STATUS_CALLBACK" value="1"/>
+                       <member name="GTK_IM_STATUS_NONE" value="2"/>
+               </enum>
+               <enum name="GtkIconSize">
+                       <member name="GTK_ICON_SIZE_INVALID" value="0"/>
+                       <member name="GTK_ICON_SIZE_MENU" value="1"/>
+                       <member name="GTK_ICON_SIZE_SMALL_TOOLBAR" value="2"/>
+                       <member name="GTK_ICON_SIZE_LARGE_TOOLBAR" value="3"/>
+                       <member name="GTK_ICON_SIZE_BUTTON" value="4"/>
+                       <member name="GTK_ICON_SIZE_DND" value="5"/>
+                       <member name="GTK_ICON_SIZE_DIALOG" value="6"/>
+               </enum>
+               <enum name="GtkIconThemeError">
+                       <member name="GTK_ICON_THEME_NOT_FOUND" value="0"/>
+                       <member name="GTK_ICON_THEME_FAILED" value="1"/>
+               </enum>
+               <enum name="GtkIconViewDropPosition">
+                       <member name="GTK_ICON_VIEW_NO_DROP" value="0"/>
+                       <member name="GTK_ICON_VIEW_DROP_INTO" value="1"/>
+                       <member name="GTK_ICON_VIEW_DROP_LEFT" value="2"/>
+                       <member name="GTK_ICON_VIEW_DROP_RIGHT" value="3"/>
+                       <member name="GTK_ICON_VIEW_DROP_ABOVE" value="4"/>
+                       <member name="GTK_ICON_VIEW_DROP_BELOW" value="5"/>
+               </enum>
+               <enum name="GtkImageType">
+                       <member name="GTK_IMAGE_EMPTY" value="0"/>
+                       <member name="GTK_IMAGE_PIXMAP" value="1"/>
+                       <member name="GTK_IMAGE_IMAGE" value="2"/>
+                       <member name="GTK_IMAGE_PIXBUF" value="3"/>
+                       <member name="GTK_IMAGE_STOCK" value="4"/>
+                       <member name="GTK_IMAGE_ICON_SET" value="5"/>
+                       <member name="GTK_IMAGE_ANIMATION" value="6"/>
+                       <member name="GTK_IMAGE_ICON_NAME" value="7"/>
+               </enum>
+               <enum name="GtkJustification">
+                       <member name="GTK_JUSTIFY_LEFT" value="0"/>
+                       <member name="GTK_JUSTIFY_RIGHT" value="1"/>
+                       <member name="GTK_JUSTIFY_CENTER" value="2"/>
+                       <member name="GTK_JUSTIFY_FILL" value="3"/>
+               </enum>
+               <enum name="GtkMatchType">
+                       <member name="GTK_MATCH_ALL" value="0"/>
+                       <member name="GTK_MATCH_ALL_TAIL" value="1"/>
+                       <member name="GTK_MATCH_HEAD" value="2"/>
+                       <member name="GTK_MATCH_TAIL" value="3"/>
+                       <member name="GTK_MATCH_EXACT" value="4"/>
+                       <member name="GTK_MATCH_LAST" value="5"/>
+               </enum>
+               <enum name="GtkMenuDirectionType">
+                       <member name="GTK_MENU_DIR_PARENT" value="0"/>
+                       <member name="GTK_MENU_DIR_CHILD" value="1"/>
+                       <member name="GTK_MENU_DIR_NEXT" value="2"/>
+                       <member name="GTK_MENU_DIR_PREV" value="3"/>
+               </enum>
+               <enum name="GtkMessageType">
+                       <member name="GTK_MESSAGE_INFO" value="0"/>
+                       <member name="GTK_MESSAGE_WARNING" value="1"/>
+                       <member name="GTK_MESSAGE_QUESTION" value="2"/>
+                       <member name="GTK_MESSAGE_ERROR" value="3"/>
+                       <member name="GTK_MESSAGE_OTHER" value="4"/>
+               </enum>
+               <enum name="GtkMetricType">
+                       <member name="GTK_PIXELS" value="0"/>
+                       <member name="GTK_INCHES" value="1"/>
+                       <member name="GTK_CENTIMETERS" value="2"/>
+               </enum>
+               <enum name="GtkMovementStep">
+                       <member name="GTK_MOVEMENT_LOGICAL_POSITIONS" value="0"/>
+                       <member name="GTK_MOVEMENT_VISUAL_POSITIONS" value="1"/>
+                       <member name="GTK_MOVEMENT_WORDS" value="2"/>
+                       <member name="GTK_MOVEMENT_DISPLAY_LINES" value="3"/>
+                       <member name="GTK_MOVEMENT_DISPLAY_LINE_ENDS" value="4"/>
+                       <member name="GTK_MOVEMENT_PARAGRAPHS" value="5"/>
+                       <member name="GTK_MOVEMENT_PARAGRAPH_ENDS" value="6"/>
+                       <member name="GTK_MOVEMENT_PAGES" value="7"/>
+                       <member name="GTK_MOVEMENT_BUFFER_ENDS" value="8"/>
+                       <member name="GTK_MOVEMENT_HORIZONTAL_PAGES" value="9"/>
+               </enum>
+               <enum name="GtkNotebookTab">
+                       <member name="GTK_NOTEBOOK_TAB_FIRST" value="0"/>
+                       <member name="GTK_NOTEBOOK_TAB_LAST" value="1"/>
+               </enum>
+               <enum name="GtkOrientation">
+                       <member name="GTK_ORIENTATION_HORIZONTAL" value="0"/>
+                       <member name="GTK_ORIENTATION_VERTICAL" value="1"/>
+               </enum>
+               <enum name="GtkPackDirection">
+                       <member name="GTK_PACK_DIRECTION_LTR" value="0"/>
+                       <member name="GTK_PACK_DIRECTION_RTL" value="1"/>
+                       <member name="GTK_PACK_DIRECTION_TTB" value="2"/>
+                       <member name="GTK_PACK_DIRECTION_BTT" value="3"/>
+               </enum>
+               <enum name="GtkPackType">
+                       <member name="GTK_PACK_START" value="0"/>
+                       <member name="GTK_PACK_END" value="1"/>
+               </enum>
+               <enum name="GtkPageOrientation">
+                       <member name="GTK_PAGE_ORIENTATION_PORTRAIT" value="0"/>
+                       <member name="GTK_PAGE_ORIENTATION_LANDSCAPE" value="1"/>
+                       <member name="GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT" value="2"/>
+                       <member name="GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE" value="3"/>
+               </enum>
+               <enum name="GtkPageSet">
+                       <member name="GTK_PAGE_SET_ALL" value="0"/>
+                       <member name="GTK_PAGE_SET_EVEN" value="1"/>
+                       <member name="GTK_PAGE_SET_ODD" value="2"/>
+               </enum>
+               <enum name="GtkPathPriorityType">
+                       <member name="GTK_PATH_PRIO_LOWEST" value="0"/>
+                       <member name="GTK_PATH_PRIO_GTK" value="4"/>
+                       <member name="GTK_PATH_PRIO_APPLICATION" value="8"/>
+                       <member name="GTK_PATH_PRIO_THEME" value="10"/>
+                       <member name="GTK_PATH_PRIO_RC" value="12"/>
+                       <member name="GTK_PATH_PRIO_HIGHEST" value="15"/>
+               </enum>
+               <enum name="GtkPathType">
+                       <member name="GTK_PATH_WIDGET" value="0"/>
+                       <member name="GTK_PATH_WIDGET_CLASS" value="1"/>
+                       <member name="GTK_PATH_CLASS" value="2"/>
+               </enum>
+               <enum name="GtkPolicyType">
+                       <member name="GTK_POLICY_ALWAYS" value="0"/>
+                       <member name="GTK_POLICY_AUTOMATIC" value="1"/>
+                       <member name="GTK_POLICY_NEVER" value="2"/>
+               </enum>
+               <enum name="GtkPositionType">
+                       <member name="GTK_POS_LEFT" value="0"/>
+                       <member name="GTK_POS_RIGHT" value="1"/>
+                       <member name="GTK_POS_TOP" value="2"/>
+                       <member name="GTK_POS_BOTTOM" value="3"/>
+               </enum>
+               <enum name="GtkPreviewType">
+                       <member name="GTK_PREVIEW_COLOR" value="0"/>
+                       <member name="GTK_PREVIEW_GRAYSCALE" value="1"/>
+               </enum>
+               <enum name="GtkPrintDuplex">
+                       <member name="GTK_PRINT_DUPLEX_SIMPLEX" value="0"/>
+                       <member name="GTK_PRINT_DUPLEX_HORIZONTAL" value="1"/>
+                       <member name="GTK_PRINT_DUPLEX_VERTICAL" value="2"/>
+               </enum>
+               <enum name="GtkPrintError">
+                       <member name="GTK_PRINT_ERROR_GENERAL" value="0"/>
+                       <member name="GTK_PRINT_ERROR_INTERNAL_ERROR" value="1"/>
+                       <member name="GTK_PRINT_ERROR_NOMEM" value="2"/>
+                       <member name="GTK_PRINT_ERROR_INVALID_FILE" value="3"/>
+               </enum>
+               <enum name="GtkPrintOperationAction">
+                       <member name="GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG" value="0"/>
+                       <member name="GTK_PRINT_OPERATION_ACTION_PRINT" value="1"/>
+                       <member name="GTK_PRINT_OPERATION_ACTION_PREVIEW" value="2"/>
+                       <member name="GTK_PRINT_OPERATION_ACTION_EXPORT" value="3"/>
+               </enum>
+               <enum name="GtkPrintOperationResult">
+                       <member name="GTK_PRINT_OPERATION_RESULT_ERROR" value="0"/>
+                       <member name="GTK_PRINT_OPERATION_RESULT_APPLY" value="1"/>
+                       <member name="GTK_PRINT_OPERATION_RESULT_CANCEL" value="2"/>
+                       <member name="GTK_PRINT_OPERATION_RESULT_IN_PROGRESS" value="3"/>
+               </enum>
+               <enum name="GtkPrintPages">
+                       <member name="GTK_PRINT_PAGES_ALL" value="0"/>
+                       <member name="GTK_PRINT_PAGES_CURRENT" value="1"/>
+                       <member name="GTK_PRINT_PAGES_RANGES" value="2"/>
+               </enum>
+               <enum name="GtkPrintQuality">
+                       <member name="GTK_PRINT_QUALITY_LOW" value="0"/>
+                       <member name="GTK_PRINT_QUALITY_NORMAL" value="1"/>
+                       <member name="GTK_PRINT_QUALITY_HIGH" value="2"/>
+                       <member name="GTK_PRINT_QUALITY_DRAFT" value="3"/>
+               </enum>
+               <enum name="GtkPrintStatus">
+                       <member name="GTK_PRINT_STATUS_INITIAL" value="0"/>
+                       <member name="GTK_PRINT_STATUS_PREPARING" value="1"/>
+                       <member name="GTK_PRINT_STATUS_GENERATING_DATA" value="2"/>
+                       <member name="GTK_PRINT_STATUS_SENDING_DATA" value="3"/>
+                       <member name="GTK_PRINT_STATUS_PENDING" value="4"/>
+                       <member name="GTK_PRINT_STATUS_PENDING_ISSUE" value="5"/>
+                       <member name="GTK_PRINT_STATUS_PRINTING" value="6"/>
+                       <member name="GTK_PRINT_STATUS_FINISHED" value="7"/>
+                       <member name="GTK_PRINT_STATUS_FINISHED_ABORTED" value="8"/>
+               </enum>
+               <enum name="GtkProgressBarOrientation">
+                       <member name="GTK_PROGRESS_LEFT_TO_RIGHT" value="0"/>
+                       <member name="GTK_PROGRESS_RIGHT_TO_LEFT" value="1"/>
+                       <member name="GTK_PROGRESS_BOTTOM_TO_TOP" value="2"/>
+                       <member name="GTK_PROGRESS_TOP_TO_BOTTOM" value="3"/>
+               </enum>
+               <enum name="GtkProgressBarStyle">
+                       <member name="GTK_PROGRESS_CONTINUOUS" value="0"/>
+                       <member name="GTK_PROGRESS_DISCRETE" value="1"/>
+               </enum>
+               <enum name="GtkRcTokenType">
+                       <member name="GTK_RC_TOKEN_INVALID" value="270"/>
+                       <member name="GTK_RC_TOKEN_INCLUDE" value="271"/>
+                       <member name="GTK_RC_TOKEN_NORMAL" value="272"/>
+                       <member name="GTK_RC_TOKEN_ACTIVE" value="273"/>
+                       <member name="GTK_RC_TOKEN_PRELIGHT" value="274"/>
+                       <member name="GTK_RC_TOKEN_SELECTED" value="275"/>
+                       <member name="GTK_RC_TOKEN_INSENSITIVE" value="276"/>
+                       <member name="GTK_RC_TOKEN_FG" value="277"/>
+                       <member name="GTK_RC_TOKEN_BG" value="278"/>
+                       <member name="GTK_RC_TOKEN_TEXT" value="279"/>
+                       <member name="GTK_RC_TOKEN_BASE" value="280"/>
+                       <member name="GTK_RC_TOKEN_XTHICKNESS" value="281"/>
+                       <member name="GTK_RC_TOKEN_YTHICKNESS" value="282"/>
+                       <member name="GTK_RC_TOKEN_FONT" value="283"/>
+                       <member name="GTK_RC_TOKEN_FONTSET" value="284"/>
+                       <member name="GTK_RC_TOKEN_FONT_NAME" value="285"/>
+                       <member name="GTK_RC_TOKEN_BG_PIXMAP" value="286"/>
+                       <member name="GTK_RC_TOKEN_PIXMAP_PATH" value="287"/>
+                       <member name="GTK_RC_TOKEN_STYLE" value="288"/>
+                       <member name="GTK_RC_TOKEN_BINDING" value="289"/>
+                       <member name="GTK_RC_TOKEN_BIND" value="290"/>
+                       <member name="GTK_RC_TOKEN_WIDGET" value="291"/>
+                       <member name="GTK_RC_TOKEN_WIDGET_CLASS" value="292"/>
+                       <member name="GTK_RC_TOKEN_CLASS" value="293"/>
+                       <member name="GTK_RC_TOKEN_LOWEST" value="294"/>
+                       <member name="GTK_RC_TOKEN_GTK" value="295"/>
+                       <member name="GTK_RC_TOKEN_APPLICATION" value="296"/>
+                       <member name="GTK_RC_TOKEN_THEME" value="297"/>
+                       <member name="GTK_RC_TOKEN_RC" value="298"/>
+                       <member name="GTK_RC_TOKEN_HIGHEST" value="299"/>
+                       <member name="GTK_RC_TOKEN_ENGINE" value="300"/>
+                       <member name="GTK_RC_TOKEN_MODULE_PATH" value="301"/>
+                       <member name="GTK_RC_TOKEN_IM_MODULE_PATH" value="302"/>
+                       <member name="GTK_RC_TOKEN_IM_MODULE_FILE" value="303"/>
+                       <member name="GTK_RC_TOKEN_STOCK" value="304"/>
+                       <member name="GTK_RC_TOKEN_LTR" value="305"/>
+                       <member name="GTK_RC_TOKEN_RTL" value="306"/>
+                       <member name="GTK_RC_TOKEN_COLOR" value="307"/>
+                       <member name="GTK_RC_TOKEN_UNBIND" value="308"/>
+                       <member name="GTK_RC_TOKEN_LAST" value="309"/>
+               </enum>
+               <enum name="GtkRecentChooserError">
+                       <member name="GTK_RECENT_CHOOSER_ERROR_NOT_FOUND" value="0"/>
+                       <member name="GTK_RECENT_CHOOSER_ERROR_INVALID_URI" value="1"/>
+               </enum>
+               <enum name="GtkRecentManagerError">
+                       <member name="GTK_RECENT_MANAGER_ERROR_NOT_FOUND" value="0"/>
+                       <member name="GTK_RECENT_MANAGER_ERROR_INVALID_URI" value="1"/>
+                       <member name="GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING" value="2"/>
+                       <member name="GTK_RECENT_MANAGER_ERROR_NOT_REGISTERED" value="3"/>
+                       <member name="GTK_RECENT_MANAGER_ERROR_READ" value="4"/>
+                       <member name="GTK_RECENT_MANAGER_ERROR_WRITE" value="5"/>
+                       <member name="GTK_RECENT_MANAGER_ERROR_UNKNOWN" value="6"/>
+               </enum>
+               <enum name="GtkRecentSortType">
+                       <member name="GTK_RECENT_SORT_NONE" value="0"/>
+                       <member name="GTK_RECENT_SORT_MRU" value="1"/>
+                       <member name="GTK_RECENT_SORT_LRU" value="2"/>
+                       <member name="GTK_RECENT_SORT_CUSTOM" value="3"/>
+               </enum>
+               <enum name="GtkReliefStyle">
+                       <member name="GTK_RELIEF_NORMAL" value="0"/>
+                       <member name="GTK_RELIEF_HALF" value="1"/>
+                       <member name="GTK_RELIEF_NONE" value="2"/>
+               </enum>
+               <enum name="GtkResizeMode">
+                       <member name="GTK_RESIZE_PARENT" value="0"/>
+                       <member name="GTK_RESIZE_QUEUE" value="1"/>
+                       <member name="GTK_RESIZE_IMMEDIATE" value="2"/>
+               </enum>
+               <enum name="GtkResponseType">
+                       <member name="GTK_RESPONSE_NONE" value="-1"/>
+                       <member name="GTK_RESPONSE_REJECT" value="-2"/>
+                       <member name="GTK_RESPONSE_ACCEPT" value="-3"/>
+                       <member name="GTK_RESPONSE_DELETE_EVENT" value="-4"/>
+                       <member name="GTK_RESPONSE_OK" value="-5"/>
+                       <member name="GTK_RESPONSE_CANCEL" value="-6"/>
+                       <member name="GTK_RESPONSE_CLOSE" value="-7"/>
+                       <member name="GTK_RESPONSE_YES" value="-8"/>
+                       <member name="GTK_RESPONSE_NO" value="-9"/>
+                       <member name="GTK_RESPONSE_APPLY" value="-10"/>
+                       <member name="GTK_RESPONSE_HELP" value="-11"/>
+               </enum>
+               <enum name="GtkScrollStep">
+                       <member name="GTK_SCROLL_STEPS" value="0"/>
+                       <member name="GTK_SCROLL_PAGES" value="1"/>
+                       <member name="GTK_SCROLL_ENDS" value="2"/>
+                       <member name="GTK_SCROLL_HORIZONTAL_STEPS" value="3"/>
+                       <member name="GTK_SCROLL_HORIZONTAL_PAGES" value="4"/>
+                       <member name="GTK_SCROLL_HORIZONTAL_ENDS" value="5"/>
+               </enum>
+               <enum name="GtkScrollType">
+                       <member name="GTK_SCROLL_NONE" value="0"/>
+                       <member name="GTK_SCROLL_JUMP" value="1"/>
+                       <member name="GTK_SCROLL_STEP_BACKWARD" value="2"/>
+                       <member name="GTK_SCROLL_STEP_FORWARD" value="3"/>
+                       <member name="GTK_SCROLL_PAGE_BACKWARD" value="4"/>
+                       <member name="GTK_SCROLL_PAGE_FORWARD" value="5"/>
+                       <member name="GTK_SCROLL_STEP_UP" value="6"/>
+                       <member name="GTK_SCROLL_STEP_DOWN" value="7"/>
+                       <member name="GTK_SCROLL_PAGE_UP" value="8"/>
+                       <member name="GTK_SCROLL_PAGE_DOWN" value="9"/>
+                       <member name="GTK_SCROLL_STEP_LEFT" value="10"/>
+                       <member name="GTK_SCROLL_STEP_RIGHT" value="11"/>
+                       <member name="GTK_SCROLL_PAGE_LEFT" value="12"/>
+                       <member name="GTK_SCROLL_PAGE_RIGHT" value="13"/>
+                       <member name="GTK_SCROLL_START" value="14"/>
+                       <member name="GTK_SCROLL_END" value="15"/>
+               </enum>
+               <enum name="GtkSelectionMode">
+                       <member name="GTK_SELECTION_NONE" value="0"/>
+                       <member name="GTK_SELECTION_SINGLE" value="1"/>
+                       <member name="GTK_SELECTION_BROWSE" value="2"/>
+                       <member name="GTK_SELECTION_MULTIPLE" value="3"/>
+                       <member name="GTK_SELECTION_EXTENDED" value="3"/>
+               </enum>
+               <enum name="GtkSensitivityType">
+                       <member name="GTK_SENSITIVITY_AUTO" value="0"/>
+                       <member name="GTK_SENSITIVITY_ON" value="1"/>
+                       <member name="GTK_SENSITIVITY_OFF" value="2"/>
+               </enum>
+               <enum name="GtkShadowType">
+                       <member name="GTK_SHADOW_NONE" value="0"/>
+                       <member name="GTK_SHADOW_IN" value="1"/>
+                       <member name="GTK_SHADOW_OUT" value="2"/>
+                       <member name="GTK_SHADOW_ETCHED_IN" value="3"/>
+                       <member name="GTK_SHADOW_ETCHED_OUT" value="4"/>
+               </enum>
+               <enum name="GtkSideType">
+                       <member name="GTK_SIDE_TOP" value="0"/>
+                       <member name="GTK_SIDE_BOTTOM" value="1"/>
+                       <member name="GTK_SIDE_LEFT" value="2"/>
+                       <member name="GTK_SIDE_RIGHT" value="3"/>
+               </enum>
+               <enum name="GtkSizeGroupMode">
+                       <member name="GTK_SIZE_GROUP_NONE" value="0"/>
+                       <member name="GTK_SIZE_GROUP_HORIZONTAL" value="1"/>
+                       <member name="GTK_SIZE_GROUP_VERTICAL" value="2"/>
+                       <member name="GTK_SIZE_GROUP_BOTH" value="3"/>
+               </enum>
+               <enum name="GtkSortType">
+                       <member name="GTK_SORT_ASCENDING" value="0"/>
+                       <member name="GTK_SORT_DESCENDING" value="1"/>
+               </enum>
+               <enum name="GtkSpinButtonUpdatePolicy">
+                       <member name="GTK_UPDATE_ALWAYS" value="0"/>
+                       <member name="GTK_UPDATE_IF_VALID" value="1"/>
+               </enum>
+               <enum name="GtkSpinType">
+                       <member name="GTK_SPIN_STEP_FORWARD" value="0"/>
+                       <member name="GTK_SPIN_STEP_BACKWARD" value="1"/>
+                       <member name="GTK_SPIN_PAGE_FORWARD" value="2"/>
+                       <member name="GTK_SPIN_PAGE_BACKWARD" value="3"/>
+                       <member name="GTK_SPIN_HOME" value="4"/>
+                       <member name="GTK_SPIN_END" value="5"/>
+                       <member name="GTK_SPIN_USER_DEFINED" value="6"/>
+               </enum>
+               <enum name="GtkStateType">
+                       <member name="GTK_STATE_NORMAL" value="0"/>
+                       <member name="GTK_STATE_ACTIVE" value="1"/>
+                       <member name="GTK_STATE_PRELIGHT" value="2"/>
+                       <member name="GTK_STATE_SELECTED" value="3"/>
+                       <member name="GTK_STATE_INSENSITIVE" value="4"/>
+               </enum>
+               <enum name="GtkSubmenuDirection">
+                       <member name="GTK_DIRECTION_LEFT" value="0"/>
+                       <member name="GTK_DIRECTION_RIGHT" value="1"/>
+               </enum>
+               <enum name="GtkSubmenuPlacement">
+                       <member name="GTK_TOP_BOTTOM" value="0"/>
+                       <member name="GTK_LEFT_RIGHT" value="1"/>
+               </enum>
+               <enum name="GtkTextBufferTargetInfo">
+                       <member name="GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" value="-1"/>
+                       <member name="GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT" value="-2"/>
+                       <member name="GTK_TEXT_BUFFER_TARGET_INFO_TEXT" value="-3"/>
+               </enum>
+               <enum name="GtkTextDirection">
+                       <member name="GTK_TEXT_DIR_NONE" value="0"/>
+                       <member name="GTK_TEXT_DIR_LTR" value="1"/>
+                       <member name="GTK_TEXT_DIR_RTL" value="2"/>
+               </enum>
+               <enum name="GtkTextWindowType">
+                       <member name="GTK_TEXT_WINDOW_PRIVATE" value="0"/>
+                       <member name="GTK_TEXT_WINDOW_WIDGET" value="1"/>
+                       <member name="GTK_TEXT_WINDOW_TEXT" value="2"/>
+                       <member name="GTK_TEXT_WINDOW_LEFT" value="3"/>
+                       <member name="GTK_TEXT_WINDOW_RIGHT" value="4"/>
+                       <member name="GTK_TEXT_WINDOW_TOP" value="5"/>
+                       <member name="GTK_TEXT_WINDOW_BOTTOM" value="6"/>
+               </enum>
+               <enum name="GtkToolbarChildType">
+                       <member name="GTK_TOOLBAR_CHILD_SPACE" value="0"/>
+                       <member name="GTK_TOOLBAR_CHILD_BUTTON" value="1"/>
+                       <member name="GTK_TOOLBAR_CHILD_TOGGLEBUTTON" value="2"/>
+                       <member name="GTK_TOOLBAR_CHILD_RADIOBUTTON" value="3"/>
+                       <member name="GTK_TOOLBAR_CHILD_WIDGET" value="4"/>
+               </enum>
+               <enum name="GtkToolbarSpaceStyle">
+                       <member name="GTK_TOOLBAR_SPACE_EMPTY" value="0"/>
+                       <member name="GTK_TOOLBAR_SPACE_LINE" value="1"/>
+               </enum>
+               <enum name="GtkToolbarStyle">
+                       <member name="GTK_TOOLBAR_ICONS" value="0"/>
+                       <member name="GTK_TOOLBAR_TEXT" value="1"/>
+                       <member name="GTK_TOOLBAR_BOTH" value="2"/>
+                       <member name="GTK_TOOLBAR_BOTH_HORIZ" value="3"/>
+               </enum>
+               <enum name="GtkTreeViewColumnSizing">
+                       <member name="GTK_TREE_VIEW_COLUMN_GROW_ONLY" value="0"/>
+                       <member name="GTK_TREE_VIEW_COLUMN_AUTOSIZE" value="1"/>
+                       <member name="GTK_TREE_VIEW_COLUMN_FIXED" value="2"/>
+               </enum>
+               <enum name="GtkTreeViewDropPosition">
+                       <member name="GTK_TREE_VIEW_DROP_BEFORE" value="0"/>
+                       <member name="GTK_TREE_VIEW_DROP_AFTER" value="1"/>
+                       <member name="GTK_TREE_VIEW_DROP_INTO_OR_BEFORE" value="2"/>
+                       <member name="GTK_TREE_VIEW_DROP_INTO_OR_AFTER" value="3"/>
+               </enum>
+               <enum name="GtkTreeViewGridLines">
+                       <member name="GTK_TREE_VIEW_GRID_LINES_NONE" value="0"/>
+                       <member name="GTK_TREE_VIEW_GRID_LINES_HORIZONTAL" value="1"/>
+                       <member name="GTK_TREE_VIEW_GRID_LINES_VERTICAL" value="2"/>
+                       <member name="GTK_TREE_VIEW_GRID_LINES_BOTH" value="3"/>
+               </enum>
+               <enum name="GtkTreeViewMode">
+                       <member name="GTK_TREE_VIEW_LINE" value="0"/>
+                       <member name="GTK_TREE_VIEW_ITEM" value="1"/>
+               </enum>
+               <enum name="GtkUnit">
+                       <member name="GTK_UNIT_PIXEL" value="0"/>
+                       <member name="GTK_UNIT_POINTS" value="1"/>
+                       <member name="GTK_UNIT_INCH" value="2"/>
+                       <member name="GTK_UNIT_MM" value="3"/>
+               </enum>
+               <enum name="GtkUpdateType">
+                       <member name="GTK_UPDATE_CONTINUOUS" value="0"/>
+                       <member name="GTK_UPDATE_DISCONTINUOUS" value="1"/>
+                       <member name="GTK_UPDATE_DELAYED" value="2"/>
+               </enum>
+               <enum name="GtkVisibility">
+                       <member name="GTK_VISIBILITY_NONE" value="0"/>
+                       <member name="GTK_VISIBILITY_PARTIAL" value="1"/>
+                       <member name="GTK_VISIBILITY_FULL" value="2"/>
+               </enum>
+               <enum name="GtkWidgetHelpType">
+                       <member name="GTK_WIDGET_HELP_TOOLTIP" value="0"/>
+                       <member name="GTK_WIDGET_HELP_WHATS_THIS" value="1"/>
+               </enum>
+               <enum name="GtkWindowPosition">
+                       <member name="GTK_WIN_POS_NONE" value="0"/>
+                       <member name="GTK_WIN_POS_CENTER" value="1"/>
+                       <member name="GTK_WIN_POS_MOUSE" value="2"/>
+                       <member name="GTK_WIN_POS_CENTER_ALWAYS" value="3"/>
+                       <member name="GTK_WIN_POS_CENTER_ON_PARENT" value="4"/>
+               </enum>
+               <enum name="GtkWindowType">
+                       <member name="GTK_WINDOW_TOPLEVEL" value="0"/>
+                       <member name="GTK_WINDOW_POPUP" value="1"/>
+               </enum>
+               <enum name="GtkWrapMode">
+                       <member name="GTK_WRAP_NONE" value="0"/>
+                       <member name="GTK_WRAP_CHAR" value="1"/>
+                       <member name="GTK_WRAP_WORD" value="2"/>
+                       <member name="GTK_WRAP_WORD_CHAR" value="3"/>
+               </enum>
+               <flags name="GtkAccelFlags">
+                       <member name="GTK_ACCEL_VISIBLE" value="1"/>
+                       <member name="GTK_ACCEL_LOCKED" value="2"/>
+                       <member name="GTK_ACCEL_MASK" value="7"/>
+               </flags>
+               <flags name="GtkArgFlags">
+                       <member name="GTK_ARG_READABLE" value="1"/>
+                       <member name="GTK_ARG_WRITABLE" value="2"/>
+                       <member name="GTK_ARG_CONSTRUCT" value="4"/>
+                       <member name="GTK_ARG_CONSTRUCT_ONLY" value="8"/>
+                       <member name="GTK_ARG_CHILD_ARG" value="16"/>
+               </flags>
+               <flags name="GtkAttachOptions">
+                       <member name="GTK_EXPAND" value="1"/>
+                       <member name="GTK_SHRINK" value="2"/>
+                       <member name="GTK_FILL" value="4"/>
+               </flags>
+               <flags name="GtkButtonAction">
+                       <member name="GTK_BUTTON_IGNORED" value="0"/>
+                       <member name="GTK_BUTTON_SELECTS" value="1"/>
+                       <member name="GTK_BUTTON_DRAGS" value="2"/>
+                       <member name="GTK_BUTTON_EXPANDS" value="4"/>
+               </flags>
+               <flags name="GtkCalendarDisplayOptions">
+                       <member name="GTK_CALENDAR_SHOW_HEADING" value="1"/>
+                       <member name="GTK_CALENDAR_SHOW_DAY_NAMES" value="2"/>
+                       <member name="GTK_CALENDAR_NO_MONTH_CHANGE" value="4"/>
+                       <member name="GTK_CALENDAR_SHOW_WEEK_NUMBERS" value="8"/>
+                       <member name="GTK_CALENDAR_WEEK_START_MONDAY" value="16"/>
+               </flags>
+               <flags name="GtkCellRendererState">
+                       <member name="GTK_CELL_RENDERER_SELECTED" value="1"/>
+                       <member name="GTK_CELL_RENDERER_PRELIT" value="2"/>
+                       <member name="GTK_CELL_RENDERER_INSENSITIVE" value="4"/>
+                       <member name="GTK_CELL_RENDERER_SORTED" value="8"/>
+                       <member name="GTK_CELL_RENDERER_FOCUSED" value="16"/>
+               </flags>
+               <flags name="GtkDebugFlag">
+                       <member name="GTK_DEBUG_MISC" value="1"/>
+                       <member name="GTK_DEBUG_PLUGSOCKET" value="2"/>
+                       <member name="GTK_DEBUG_TEXT" value="4"/>
+                       <member name="GTK_DEBUG_TREE" value="8"/>
+                       <member name="GTK_DEBUG_UPDATES" value="16"/>
+                       <member name="GTK_DEBUG_KEYBINDINGS" value="32"/>
+                       <member name="GTK_DEBUG_MULTIHEAD" value="64"/>
+                       <member name="GTK_DEBUG_MODULES" value="128"/>
+                       <member name="GTK_DEBUG_GEOMETRY" value="256"/>
+                       <member name="GTK_DEBUG_ICONTHEME" value="512"/>
+                       <member name="GTK_DEBUG_PRINTING" value="1024"/>
+                       <member name="GTK_DEBUG_BUILDER" value="2048"/>
+               </flags>
+               <flags name="GtkDestDefaults">
+                       <member name="GTK_DEST_DEFAULT_MOTION" value="1"/>
+                       <member name="GTK_DEST_DEFAULT_HIGHLIGHT" value="2"/>
+                       <member name="GTK_DEST_DEFAULT_DROP" value="4"/>
+                       <member name="GTK_DEST_DEFAULT_ALL" value="7"/>
+               </flags>
+               <flags name="GtkDialogFlags">
+                       <member name="GTK_DIALOG_MODAL" value="1"/>
+                       <member name="GTK_DIALOG_DESTROY_WITH_PARENT" value="2"/>
+                       <member name="GTK_DIALOG_NO_SEPARATOR" value="4"/>
+               </flags>
+               <flags name="GtkFileFilterFlags">
+                       <member name="GTK_FILE_FILTER_FILENAME" value="1"/>
+                       <member name="GTK_FILE_FILTER_URI" value="2"/>
+                       <member name="GTK_FILE_FILTER_DISPLAY_NAME" value="4"/>
+                       <member name="GTK_FILE_FILTER_MIME_TYPE" value="8"/>
+               </flags>
+               <flags name="GtkIconLookupFlags">
+                       <member name="GTK_ICON_LOOKUP_NO_SVG" value="1"/>
+                       <member name="GTK_ICON_LOOKUP_FORCE_SVG" value="2"/>
+                       <member name="GTK_ICON_LOOKUP_USE_BUILTIN" value="4"/>
+                       <member name="GTK_ICON_LOOKUP_GENERIC_FALLBACK" value="8"/>
+               </flags>
+               <flags name="GtkObjectFlags">
+                       <member name="GTK_IN_DESTRUCTION" value="1"/>
+                       <member name="GTK_FLOATING" value="2"/>
+                       <member name="GTK_RESERVED_1" value="4"/>
+                       <member name="GTK_RESERVED_2" value="8"/>
+               </flags>
+               <flags name="GtkPrivateFlags">
+                       <member name="PRIVATE_GTK_USER_STYLE" value="1"/>
+                       <member name="PRIVATE_GTK_RESIZE_PENDING" value="4"/>
+                       <member name="PRIVATE_GTK_LEAVE_PENDING" value="16"/>
+                       <member name="PRIVATE_GTK_HAS_SHAPE_MASK" value="32"/>
+                       <member name="PRIVATE_GTK_IN_REPARENT" value="64"/>
+                       <member name="PRIVATE_GTK_DIRECTION_SET" value="128"/>
+                       <member name="PRIVATE_GTK_DIRECTION_LTR" value="256"/>
+                       <member name="PRIVATE_GTK_ANCHORED" value="512"/>
+                       <member name="PRIVATE_GTK_CHILD_VISIBLE" value="1024"/>
+                       <member name="PRIVATE_GTK_REDRAW_ON_ALLOC" value="2048"/>
+                       <member name="PRIVATE_GTK_ALLOC_NEEDED" value="4096"/>
+                       <member name="PRIVATE_GTK_REQUEST_NEEDED" value="8192"/>
+               </flags>
+               <flags name="GtkRcFlags">
+                       <member name="GTK_RC_FG" value="1"/>
+                       <member name="GTK_RC_BG" value="2"/>
+                       <member name="GTK_RC_TEXT" value="4"/>
+                       <member name="GTK_RC_BASE" value="8"/>
+               </flags>
+               <flags name="GtkRecentFilterFlags">
+                       <member name="GTK_RECENT_FILTER_URI" value="1"/>
+                       <member name="GTK_RECENT_FILTER_DISPLAY_NAME" value="2"/>
+                       <member name="GTK_RECENT_FILTER_MIME_TYPE" value="4"/>
+                       <member name="GTK_RECENT_FILTER_APPLICATION" value="8"/>
+                       <member name="GTK_RECENT_FILTER_GROUP" value="16"/>
+                       <member name="GTK_RECENT_FILTER_AGE" value="32"/>
+               </flags>
+               <flags name="GtkSignalRunType">
+                       <member name="GTK_RUN_FIRST" value="1"/>
+                       <member name="GTK_RUN_LAST" value="2"/>
+                       <member name="GTK_RUN_BOTH" value="3"/>
+                       <member name="GTK_RUN_NO_RECURSE" value="8"/>
+                       <member name="GTK_RUN_ACTION" value="32"/>
+                       <member name="GTK_RUN_NO_HOOKS" value="64"/>
+               </flags>
+               <flags name="GtkTargetFlags">
+                       <member name="GTK_TARGET_SAME_APP" value="1"/>
+                       <member name="GTK_TARGET_SAME_WIDGET" value="2"/>
+                       <member name="GTK_TARGET_OTHER_APP" value="4"/>
+                       <member name="GTK_TARGET_OTHER_WIDGET" value="8"/>
+               </flags>
+               <flags name="GtkTextSearchFlags">
+                       <member name="GTK_TEXT_SEARCH_VISIBLE_ONLY" value="1"/>
+                       <member name="GTK_TEXT_SEARCH_TEXT_ONLY" value="2"/>
+               </flags>
+               <flags name="GtkTreeModelFlags">
+                       <member name="GTK_TREE_MODEL_ITERS_PERSIST" value="1"/>
+                       <member name="GTK_TREE_MODEL_LIST_ONLY" value="2"/>
+               </flags>
+               <flags name="GtkUIManagerItemType">
+                       <member name="GTK_UI_MANAGER_AUTO" value="0"/>
+                       <member name="GTK_UI_MANAGER_MENUBAR" value="1"/>
+                       <member name="GTK_UI_MANAGER_MENU" value="2"/>
+                       <member name="GTK_UI_MANAGER_TOOLBAR" value="4"/>
+                       <member name="GTK_UI_MANAGER_PLACEHOLDER" value="8"/>
+                       <member name="GTK_UI_MANAGER_POPUP" value="16"/>
+                       <member name="GTK_UI_MANAGER_MENUITEM" value="32"/>
+                       <member name="GTK_UI_MANAGER_TOOLITEM" value="64"/>
+                       <member name="GTK_UI_MANAGER_SEPARATOR" value="128"/>
+                       <member name="GTK_UI_MANAGER_ACCELERATOR" value="256"/>
+               </flags>
+               <flags name="GtkWidgetFlags">
+                       <member name="GTK_TOPLEVEL" value="16"/>
+                       <member name="GTK_NO_WINDOW" value="32"/>
+                       <member name="GTK_REALIZED" value="64"/>
+                       <member name="GTK_MAPPED" value="128"/>
+                       <member name="GTK_VISIBLE" value="256"/>
+                       <member name="GTK_SENSITIVE" value="512"/>
+                       <member name="GTK_PARENT_SENSITIVE" value="1024"/>
+                       <member name="GTK_CAN_FOCUS" value="2048"/>
+                       <member name="GTK_HAS_FOCUS" value="4096"/>
+                       <member name="GTK_CAN_DEFAULT" value="8192"/>
+                       <member name="GTK_HAS_DEFAULT" value="16384"/>
+                       <member name="GTK_HAS_GRAB" value="32768"/>
+                       <member name="GTK_RC_STYLE" value="65536"/>
+                       <member name="GTK_COMPOSITE_CHILD" value="131072"/>
+                       <member name="GTK_NO_REPARENT" value="262144"/>
+                       <member name="GTK_APP_PAINTABLE" value="524288"/>
+                       <member name="GTK_RECEIVES_DEFAULT" value="1048576"/>
+                       <member name="GTK_DOUBLE_BUFFERED" value="2097152"/>
+                       <member name="GTK_NO_SHOW_ALL" value="4194304"/>
+               </flags>
+               <object name="GtkAboutDialog" parent="GtkDialog" type-name="GtkAboutDialog" get-type="gtk_about_dialog_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
                        </implements>
-                       <method name="collapse" symbol="gtk_ctree_collapse">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                               </parameters>
-                       </method>
-                       <method name="collapse_recursive" symbol="gtk_ctree_collapse_recursive">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                               </parameters>
-                       </method>
-                       <method name="collapse_to_depth" symbol="gtk_ctree_collapse_to_depth">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="depth" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="expand" symbol="gtk_ctree_expand">
-                               <return-type type="void"/>
+                       <method name="get_artists" symbol="gtk_about_dialog_get_artists">
+                               <return-type type="gchar**"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="expand_recursive" symbol="gtk_ctree_expand_recursive">
-                               <return-type type="void"/>
+                       <method name="get_authors" symbol="gtk_about_dialog_get_authors">
+                               <return-type type="gchar**"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="expand_to_depth" symbol="gtk_ctree_expand_to_depth">
-                               <return-type type="void"/>
+                       <method name="get_comments" symbol="gtk_about_dialog_get_comments">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="depth" type="gint"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="export_to_gnode" symbol="gtk_ctree_export_to_gnode">
-                               <return-type type="GNode*"/>
+                       <method name="get_copyright" symbol="gtk_about_dialog_get_copyright">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="parent" type="GNode*"/>
-                                       <parameter name="sibling" type="GNode*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="func" type="GtkCTreeGNodeFunc"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="find" symbol="gtk_ctree_find">
-                               <return-type type="gboolean"/>
+                       <method name="get_documenters" symbol="gtk_about_dialog_get_documenters">
+                               <return-type type="gchar**"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="child" type="GtkCTreeNode*"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="find_all_by_row_data" symbol="gtk_ctree_find_all_by_row_data">
-                               <return-type type="GList*"/>
+                       <method name="get_license" symbol="gtk_about_dialog_get_license">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="find_all_by_row_data_custom" symbol="gtk_ctree_find_all_by_row_data_custom">
-                               <return-type type="GList*"/>
+                       <method name="get_logo" symbol="gtk_about_dialog_get_logo">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="func" type="GCompareFunc"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="find_by_row_data" symbol="gtk_ctree_find_by_row_data">
-                               <return-type type="GtkCTreeNode*"/>
+                       <method name="get_logo_icon_name" symbol="gtk_about_dialog_get_logo_icon_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="find_by_row_data_custom" symbol="gtk_ctree_find_by_row_data_custom">
-                               <return-type type="GtkCTreeNode*"/>
+                       <method name="get_program_name" symbol="gtk_about_dialog_get_program_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="func" type="GCompareFunc"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="find_node_ptr" symbol="gtk_ctree_find_node_ptr">
-                               <return-type type="GtkCTreeNode*"/>
+                       <method name="get_translator_credits" symbol="gtk_about_dialog_get_translator_credits">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="ctree_row" type="GtkCTreeRow*"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="get_node_info" symbol="gtk_ctree_get_node_info">
-                               <return-type type="gboolean"/>
+                       <method name="get_version" symbol="gtk_about_dialog_get_version">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="text" type="gchar**"/>
-                                       <parameter name="spacing" type="guint8*"/>
-                                       <parameter name="pixmap_closed" type="GdkPixmap**"/>
-                                       <parameter name="mask_closed" type="GdkBitmap**"/>
-                                       <parameter name="pixmap_opened" type="GdkPixmap**"/>
-                                       <parameter name="mask_opened" type="GdkBitmap**"/>
-                                       <parameter name="is_leaf" type="gboolean*"/>
-                                       <parameter name="expanded" type="gboolean*"/>
-                               </parameters>
-                       </method>
-                       <method name="insert_gnode" symbol="gtk_ctree_insert_gnode">
-                               <return-type type="GtkCTreeNode*"/>
-                               <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="parent" type="GtkCTreeNode*"/>
-                                       <parameter name="sibling" type="GtkCTreeNode*"/>
-                                       <parameter name="gnode" type="GNode*"/>
-                                       <parameter name="func" type="GtkCTreeGNodeFunc"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="insert_node" symbol="gtk_ctree_insert_node">
-                               <return-type type="GtkCTreeNode*"/>
+                       <method name="get_website" symbol="gtk_about_dialog_get_website">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="parent" type="GtkCTreeNode*"/>
-                                       <parameter name="sibling" type="GtkCTreeNode*"/>
-                                       <parameter name="text" type="gchar*[]"/>
-                                       <parameter name="spacing" type="guint8"/>
-                                       <parameter name="pixmap_closed" type="GdkPixmap*"/>
-                                       <parameter name="mask_closed" type="GdkBitmap*"/>
-                                       <parameter name="pixmap_opened" type="GdkPixmap*"/>
-                                       <parameter name="mask_opened" type="GdkBitmap*"/>
-                                       <parameter name="is_leaf" type="gboolean"/>
-                                       <parameter name="expanded" type="gboolean"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="is_ancestor" symbol="gtk_ctree_is_ancestor">
-                               <return-type type="gboolean"/>
+                       <method name="get_website_label" symbol="gtk_about_dialog_get_website_label">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="child" type="GtkCTreeNode*"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="is_hot_spot" symbol="gtk_ctree_is_hot_spot">
+                       <method name="get_wrap_license" symbol="gtk_about_dialog_get_wrap_license">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
                                </parameters>
                        </method>
-                       <method name="is_viewable" symbol="gtk_ctree_is_viewable">
-                               <return-type type="gboolean"/>
+                       <constructor name="new" symbol="gtk_about_dialog_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="set_artists" symbol="gtk_about_dialog_set_artists">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="artists" type="gchar**"/>
                                </parameters>
                        </method>
-                       <method name="last" symbol="gtk_ctree_last">
-                               <return-type type="GtkCTreeNode*"/>
+                       <method name="set_authors" symbol="gtk_about_dialog_set_authors">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="authors" type="gchar**"/>
                                </parameters>
                        </method>
-                       <method name="move" symbol="gtk_ctree_move">
+                       <method name="set_comments" symbol="gtk_about_dialog_set_comments">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="new_parent" type="GtkCTreeNode*"/>
-                                       <parameter name="new_sibling" type="GtkCTreeNode*"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="comments" type="gchar*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_ctree_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="set_copyright" symbol="gtk_about_dialog_set_copyright">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="columns" type="gint"/>
-                                       <parameter name="tree_column" type="gint"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="copyright" type="gchar*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_titles" symbol="gtk_ctree_new_with_titles">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_documenters" symbol="gtk_about_dialog_set_documenters">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="columns" type="gint"/>
-                                       <parameter name="tree_column" type="gint"/>
-                                       <parameter name="titles" type="gchar*[]"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="documenters" type="gchar**"/>
                                </parameters>
-                       </constructor>
-                       <method name="post_recursive" symbol="gtk_ctree_post_recursive">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="set_email_hook" symbol="gtk_about_dialog_set_email_hook">
+                               <return-type type="GtkAboutDialogActivateLinkFunc"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="func" type="GtkCTreeFunc"/>
+                                       <parameter name="func" type="GtkAboutDialogActivateLinkFunc"/>
                                        <parameter name="data" type="gpointer"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </parameters>
                        </method>
-                       <method name="post_recursive_to_depth" symbol="gtk_ctree_post_recursive_to_depth">
+                       <method name="set_license" symbol="gtk_about_dialog_set_license">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="depth" type="gint"/>
-                                       <parameter name="func" type="GtkCTreeFunc"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="license" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="pre_recursive" symbol="gtk_ctree_pre_recursive">
+                       <method name="set_logo" symbol="gtk_about_dialog_set_logo">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="func" type="GtkCTreeFunc"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="logo" type="GdkPixbuf*"/>
                                </parameters>
                        </method>
-                       <method name="pre_recursive_to_depth" symbol="gtk_ctree_pre_recursive_to_depth">
+                       <method name="set_logo_icon_name" symbol="gtk_about_dialog_set_logo_icon_name">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="depth" type="gint"/>
-                                       <parameter name="func" type="GtkCTreeFunc"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="real_select_recursive" symbol="gtk_ctree_real_select_recursive">
+                       <method name="set_program_name" symbol="gtk_about_dialog_set_program_name">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="state" type="gint"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="remove_node" symbol="gtk_ctree_remove_node">
+                       <method name="set_translator_credits" symbol="gtk_about_dialog_set_translator_credits">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="translator_credits" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="select" symbol="gtk_ctree_select">
-                               <return-type type="void"/>
+                       <method name="set_url_hook" symbol="gtk_about_dialog_set_url_hook">
+                               <return-type type="GtkAboutDialogActivateLinkFunc"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="func" type="GtkAboutDialogActivateLinkFunc"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </parameters>
                        </method>
-                       <method name="select_recursive" symbol="gtk_ctree_select_recursive">
+                       <method name="set_version" symbol="gtk_about_dialog_set_version">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="version" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_drag_compare_func" symbol="gtk_ctree_set_drag_compare_func">
+                       <method name="set_website" symbol="gtk_about_dialog_set_website">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="cmp_func" type="GtkCTreeCompareDragFunc"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="website" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_expander_style" symbol="gtk_ctree_set_expander_style">
+                       <method name="set_website_label" symbol="gtk_about_dialog_set_website_label">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="expander_style" type="GtkCTreeExpanderStyle"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="website_label" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_indent" symbol="gtk_ctree_set_indent">
+                       <method name="set_wrap_license" symbol="gtk_about_dialog_set_wrap_license">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="indent" type="gint"/>
+                                       <parameter name="about" type="GtkAboutDialog*"/>
+                                       <parameter name="wrap_license" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_line_style" symbol="gtk_ctree_set_line_style">
-                               <return-type type="void"/>
+                       <property name="artists" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="authors" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="comments" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="copyright" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="documenters" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="license" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="logo" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="logo-icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="program-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="translator-credits" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="version" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="website" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="website-label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="wrap-license" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="GtkAccelGroup" parent="GObject" type-name="GtkAccelGroup" get-type="gtk_accel_group_get_type">
+                       <method name="activate" symbol="gtk_accel_group_activate">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="line_style" type="GtkCTreeLineStyle"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="accel_quark" type="GQuark"/>
+                                       <parameter name="acceleratable" type="GObject*"/>
+                                       <parameter name="accel_key" type="guint"/>
+                                       <parameter name="accel_mods" type="GdkModifierType"/>
                                </parameters>
                        </method>
-                       <method name="set_node_info" symbol="gtk_ctree_set_node_info">
+                       <method name="connect" symbol="gtk_accel_group_connect">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
-                                       <parameter name="text" type="gchar*"/>
-                                       <parameter name="spacing" type="guint8"/>
-                                       <parameter name="pixmap_closed" type="GdkPixmap*"/>
-                                       <parameter name="mask_closed" type="GdkBitmap*"/>
-                                       <parameter name="pixmap_opened" type="GdkPixmap*"/>
-                                       <parameter name="mask_opened" type="GdkBitmap*"/>
-                                       <parameter name="is_leaf" type="gboolean"/>
-                                       <parameter name="expanded" type="gboolean"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="accel_key" type="guint"/>
+                                       <parameter name="accel_mods" type="GdkModifierType"/>
+                                       <parameter name="accel_flags" type="GtkAccelFlags"/>
+                                       <parameter name="closure" type="GClosure*"/>
                                </parameters>
                        </method>
-                       <method name="set_show_stub" symbol="gtk_ctree_set_show_stub">
+                       <method name="connect_by_path" symbol="gtk_accel_group_connect_by_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="show_stub" type="gboolean"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="accel_path" type="gchar*"/>
+                                       <parameter name="closure" type="GClosure*"/>
                                </parameters>
                        </method>
-                       <method name="set_spacing" symbol="gtk_ctree_set_spacing">
-                               <return-type type="void"/>
+                       <method name="disconnect" symbol="gtk_accel_group_disconnect">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="spacing" type="gint"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="closure" type="GClosure*"/>
                                </parameters>
                        </method>
-                       <method name="sort_node" symbol="gtk_ctree_sort_node">
-                               <return-type type="void"/>
+                       <method name="disconnect_key" symbol="gtk_accel_group_disconnect_key">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="accel_key" type="guint"/>
+                                       <parameter name="accel_mods" type="GdkModifierType"/>
                                </parameters>
                        </method>
-                       <method name="sort_recursive" symbol="gtk_ctree_sort_recursive">
-                               <return-type type="void"/>
+                       <method name="find" symbol="gtk_accel_group_find">
+                               <return-type type="GtkAccelKey*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="find_func" type="GtkAccelGroupFindFunc"/>
+                                       <parameter name="data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="toggle_expansion" symbol="gtk_ctree_toggle_expansion">
-                               <return-type type="void"/>
+                       <method name="from_accel_closure" symbol="gtk_accel_group_from_accel_closure">
+                               <return-type type="GtkAccelGroup*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="closure" type="GClosure*"/>
                                </parameters>
                        </method>
-                       <method name="toggle_expansion_recursive" symbol="gtk_ctree_toggle_expansion_recursive">
+                       <method name="lock" symbol="gtk_accel_group_lock">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
                                </parameters>
                        </method>
-                       <method name="unselect" symbol="gtk_ctree_unselect">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_accel_group_new">
+                               <return-type type="GtkAccelGroup*"/>
+                       </constructor>
+                       <method name="query" symbol="gtk_accel_group_query">
+                               <return-type type="GtkAccelGroupEntry*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="accel_key" type="guint"/>
+                                       <parameter name="accel_mods" type="GdkModifierType"/>
+                                       <parameter name="n_entries" type="guint*"/>
                                </parameters>
                        </method>
-                       <method name="unselect_recursive" symbol="gtk_ctree_unselect_recursive">
+                       <method name="unlock" symbol="gtk_accel_group_unlock">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode*"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
                                </parameters>
                        </method>
-                       <property name="expander-style" type="GtkCTreeExpanderStyle" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="indent" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="line-style" type="GtkCTreeLineStyle" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="n-columns" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="show-stub" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="spacing" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="tree-column" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <signal name="change-focus-row-expansion" when="LAST">
-                               <return-type type="void"/>
+                       <signal name="accel-activate" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="action" type="GtkCTreeExpansionType"/>
+                                       <parameter name="object" type="GtkAccelGroup*"/>
+                                       <parameter name="p0" type="GObject*"/>
+                                       <parameter name="p1" type="guint"/>
+                                       <parameter name="p2" type="GdkModifierType"/>
                                </parameters>
                        </signal>
-                       <signal name="tree-collapse" when="LAST">
+                       <signal name="accel-changed" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="keyval" type="guint"/>
+                                       <parameter name="modifier" type="GdkModifierType"/>
+                                       <parameter name="accel_closure" type="GClosure*"/>
                                </parameters>
                        </signal>
-                       <signal name="tree-expand" when="LAST">
-                               <return-type type="void"/>
+                       <field name="lock_count" type="guint"/>
+                       <field name="modifier_mask" type="GdkModifierType"/>
+                       <field name="acceleratables" type="GSList*"/>
+                       <field name="n_accels" type="guint"/>
+               </object>
+               <object name="GtkAccelLabel" parent="GtkLabel" type-name="GtkAccelLabel" get-type="gtk_accel_label_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_accel_widget" symbol="gtk_accel_label_get_accel_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode"/>
+                                       <parameter name="accel_label" type="GtkAccelLabel*"/>
                                </parameters>
-                       </signal>
-                       <signal name="tree-move" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_accel_width" symbol="gtk_accel_label_get_accel_width">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="node" type="GtkCTreeNode"/>
-                                       <parameter name="new_parent" type="GtkCTreeNode"/>
-                                       <parameter name="new_sibling" type="GtkCTreeNode"/>
+                                       <parameter name="accel_label" type="GtkAccelLabel*"/>
                                </parameters>
-                       </signal>
-                       <signal name="tree-select-row" when="FIRST">
+                       </method>
+                       <constructor name="new" symbol="gtk_accel_label_new">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="string" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="refetch" symbol="gtk_accel_label_refetch">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="accel_label" type="GtkAccelLabel*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_accel_closure" symbol="gtk_accel_label_set_accel_closure">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="row" type="GtkCTreeNode"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="accel_label" type="GtkAccelLabel*"/>
+                                       <parameter name="accel_closure" type="GClosure*"/>
                                </parameters>
-                       </signal>
-                       <signal name="tree-unselect-row" when="FIRST">
+                       </method>
+                       <method name="set_accel_widget" symbol="gtk_accel_label_set_accel_widget">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ctree" type="GtkCTree*"/>
-                                       <parameter name="row" type="GtkCTreeNode"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="accel_label" type="GtkAccelLabel*"/>
+                                       <parameter name="accel_widget" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
-                       <field name="lines_gc" type="GdkGC*"/>
-                       <field name="tree_indent" type="gint"/>
-                       <field name="tree_spacing" type="gint"/>
-                       <field name="tree_column" type="gint"/>
-                       <field name="line_style" type="guint"/>
-                       <field name="expander_style" type="guint"/>
-                       <field name="show_stub" type="guint"/>
-                       <field name="drag_compare" type="GtkCTreeCompareDragFunc"/>
+                       </method>
+                       <property name="accel-closure" type="GClosure*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="accel-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <field name="gtk_reserved" type="guint"/>
+                       <field name="accel_padding" type="guint"/>
+                       <field name="accel_widget" type="GtkWidget*"/>
+                       <field name="accel_closure" type="GClosure*"/>
+                       <field name="accel_group" type="GtkAccelGroup*"/>
+                       <field name="accel_string" type="gchar*"/>
+                       <field name="accel_string_width" type="guint16"/>
                </object>
-               <object name="GtkCalendar" parent="GtkWidget" type-name="GtkCalendar" get-type="gtk_calendar_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="clear_marks" symbol="gtk_calendar_clear_marks">
+               <object name="GtkAccelMap" parent="GObject" type-name="GtkAccelMap" get-type="gtk_accel_map_get_type">
+                       <method name="add_entry" symbol="gtk_accel_map_add_entry">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="accel_path" type="gchar*"/>
+                                       <parameter name="accel_key" type="guint"/>
+                                       <parameter name="accel_mods" type="GdkModifierType"/>
+                               </parameters>
+                       </method>
+                       <method name="add_filter" symbol="gtk_accel_map_add_filter">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="filter_pattern" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="change_entry" symbol="gtk_accel_map_change_entry">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="accel_path" type="gchar*"/>
+                                       <parameter name="accel_key" type="guint"/>
+                                       <parameter name="accel_mods" type="GdkModifierType"/>
+                                       <parameter name="replace" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="display_options" symbol="gtk_calendar_display_options">
+                       <method name="foreach" symbol="gtk_accel_map_foreach">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
-                                       <parameter name="flags" type="GtkCalendarDisplayOptions"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="foreach_func" type="GtkAccelMapForeach"/>
                                </parameters>
                        </method>
-                       <method name="freeze" symbol="gtk_calendar_freeze">
+                       <method name="foreach_unfiltered" symbol="gtk_accel_map_foreach_unfiltered">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="foreach_func" type="GtkAccelMapForeach"/>
                                </parameters>
                        </method>
-                       <method name="get_date" symbol="gtk_calendar_get_date">
+                       <method name="get" symbol="gtk_accel_map_get">
+                               <return-type type="GtkAccelMap*"/>
+                       </method>
+                       <method name="load" symbol="gtk_accel_map_load">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
-                                       <parameter name="year" type="guint*"/>
-                                       <parameter name="month" type="guint*"/>
-                                       <parameter name="day" type="guint*"/>
+                                       <parameter name="file_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_display_options" symbol="gtk_calendar_get_display_options">
-                               <return-type type="GtkCalendarDisplayOptions"/>
+                       <method name="load_fd" symbol="gtk_accel_map_load_fd">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="fd" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="mark_day" symbol="gtk_calendar_mark_day">
-                               <return-type type="gboolean"/>
+                       <method name="load_scanner" symbol="gtk_accel_map_load_scanner">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
-                                       <parameter name="day" type="guint"/>
+                                       <parameter name="scanner" type="GScanner*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_calendar_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="select_day" symbol="gtk_calendar_select_day">
+                       <method name="lock_path" symbol="gtk_accel_map_lock_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
-                                       <parameter name="day" type="guint"/>
+                                       <parameter name="accel_path" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="select_month" symbol="gtk_calendar_select_month">
+                       <method name="lookup_entry" symbol="gtk_accel_map_lookup_entry">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
-                                       <parameter name="month" type="guint"/>
-                                       <parameter name="year" type="guint"/>
+                                       <parameter name="accel_path" type="gchar*"/>
+                                       <parameter name="key" type="GtkAccelKey*"/>
                                </parameters>
                        </method>
-                       <method name="set_display_options" symbol="gtk_calendar_set_display_options">
+                       <method name="save" symbol="gtk_accel_map_save">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
-                                       <parameter name="flags" type="GtkCalendarDisplayOptions"/>
+                                       <parameter name="file_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="thaw" symbol="gtk_calendar_thaw">
+                       <method name="save_fd" symbol="gtk_accel_map_save_fd">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="fd" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="unmark_day" symbol="gtk_calendar_unmark_day">
-                               <return-type type="gboolean"/>
+                       <method name="unlock_path" symbol="gtk_accel_map_unlock_path">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
-                                       <parameter name="day" type="guint"/>
+                                       <parameter name="accel_path" type="gchar*"/>
                                </parameters>
                        </method>
-                       <property name="day" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="month" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="no-month-change" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-day-names" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-heading" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-week-numbers" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="year" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="day-selected" when="FIRST">
+                       <signal name="changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="object" type="GtkAccelMap*"/>
+                                       <parameter name="p0" type="char*"/>
+                                       <parameter name="p1" type="guint"/>
+                                       <parameter name="p2" type="GdkModifierType"/>
                                </parameters>
                        </signal>
-                       <signal name="day-selected-double-click" when="FIRST">
+               </object>
+               <object name="GtkAccessible" parent="AtkObject" type-name="GtkAccessible" get-type="gtk_accessible_get_type">
+                       <method name="connect_widget_destroyed" symbol="gtk_accessible_connect_widget_destroyed">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="accessible" type="GtkAccessible*"/>
                                </parameters>
-                       </signal>
-                       <signal name="month-changed" when="FIRST">
+                       </method>
+                       <vfunc name="connect_widget_destroyed">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="accessible" type="GtkAccessible*"/>
                                </parameters>
-                       </signal>
-                       <signal name="next-month" when="FIRST">
+                       </vfunc>
+                       <field name="widget" type="GtkWidget*"/>
+               </object>
+               <object name="GtkAction" parent="GObject" type-name="GtkAction" get-type="gtk_action_get_type">
+                       <implements>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="activate" symbol="gtk_action_activate">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
-                       </signal>
-                       <signal name="next-year" when="FIRST">
+                       </method>
+                       <method name="block_activate_from" symbol="gtk_action_block_activate_from">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="proxy" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
-                       <signal name="prev-month" when="FIRST">
+                       </method>
+                       <method name="connect_accelerator" symbol="gtk_action_connect_accelerator">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
-                       </signal>
-                       <signal name="prev-year" when="FIRST">
+                       </method>
+                       <method name="connect_proxy" symbol="gtk_action_connect_proxy">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="proxy" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
-                       <field name="header_style" type="GtkStyle*"/>
-                       <field name="label_style" type="GtkStyle*"/>
-                       <field name="month" type="gint"/>
-                       <field name="year" type="gint"/>
-                       <field name="selected_day" type="gint"/>
-                       <field name="day_month" type="gint[][]"/>
-                       <field name="day" type="gint[][]"/>
-                       <field name="num_marked_dates" type="gint"/>
-                       <field name="marked_date" type="gint[]"/>
-                       <field name="display_flags" type="GtkCalendarDisplayOptions"/>
-                       <field name="marked_date_color" type="GdkColor[]"/>
-                       <field name="gc" type="GdkGC*"/>
-                       <field name="xor_gc" type="GdkGC*"/>
-                       <field name="focus_row" type="gint"/>
-                       <field name="focus_col" type="gint"/>
-                       <field name="highlight_row" type="gint"/>
-                       <field name="highlight_col" type="gint"/>
-                       <field name="grow_space" type="gchar[]"/>
-               </object>
-               <object name="GtkCellRenderer" parent="GtkObject" type-name="GtkCellRenderer" get-type="gtk_cell_renderer_get_type">
-                       <method name="activate" symbol="gtk_cell_renderer_activate">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <method name="create_icon" symbol="gtk_action_create_icon">
+                               <return-type type="GtkWidget*"/>
                                <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"/>
+                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="icon_size" type="GtkIconSize"/>
                                </parameters>
                        </method>
-                       <method name="editing_canceled" symbol="gtk_cell_renderer_editing_canceled">
-                               <return-type type="void"/>
+                       <method name="create_menu" symbol="gtk_action_create_menu">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
                        </method>
-                       <method name="get_fixed_size" symbol="gtk_cell_renderer_get_fixed_size">
-                               <return-type type="void"/>
+                       <method name="create_menu_item" symbol="gtk_action_create_menu_item">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="width" type="gint*"/>
-                                       <parameter name="height" type="gint*"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
                        </method>
-                       <method name="get_size" symbol="gtk_cell_renderer_get_size">
-                               <return-type type="void"/>
+                       <method name="create_tool_item" symbol="gtk_action_create_tool_item">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <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*"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
                        </method>
-                       <method name="render" symbol="gtk_cell_renderer_render">
+                       <method name="disconnect_accelerator" symbol="gtk_action_disconnect_accelerator">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="window" type="GdkWindow*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="background_area" type="GdkRectangle*"/>
-                                       <parameter name="cell_area" type="GdkRectangle*"/>
-                                       <parameter name="expose_area" type="GdkRectangle*"/>
-                                       <parameter name="flags" type="GtkCellRendererState"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
                        </method>
-                       <method name="set_fixed_size" symbol="gtk_cell_renderer_set_fixed_size">
+                       <method name="disconnect_proxy" symbol="gtk_action_disconnect_proxy">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="proxy" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="start_editing" symbol="gtk_cell_renderer_start_editing">
-                               <return-type type="GtkCellEditable*"/>
+                       <method name="get_accel_closure" symbol="gtk_action_get_accel_closure">
+                               <return-type type="GClosure*"/>
                                <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"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
                        </method>
-                       <method name="stop_editing" symbol="gtk_cell_renderer_stop_editing">
-                               <return-type type="void"/>
+                       <method name="get_accel_path" symbol="gtk_action_get_accel_path">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="canceled" type="gboolean"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </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-set" type="gboolean" readable="1" writable="1" 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"/>
+                       <method name="get_name" symbol="gtk_action_get_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
-                       </signal>
-                       <signal name="editing-started" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_proxies" symbol="gtk_action_get_proxies">
+                               <return-type type="GSList*"/>
+                               <parameters>
+                                       <parameter name="action" type="GtkAction*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_sensitive" symbol="gtk_action_get_sensitive">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="editable" type="GtkCellEditable*"/>
-                                       <parameter name="path" type="char*"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="activate">
+                       </method>
+                       <method name="get_visible" symbol="gtk_action_get_visible">
                                <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"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_size">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="is_sensitive" symbol="gtk_action_is_sensitive">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <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*"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="render">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="is_visible" symbol="gtk_action_is_visible">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
-                                       <parameter name="window" type="GdkDrawable*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="background_area" type="GdkRectangle*"/>
-                                       <parameter name="cell_area" type="GdkRectangle*"/>
-                                       <parameter name="expose_area" type="GdkRectangle*"/>
-                                       <parameter name="flags" type="GtkCellRendererState"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="start_editing">
-                               <return-type type="GtkCellEditable*"/>
+                       </method>
+                       <constructor name="new" symbol="gtk_action_new">
+                               <return-type type="GtkAction*"/>
                                <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"/>
+                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="tooltip" type="gchar*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
                                </parameters>
-                       </vfunc>
-                       <field name="xalign" type="gfloat"/>
-                       <field name="yalign" type="gfloat"/>
-                       <field name="width" type="gint"/>
-                       <field name="height" type="gint"/>
-                       <field name="xpad" type="guint16"/>
-                       <field name="ypad" type="guint16"/>
-                       <field name="mode" type="guint"/>
-                       <field name="visible" type="guint"/>
-                       <field name="is_expander" type="guint"/>
-                       <field name="is_expanded" type="guint"/>
-                       <field name="cell_background_set" type="guint"/>
-                       <field name="sensitive" type="guint"/>
-                       <field name="editing" type="guint"/>
-               </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 name="set_accel_group" symbol="gtk_action_set_accel_group">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="accel" type="GtkCellRendererAccel*"/>
-                                       <parameter name="path_string" type="char*"/>
+                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
                                </parameters>
-                       </signal>
-                       <signal name="accel-edited" when="LAST">
+                       </method>
+                       <method name="set_accel_path" symbol="gtk_action_set_accel_path">
                                <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="action" type="GtkAction*"/>
+                                       <parameter name="accel_path" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <field name="accel_key" type="guint"/>
-                       <field name="accel_mods" type="GdkModifierType"/>
-                       <field name="keycode" type="guint"/>
-                       <field name="accel_mode" type="GtkCellRendererAccelMode"/>
-                       <field name="edit_widget" type="GtkWidget*"/>
-                       <field name="grab_widget" type="GtkWidget*"/>
-                       <field name="sizing_label" type="GtkWidget*"/>
-               </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"/>
-                       <field name="model" type="GtkTreeModel*"/>
-                       <field name="text_column" type="gint"/>
-                       <field name="has_entry" type="gboolean"/>
-                       <field name="focus_out_id" type="guint"/>
-               </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="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"/>
-                       <field name="pixbuf" type="GdkPixbuf*"/>
-                       <field name="pixbuf_expander_open" type="GdkPixbuf*"/>
-                       <field name="pixbuf_expander_closed" type="GdkPixbuf*"/>
-               </object>
-               <object name="GtkCellRendererProgress" parent="GtkCellRenderer" type-name="GtkCellRendererProgress" get-type="gtk_cell_renderer_progress_get_type">
-                       <constructor name="new" symbol="gtk_cell_renderer_progress_new">
-                               <return-type type="GtkCellRenderer*"/>
-                       </constructor>
-                       <property name="orientation" type="GtkProgressBarOrientation" 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="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="set_sensitive" symbol="gtk_action_set_sensitive">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="renderer" type="GtkCellRendererText*"/>
-                                       <parameter name="number_of_rows" type="gint"/>
+                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="sensitive" 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-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-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="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">
+                       <method name="set_visible" symbol="gtk_action_set_visible">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_renderer_text" type="GtkCellRendererText*"/>
-                                       <parameter name="path" type="char*"/>
-                                       <parameter name="new_text" type="char*"/>
-                               </parameters>
-                       </signal>
-                       <field name="text" type="gchar*"/>
-                       <field name="font" type="PangoFontDescription*"/>
-                       <field name="font_scale" type="gdouble"/>
-                       <field name="foreground" type="PangoColor"/>
-                       <field name="background" type="PangoColor"/>
-                       <field name="extra_attrs" type="PangoAttrList*"/>
-                       <field name="underline_style" type="PangoUnderline"/>
-                       <field name="rise" type="gint"/>
-                       <field name="fixed_height_rows" type="gint"/>
-                       <field name="strikethrough" type="guint"/>
-                       <field name="editable" type="guint"/>
-                       <field name="scale_set" type="guint"/>
-                       <field name="foreground_set" type="guint"/>
-                       <field name="background_set" type="guint"/>
-                       <field name="underline_set" type="guint"/>
-                       <field name="rise_set" type="guint"/>
-                       <field name="strikethrough_set" type="guint"/>
-                       <field name="editable_set" type="guint"/>
-                       <field name="calc_fixed_height" type="guint"/>
-               </object>
-               <object name="GtkCellRendererToggle" parent="GtkCellRenderer" type-name="GtkCellRendererToggle" get-type="gtk_cell_renderer_toggle_get_type">
-                       <method name="get_active" symbol="gtk_cell_renderer_toggle_get_active">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="visible" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_radio" symbol="gtk_cell_renderer_toggle_get_radio">
-                               <return-type type="gboolean"/>
+                       <method name="unblock_activate_from" symbol="gtk_action_unblock_activate_from">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="proxy" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_cell_renderer_toggle_new">
-                               <return-type type="GtkCellRenderer*"/>
-                       </constructor>
-                       <method name="set_active" symbol="gtk_cell_renderer_toggle_set_active">
+                       <property name="action-group" type="GtkActionGroup*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="hide-if-empty" 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="is-important" type="gboolean" 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="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="short-label" 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="tooltip" 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"/>
+                       <property name="visible-horizontal" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="visible-overflown" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="visible-vertical" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="activate" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
-                       </method>
-                       <method name="set_radio" symbol="gtk_cell_renderer_toggle_set_radio">
+                       </signal>
+                       <vfunc name="connect_proxy">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
-                                       <parameter name="radio" type="gboolean"/>
+                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="proxy" type="GtkWidget*"/>
                                </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="create_menu">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="action" type="GtkAction*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="create_menu_item">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="action" type="GtkAction*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="create_tool_item">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="action" type="GtkAction*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="disconnect_proxy">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_renderer_toggle" type="GtkCellRendererToggle*"/>
-                                       <parameter name="path" type="char*"/>
+                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="proxy" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
-                       <field name="active" type="guint"/>
-                       <field name="activatable" type="guint"/>
-                       <field name="radio" type="guint"/>
+                       </vfunc>
                </object>
-               <object name="GtkCellView" parent="GtkWidget" type-name="GtkCellView" get-type="gtk_cell_view_get_type">
+               <object name="GtkActionGroup" parent="GObject" type-name="GtkActionGroup" get-type="gtk_action_group_get_type">
                        <implements>
-                               <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkCellLayout"/>
                        </implements>
-                       <method name="get_cell_renderers" symbol="gtk_cell_view_get_cell_renderers">
-                               <return-type type="GList*"/>
+                       <method name="add_action" symbol="gtk_action_group_add_action">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
                        </method>
-                       <method name="get_displayed_row" symbol="gtk_cell_view_get_displayed_row">
-                               <return-type type="GtkTreePath*"/>
+                       <method name="add_action_with_accel" symbol="gtk_action_group_add_action_with_accel">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="action" type="GtkAction*"/>
+                                       <parameter name="accelerator" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_size_of_row" symbol="gtk_cell_view_get_size_of_row">
-                               <return-type type="gboolean"/>
+                       <method name="add_actions" symbol="gtk_action_group_add_actions">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="requisition" type="GtkRequisition*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="entries" type="GtkActionEntry*"/>
+                                       <parameter name="n_entries" type="guint"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </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*"/>
-                               <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*"/>
+                       <method name="add_actions_full" symbol="gtk_action_group_add_actions_full">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="entries" type="GtkActionEntry*"/>
+                                       <parameter name="n_entries" type="guint"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_background_color" symbol="gtk_cell_view_set_background_color">
+                       </method>
+                       <method name="add_radio_actions" symbol="gtk_action_group_add_radio_actions">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="entries" type="GtkRadioActionEntry*"/>
+                                       <parameter name="n_entries" type="guint"/>
+                                       <parameter name="value" type="gint"/>
+                                       <parameter name="on_change" type="GCallback"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_displayed_row" symbol="gtk_cell_view_set_displayed_row">
+                       <method name="add_radio_actions_full" symbol="gtk_action_group_add_radio_actions_full">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="entries" type="GtkRadioActionEntry*"/>
+                                       <parameter name="n_entries" type="guint"/>
+                                       <parameter name="value" type="gint"/>
+                                       <parameter name="on_change" type="GCallback"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </parameters>
                        </method>
-                       <method name="set_model" symbol="gtk_cell_view_set_model">
+                       <method name="add_toggle_actions" symbol="gtk_action_group_add_toggle_actions">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cell_view" type="GtkCellView*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="entries" type="GtkToggleActionEntry*"/>
+                                       <parameter name="n_entries" type="guint"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </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-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"/>
-               </object>
-               <object name="GtkCheckButton" parent="GtkToggleButton" type-name="GtkCheckButton" get-type="gtk_check_button_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </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*"/>
+                       <method name="add_toggle_actions_full" symbol="gtk_action_group_add_toggle_actions_full">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="entries" type="GtkToggleActionEntry*"/>
+                                       <parameter name="n_entries" type="guint"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_check_button_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="get_action" symbol="gtk_action_group_get_action">
+                               <return-type type="GtkAction*"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="action_name" type="gchar*"/>
                                </parameters>
-                       </constructor>
-                       <vfunc name="draw_indicator">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_name" symbol="gtk_action_group_get_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="check_button" type="GtkCheckButton*"/>
-                                       <parameter name="area" type="GdkRectangle*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
                                </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"/>
-                       </implements>
-                       <method name="get_active" symbol="gtk_check_menu_item_get_active">
+                       </method>
+                       <method name="get_sensitive" symbol="gtk_action_group_get_sensitive">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
                                </parameters>
                        </method>
-                       <method name="get_draw_as_radio" symbol="gtk_check_menu_item_get_draw_as_radio">
+                       <method name="get_visible" symbol="gtk_action_group_get_visible">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
                                </parameters>
                        </method>
-                       <method name="get_inconsistent" symbol="gtk_check_menu_item_get_inconsistent">
-                               <return-type type="gboolean"/>
+                       <method name="list_actions" symbol="gtk_action_group_list_actions">
+                               <return-type type="GList*"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
                                </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*"/>
+                       <constructor name="new" symbol="gtk_action_group_new">
+                               <return-type type="GtkActionGroup*"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="name" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_check_menu_item_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
+                       <method name="remove_action" symbol="gtk_action_group_remove_action">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="action" type="GtkAction*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_active" symbol="gtk_check_menu_item_set_active">
+                       </method>
+                       <method name="set_sensitive" symbol="gtk_action_group_set_sensitive">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
-                                       <parameter name="is_active" type="gboolean"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="sensitive" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_translate_func" symbol="gtk_action_group_set_translate_func">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="func" type="GtkTranslateFunc"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="notify" type="GtkDestroyNotify"/>
+                               </parameters>
+                       </method>
+                       <method name="set_translation_domain" symbol="gtk_action_group_set_translation_domain">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="domain" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_draw_as_radio" symbol="gtk_check_menu_item_set_draw_as_radio">
+                       <method name="set_visible" symbol="gtk_action_group_set_visible">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
-                                       <parameter name="draw_as_radio" type="gboolean"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="visible" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_inconsistent" symbol="gtk_check_menu_item_set_inconsistent">
-                               <return-type type="void"/>
+                       <method name="translate_string" symbol="gtk_action_group_translate_string">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="string" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_show_toggle" symbol="gtk_check_menu_item_set_show_toggle">
+                       <property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <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"/>
+                       <signal name="connect-proxy" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkCheckMenuItem*"/>
-                                       <parameter name="always" type="gboolean"/>
+                                       <parameter name="object" type="GtkActionGroup*"/>
+                                       <parameter name="p0" type="GtkAction*"/>
+                                       <parameter name="p1" type="GtkWidget*"/>
                                </parameters>
-                       </method>
-                       <method name="toggled" symbol="gtk_check_menu_item_toggled">
+                       </signal>
+                       <signal name="disconnect-proxy" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="object" type="GtkActionGroup*"/>
+                                       <parameter name="p0" type="GtkAction*"/>
+                                       <parameter name="p1" type="GtkWidget*"/>
                                </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">
+                       </signal>
+                       <signal name="post-activate" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="object" type="GtkActionGroup*"/>
+                                       <parameter name="p0" type="GtkAction*"/>
                                </parameters>
                        </signal>
-                       <vfunc name="draw_indicator">
+                       <signal name="pre-activate" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
-                                       <parameter name="area" type="GdkRectangle*"/>
+                                       <parameter name="object" type="GtkActionGroup*"/>
+                                       <parameter name="p0" type="GtkAction*"/>
+                               </parameters>
+                       </signal>
+                       <vfunc name="get_action">
+                               <return-type type="GtkAction*"/>
+                               <parameters>
+                                       <parameter name="action_group" type="GtkActionGroup*"/>
+                                       <parameter name="action_name" type="gchar*"/>
                                </parameters>
                        </vfunc>
-                       <field name="active" type="guint"/>
-                       <field name="always_show_toggle" type="guint"/>
-                       <field name="inconsistent" type="guint"/>
-                       <field name="draw_as_radio" type="guint"/>
                </object>
-               <object name="GtkClipboard" parent="GObject" type-name="GtkClipboard" get-type="gtk_clipboard_get_type">
-                       <method name="clear" symbol="gtk_clipboard_clear">
+               <object name="GtkAdjustment" parent="GtkObject" type-name="GtkAdjustment" get-type="gtk_adjustment_get_type">
+                       <method name="changed" symbol="gtk_adjustment_changed">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                               </parameters>
-                       </method>
-                       <method name="get" symbol="gtk_clipboard_get">
-                               <return-type type="GtkClipboard*"/>
-                               <parameters>
-                                       <parameter name="selection" type="GdkAtom"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <method name="get_display" symbol="gtk_clipboard_get_display">
-                               <return-type type="GdkDisplay*"/>
+                       <method name="clamp_page" symbol="gtk_adjustment_clamp_page">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="lower" type="gdouble"/>
+                                       <parameter name="upper" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="get_for_display" symbol="gtk_clipboard_get_for_display">
-                               <return-type type="GtkClipboard*"/>
+                       <method name="get_value" symbol="gtk_adjustment_get_value">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="selection" type="GdkAtom"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <method name="get_owner" symbol="gtk_clipboard_get_owner">
-                               <return-type type="GObject*"/>
+                       <constructor name="new" symbol="gtk_adjustment_new">
+                               <return-type type="GtkObject*"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="value" type="gdouble"/>
+                                       <parameter name="lower" type="gdouble"/>
+                                       <parameter name="upper" type="gdouble"/>
+                                       <parameter name="step_increment" type="gdouble"/>
+                                       <parameter name="page_increment" type="gdouble"/>
+                                       <parameter name="page_size" type="gdouble"/>
                                </parameters>
-                       </method>
-                       <method name="request_contents" symbol="gtk_clipboard_request_contents">
+                       </constructor>
+                       <method name="set_value" symbol="gtk_adjustment_set_value">
                                <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="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="value" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="request_image" symbol="gtk_clipboard_request_image">
+                       <method name="value_changed" symbol="gtk_adjustment_value_changed">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="callback" type="GtkClipboardImageReceivedFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <method name="request_rich_text" symbol="gtk_clipboard_request_rich_text">
+                       <property name="lower" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="page-increment" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="page-size" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="step-increment" 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"/>
+                       <property name="value" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="changed" when="FIRST">
                                <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="adjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </method>
-                       <method name="request_targets" symbol="gtk_clipboard_request_targets">
+                       </signal>
+                       <signal name="value-changed" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="callback" type="GtkClipboardTargetsReceivedFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </method>
-                       <method name="request_text" symbol="gtk_clipboard_request_text">
+                       </signal>
+                       <field name="lower" type="gdouble"/>
+                       <field name="upper" type="gdouble"/>
+                       <field name="value" type="gdouble"/>
+                       <field name="step_increment" type="gdouble"/>
+                       <field name="page_increment" type="gdouble"/>
+                       <field name="page_size" type="gdouble"/>
+               </object>
+               <object name="GtkAlignment" parent="GtkBin" type-name="GtkAlignment" get-type="gtk_alignment_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_padding" symbol="gtk_alignment_get_padding">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="callback" type="GtkClipboardTextReceivedFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="alignment" type="GtkAlignment*"/>
+                                       <parameter name="padding_top" type="guint*"/>
+                                       <parameter name="padding_bottom" type="guint*"/>
+                                       <parameter name="padding_left" type="guint*"/>
+                                       <parameter name="padding_right" type="guint*"/>
                                </parameters>
                        </method>
-                       <method name="set_can_store" symbol="gtk_clipboard_set_can_store">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_alignment_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="targets" type="GtkTargetEntry*"/>
-                                       <parameter name="n_targets" type="gint"/>
+                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="yalign" type="gfloat"/>
+                                       <parameter name="xscale" type="gfloat"/>
+                                       <parameter name="yscale" type="gfloat"/>
                                </parameters>
-                       </method>
-                       <method name="set_image" symbol="gtk_clipboard_set_image">
+                       </constructor>
+                       <method name="set" symbol="gtk_alignment_set">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="alignment" type="GtkAlignment*"/>
+                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="yalign" type="gfloat"/>
+                                       <parameter name="xscale" type="gfloat"/>
+                                       <parameter name="yscale" type="gfloat"/>
                                </parameters>
                        </method>
-                       <method name="set_text" symbol="gtk_clipboard_set_text">
+                       <method name="set_padding" symbol="gtk_alignment_set_padding">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="text" type="gchar*"/>
-                                       <parameter name="len" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_with_data" symbol="gtk_clipboard_set_with_data">
-                               <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="user_data" type="gpointer"/>
+                                       <parameter name="alignment" type="GtkAlignment*"/>
+                                       <parameter name="padding_top" type="guint"/>
+                                       <parameter name="padding_bottom" type="guint"/>
+                                       <parameter name="padding_left" type="guint"/>
+                                       <parameter name="padding_right" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="set_with_owner" symbol="gtk_clipboard_set_with_owner">
-                               <return-type type="gboolean"/>
+                       <property name="bottom-padding" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="left-padding" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="right-padding" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="top-padding" type="guint" 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="xscale" type="gfloat" 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="yscale" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <field name="xalign" type="gfloat"/>
+                       <field name="yalign" type="gfloat"/>
+                       <field name="xscale" type="gfloat"/>
+                       <field name="yscale" type="gfloat"/>
+               </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="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="arrow_type" type="GtkArrowType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
                                </parameters>
-                       </method>
-                       <method name="store" symbol="gtk_clipboard_store">
+                       </constructor>
+                       <method name="set" symbol="gtk_arrow_set">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="arrow" type="GtkArrow*"/>
+                                       <parameter name="arrow_type" type="GtkArrowType"/>
+                                       <parameter name="shadow_type" type="GtkShadowType"/>
                                </parameters>
                        </method>
-                       <method name="wait_for_contents" symbol="gtk_clipboard_wait_for_contents">
-                               <return-type type="GtkSelectionData*"/>
+                       <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"/>
+                       <field name="arrow_type" type="gint16"/>
+                       <field name="shadow_type" type="gint16"/>
+               </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="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="target" type="GdkAtom"/>
+                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="yalign" type="gfloat"/>
+                                       <parameter name="ratio" type="gfloat"/>
+                                       <parameter name="obey_child" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <method name="wait_for_image" symbol="gtk_clipboard_wait_for_image">
-                               <return-type type="GdkPixbuf*"/>
+                       </constructor>
+                       <method name="set" symbol="gtk_aspect_frame_set">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="aspect_frame" type="GtkAspectFrame*"/>
+                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="yalign" type="gfloat"/>
+                                       <parameter name="ratio" type="gfloat"/>
+                                       <parameter name="obey_child" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="wait_for_rich_text" symbol="gtk_clipboard_wait_for_rich_text">
-                               <return-type type="guint8*"/>
+                       <property name="obey-child" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="ratio" type="gfloat" 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="yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <field name="xalign" type="gfloat"/>
+                       <field name="yalign" type="gfloat"/>
+                       <field name="ratio" type="gfloat"/>
+                       <field name="obey_child" type="gboolean"/>
+                       <field name="center_allocation" type="GtkAllocation"/>
+               </object>
+               <object name="GtkAssistant" parent="GtkWindow" type-name="GtkAssistant" get-type="gtk_assistant_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="add_action_widget" symbol="gtk_assistant_add_action_widget">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="buffer" type="GtkTextBuffer*"/>
-                                       <parameter name="format" type="GdkAtom*"/>
-                                       <parameter name="length" type="gsize*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="wait_for_targets" symbol="gtk_clipboard_wait_for_targets">
-                               <return-type type="gboolean"/>
+                       <method name="append_page" symbol="gtk_assistant_append_page">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="targets" type="GdkAtom**"/>
-                                       <parameter name="n_targets" type="gint*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="wait_for_text" symbol="gtk_clipboard_wait_for_text">
-                               <return-type type="gchar*"/>
+                       <method name="get_current_page" symbol="gtk_assistant_get_current_page">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
                                </parameters>
                        </method>
-                       <method name="wait_is_image_available" symbol="gtk_clipboard_wait_is_image_available">
-                               <return-type type="gboolean"/>
+                       <method name="get_n_pages" symbol="gtk_assistant_get_n_pages">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
                                </parameters>
                        </method>
-                       <method name="wait_is_rich_text_available" symbol="gtk_clipboard_wait_is_rich_text_available">
-                               <return-type type="gboolean"/>
+                       <method name="get_nth_page" symbol="gtk_assistant_get_nth_page">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="buffer" type="GtkTextBuffer*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page_num" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="wait_is_target_available" symbol="gtk_clipboard_wait_is_target_available">
+                       <method name="get_page_complete" symbol="gtk_assistant_get_page_complete">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
-                                       <parameter name="target" type="GdkAtom"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="wait_is_text_available" symbol="gtk_clipboard_wait_is_text_available">
-                               <return-type type="gboolean"/>
+                       <method name="get_page_header_image" symbol="gtk_assistant_get_page_header_image">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <signal name="owner-change" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="object" type="GtkClipboard*"/>
-                                       <parameter name="p0" type="GdkEvent*"/>
-                               </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"/>
-                       </implements>
-                       <method name="get_alpha" symbol="gtk_color_button_get_alpha">
-                               <return-type type="guint16"/>
+                       <method name="get_page_side_image" symbol="gtk_assistant_get_page_side_image">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_color" symbol="gtk_color_button_get_color">
-                               <return-type type="void"/>
+                       <method name="get_page_title" symbol="gtk_assistant_get_page_title">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_title" symbol="gtk_color_button_get_title">
-                               <return-type type="gchar*"/>
+                       <method name="get_page_type" symbol="gtk_assistant_get_page_type">
+                               <return-type type="GtkAssistantPageType"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_use_alpha" symbol="gtk_color_button_get_use_alpha">
-                               <return-type type="gboolean"/>
+                       <method name="insert_page" symbol="gtk_assistant_insert_page">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="position" 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">
+                       <constructor name="new" symbol="gtk_assistant_new">
                                <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
                        </constructor>
-                       <method name="set_alpha" symbol="gtk_color_button_set_alpha">
-                               <return-type type="void"/>
+                       <method name="prepend_page" symbol="gtk_assistant_prepend_page">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="alpha" type="guint16"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_color" symbol="gtk_color_button_set_color">
+                       <method name="remove_action_widget" symbol="gtk_assistant_remove_action_widget">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_title" symbol="gtk_color_button_set_title">
+                       <method name="set_current_page" symbol="gtk_assistant_set_current_page">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page_num" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_use_alpha" symbol="gtk_color_button_set_use_alpha">
+                       <method name="set_forward_page_func" symbol="gtk_assistant_set_forward_page_func">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_button" type="GtkColorButton*"/>
-                                       <parameter name="use_alpha" type="gboolean"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page_func" type="GtkAssistantPageFunc"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </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="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">
+                       <method name="set_page_complete" symbol="gtk_assistant_set_page_complete">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cp" type="GtkColorButton*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="complete" type="gboolean"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkColorSelection" parent="GtkVBox" type-name="GtkColorSelection" get-type="gtk_color_selection_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_color" symbol="gtk_color_selection_get_color">
+                       </method>
+                       <method name="set_page_header_image" symbol="gtk_assistant_set_page_header_image">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="color" type="gdouble*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
                        </method>
-                       <method name="get_current_alpha" symbol="gtk_color_selection_get_current_alpha">
-                               <return-type type="guint16"/>
+                       <method name="set_page_side_image" symbol="gtk_assistant_set_page_side_image">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
                        </method>
-                       <method name="get_current_color" symbol="gtk_color_selection_get_current_color">
+                       <method name="set_page_title" symbol="gtk_assistant_set_page_title">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_has_opacity_control" symbol="gtk_color_selection_get_has_opacity_control">
-                               <return-type type="gboolean"/>
+                       <method name="set_page_type" symbol="gtk_assistant_set_page_type">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="type" type="GtkAssistantPageType"/>
                                </parameters>
                        </method>
-                       <method name="get_has_palette" symbol="gtk_color_selection_get_has_palette">
-                               <return-type type="gboolean"/>
+                       <method name="update_buttons_state" symbol="gtk_assistant_update_buttons_state">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
                                </parameters>
                        </method>
-                       <method name="get_previous_alpha" symbol="gtk_color_selection_get_previous_alpha">
-                               <return-type type="guint16"/>
+                       <signal name="apply" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
                                </parameters>
-                       </method>
-                       <method name="get_previous_color" symbol="gtk_color_selection_get_previous_color">
+                       </signal>
+                       <signal name="cancel" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
                                </parameters>
-                       </method>
-                       <method name="is_adjusting" symbol="gtk_color_selection_is_adjusting">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="close" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
                                </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">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <signal name="prepare" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="str" type="gchar*"/>
-                                       <parameter name="colors" type="GdkColor**"/>
-                                       <parameter name="n_colors" type="gint*"/>
+                                       <parameter name="assistant" type="GtkAssistant*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
                                </parameters>
-                       </method>
-                       <method name="palette_to_string" symbol="gtk_color_selection_palette_to_string">
-                               <return-type type="gchar*"/>
+                       </signal>
+                       <field name="cancel" type="GtkWidget*"/>
+                       <field name="forward" type="GtkWidget*"/>
+                       <field name="back" type="GtkWidget*"/>
+                       <field name="apply" type="GtkWidget*"/>
+                       <field name="close" type="GtkWidget*"/>
+                       <field name="last" type="GtkWidget*"/>
+               </object>
+               <object name="GtkBin" parent="GtkContainer" type-name="GtkBin" get-type="gtk_bin_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_child" symbol="gtk_bin_get_child">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="colors" type="GdkColor*"/>
-                                       <parameter name="n_colors" type="gint"/>
+                                       <parameter name="bin" type="GtkBin*"/>
                                </parameters>
                        </method>
-                       <method name="set_change_palette_hook" symbol="gtk_color_selection_set_change_palette_hook">
-                               <return-type type="GtkColorSelectionChangePaletteFunc"/>
+                       <field name="child" type="GtkWidget*"/>
+               </object>
+               <object name="GtkBox" parent="GtkContainer" type-name="GtkBox" get-type="gtk_box_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_homogeneous" symbol="gtk_box_get_homogeneous">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="func" type="GtkColorSelectionChangePaletteFunc"/>
+                                       <parameter name="box" type="GtkBox*"/>
                                </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_spacing" symbol="gtk_box_get_spacing">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="func" type="GtkColorSelectionChangePaletteWithScreenFunc"/>
+                                       <parameter name="box" type="GtkBox*"/>
                                </parameters>
                        </method>
-                       <method name="set_color" symbol="gtk_color_selection_set_color">
+                       <method name="pack_end" symbol="gtk_box_pack_end">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="color" type="gdouble*"/>
+                                       <parameter name="box" type="GtkBox*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="expand" type="gboolean"/>
+                                       <parameter name="fill" type="gboolean"/>
+                                       <parameter name="padding" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="set_current_alpha" symbol="gtk_color_selection_set_current_alpha">
+                       <method name="pack_end_defaults" symbol="gtk_box_pack_end_defaults">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="alpha" type="guint16"/>
+                                       <parameter name="box" type="GtkBox*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_current_color" symbol="gtk_color_selection_set_current_color">
+                       <method name="pack_start" symbol="gtk_box_pack_start">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="box" type="GtkBox*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="expand" type="gboolean"/>
+                                       <parameter name="fill" type="gboolean"/>
+                                       <parameter name="padding" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="set_has_opacity_control" symbol="gtk_color_selection_set_has_opacity_control">
+                       <method name="pack_start_defaults" symbol="gtk_box_pack_start_defaults">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="has_opacity" type="gboolean"/>
+                                       <parameter name="box" type="GtkBox*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_has_palette" symbol="gtk_color_selection_set_has_palette">
+                       <method name="query_child_packing" symbol="gtk_box_query_child_packing">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="has_palette" type="gboolean"/>
+                                       <parameter name="box" type="GtkBox*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="expand" type="gboolean*"/>
+                                       <parameter name="fill" type="gboolean*"/>
+                                       <parameter name="padding" type="guint*"/>
+                                       <parameter name="pack_type" type="GtkPackType*"/>
                                </parameters>
                        </method>
-                       <method name="set_previous_alpha" symbol="gtk_color_selection_set_previous_alpha">
+                       <method name="reorder_child" symbol="gtk_box_reorder_child">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="alpha" type="guint16"/>
+                                       <parameter name="box" type="GtkBox*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_previous_color" symbol="gtk_color_selection_set_previous_color">
+                       <method name="set_child_packing" symbol="gtk_box_set_child_packing">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="color" type="GdkColor*"/>
+                                       <parameter name="box" type="GtkBox*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="expand" type="gboolean"/>
+                                       <parameter name="fill" type="gboolean"/>
+                                       <parameter name="padding" type="guint"/>
+                                       <parameter name="pack_type" type="GtkPackType"/>
                                </parameters>
                        </method>
-                       <method name="set_update_policy" symbol="gtk_color_selection_set_update_policy">
+                       <method name="set_homogeneous" symbol="gtk_box_set_homogeneous">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="colorsel" type="GtkColorSelection*"/>
-                                       <parameter name="policy" type="GtkUpdateType"/>
+                                       <parameter name="box" type="GtkBox*"/>
+                                       <parameter name="homogeneous" type="gboolean"/>
                                </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="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">
+                       <method name="set_spacing" symbol="gtk_box_set_spacing">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="color_selection" type="GtkColorSelection*"/>
+                                       <parameter name="box" type="GtkBox*"/>
+                                       <parameter name="spacing" type="gint"/>
                                </parameters>
-                       </signal>
+                       </method>
+                       <property name="homogeneous" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <field name="children" type="GList*"/>
+                       <field name="spacing" type="gint16"/>
+                       <field name="homogeneous" type="guint"/>
                </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>
-                       <constructor name="new" symbol="gtk_color_selection_dialog_new">
-                               <return-type type="GtkWidget*"/>
+               <object name="GtkBuilder" parent="GObject" type-name="GtkBuilder" get-type="gtk_builder_get_type">
+                       <method name="add_from_file" symbol="gtk_builder_add_from_file">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="filename" type="gchar*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
-                       </constructor>
-                       <field name="colorsel" type="GtkWidget*"/>
-                       <field name="ok_button" type="GtkWidget*"/>
-                       <field name="cancel_button" type="GtkWidget*"/>
-                       <field name="help_button" type="GtkWidget*"/>
-               </object>
-               <object name="GtkCombo" parent="GtkHBox" type-name="GtkCombo" get-type="gtk_combo_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="disable_activate" symbol="gtk_combo_disable_activate">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="add_from_string" symbol="gtk_builder_add_from_string">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="combo" type="GtkCombo*"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="buffer" type="gchar*"/>
+                                       <parameter name="length" type="gsize"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_combo_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="set_case_sensitive" symbol="gtk_combo_set_case_sensitive">
+                       <method name="connect_signals" symbol="gtk_builder_connect_signals">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo" type="GtkCombo*"/>
-                                       <parameter name="val" type="gboolean"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_item_string" symbol="gtk_combo_set_item_string">
+                       <method name="connect_signals_full" symbol="gtk_builder_connect_signals_full">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo" type="GtkCombo*"/>
-                                       <parameter name="item" type="GtkItem*"/>
-                                       <parameter name="item_value" type="gchar*"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="func" type="GtkBuilderConnectFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_popdown_strings" symbol="gtk_combo_set_popdown_strings">
-                               <return-type type="void"/>
+                       <method name="error_quark" symbol="gtk_builder_error_quark">
+                               <return-type type="GQuark"/>
+                       </method>
+                       <method name="get_object" symbol="gtk_builder_get_object">
+                               <return-type type="GObject*"/>
                                <parameters>
-                                       <parameter name="combo" type="GtkCombo*"/>
-                                       <parameter name="strings" type="GList*"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_arrows" symbol="gtk_combo_set_use_arrows">
-                               <return-type type="void"/>
+                       <method name="get_objects" symbol="gtk_builder_get_objects">
+                               <return-type type="GSList*"/>
                                <parameters>
-                                       <parameter name="combo" type="GtkCombo*"/>
-                                       <parameter name="val" type="gboolean"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_arrows_always" symbol="gtk_combo_set_use_arrows_always">
-                               <return-type type="void"/>
+                       <method name="get_translation_domain" symbol="gtk_builder_get_translation_domain">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="combo" type="GtkCombo*"/>
-                                       <parameter name="val" type="gboolean"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
                                </parameters>
                        </method>
-                       <method name="set_value_in_list" symbol="gtk_combo_set_value_in_list">
-                               <return-type type="void"/>
+                       <method name="get_type_from_name" symbol="gtk_builder_get_type_from_name">
+                               <return-type type="GType"/>
                                <parameters>
-                                       <parameter name="combo" type="GtkCombo*"/>
-                                       <parameter name="val" type="gboolean"/>
-                                       <parameter name="ok_if_empty" type="gboolean"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="type_name" type="char*"/>
                                </parameters>
                        </method>
-                       <property name="allow-empty" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="case-sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="enable-arrow-keys" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="enable-arrows-always" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="value-in-list" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <field name="entry" type="GtkWidget*"/>
-                       <field name="button" type="GtkWidget*"/>
-                       <field name="popup" type="GtkWidget*"/>
-                       <field name="popwin" type="GtkWidget*"/>
-                       <field name="list" type="GtkWidget*"/>
-                       <field name="entry_change_id" type="guint"/>
-                       <field name="list_change_id" type="guint"/>
-                       <field name="value_in_list" type="guint"/>
-                       <field name="ok_if_empty" type="guint"/>
-                       <field name="case_sensitive" type="guint"/>
-                       <field name="use_arrows" type="guint"/>
-                       <field name="use_arrows_always" type="guint"/>
-                       <field name="current_button" type="guint16"/>
-                       <field name="activate_id" type="guint"/>
-               </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="GtkCellEditable"/>
-                               <interface name="GtkCellLayout"/>
-                       </implements>
-                       <method name="append_text" symbol="gtk_combo_box_append_text">
+                       <constructor name="new" symbol="gtk_builder_new">
+                               <return-type type="GtkBuilder*"/>
+                       </constructor>
+                       <method name="set_translation_domain" symbol="gtk_builder_set_translation_domain">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="domain" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_active" symbol="gtk_combo_box_get_active">
-                               <return-type type="gint"/>
+                       <method name="value_from_string" symbol="gtk_builder_value_from_string">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="string" type="gchar*"/>
+                                       <parameter name="value" type="GValue*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="get_active_iter" symbol="gtk_combo_box_get_active_iter">
+                       <method name="value_from_string_type" symbol="gtk_builder_value_from_string_type">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="type" type="GType"/>
+                                       <parameter name="string" type="gchar*"/>
+                                       <parameter name="value" type="GValue*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="get_active_text" symbol="gtk_combo_box_get_active_text">
-                               <return-type type="gchar*"/>
+                       <property name="translation-domain" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <vfunc name="get_type_from_name">
+                               <return-type type="GType"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="builder" type="GtkBuilder*"/>
+                                       <parameter name="type_name" type="char*"/>
+                               </parameters>
+                       </vfunc>
+               </object>
+               <object name="GtkButton" parent="GtkBin" type-name="GtkButton" get-type="gtk_button_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="clicked" symbol="gtk_button_clicked">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_add_tearoffs" symbol="gtk_combo_box_get_add_tearoffs">
-                               <return-type type="gboolean"/>
+                       <method name="enter" symbol="gtk_button_enter">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_column_span_column" symbol="gtk_combo_box_get_column_span_column">
-                               <return-type type="gint"/>
+                       <method name="get_alignment" symbol="gtk_button_get_alignment">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="xalign" type="gfloat*"/>
+                                       <parameter name="yalign" type="gfloat*"/>
                                </parameters>
                        </method>
-                       <method name="get_focus_on_click" symbol="gtk_combo_box_get_focus_on_click">
+                       <method name="get_focus_on_click" symbol="gtk_button_get_focus_on_click">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_model" symbol="gtk_combo_box_get_model">
-                               <return-type type="GtkTreeModel*"/>
+                       <method name="get_image" symbol="gtk_button_get_image">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_popup_accessible" symbol="gtk_combo_box_get_popup_accessible">
-                               <return-type type="AtkObject*"/>
+                       <method name="get_image_position" symbol="gtk_button_get_image_position">
+                               <return-type type="GtkPositionType"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_row_separator_func" symbol="gtk_combo_box_get_row_separator_func">
-                               <return-type type="GtkTreeViewRowSeparatorFunc"/>
+                       <method name="get_label" symbol="gtk_button_get_label">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_row_span_column" symbol="gtk_combo_box_get_row_span_column">
-                               <return-type type="gint"/>
+                       <method name="get_relief" symbol="gtk_button_get_relief">
+                               <return-type type="GtkReliefStyle"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_title" symbol="gtk_combo_box_get_title">
-                               <return-type type="gchar*"/>
+                       <method name="get_use_stock" symbol="gtk_button_get_use_stock">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_wrap_width" symbol="gtk_combo_box_get_wrap_width">
-                               <return-type type="gint"/>
+                       <method name="get_use_underline" symbol="gtk_button_get_use_underline">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <method name="insert_text" symbol="gtk_combo_box_insert_text">
+                       <method name="leave" symbol="gtk_button_leave">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="position" type="gint"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_combo_box_new">
+                       <constructor name="new" symbol="gtk_button_new">
                                <return-type type="GtkWidget*"/>
                        </constructor>
-                       <constructor name="new_text" symbol="gtk_combo_box_new_text">
+                       <constructor name="new_from_stock" symbol="gtk_button_new_from_stock">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="stock_id" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_with_label" symbol="gtk_button_new_with_label">
                                <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="label" type="gchar*"/>
+                               </parameters>
                        </constructor>
-                       <constructor name="new_with_model" symbol="gtk_combo_box_new_with_model">
+                       <constructor name="new_with_mnemonic" symbol="gtk_button_new_with_mnemonic">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <method name="popdown" symbol="gtk_combo_box_popdown">
+                       <method name="pressed" symbol="gtk_button_pressed">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <method name="popup" symbol="gtk_combo_box_popup">
+                       <method name="released" symbol="gtk_button_released">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </method>
-                       <method name="prepend_text" symbol="gtk_combo_box_prepend_text">
+                       <method name="set_alignment" symbol="gtk_button_set_alignment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="yalign" type="gfloat"/>
                                </parameters>
                        </method>
-                       <method name="remove_text" symbol="gtk_combo_box_remove_text">
+                       <method name="set_focus_on_click" symbol="gtk_button_set_focus_on_click">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="focus_on_click" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_active" symbol="gtk_combo_box_set_active">
+                       <method name="set_image" symbol="gtk_button_set_image">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="index_" type="gint"/>
+                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="image" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_active_iter" symbol="gtk_combo_box_set_active_iter">
+                       <method name="set_image_position" symbol="gtk_button_set_image_position">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="position" type="GtkPositionType"/>
                                </parameters>
                        </method>
-                       <method name="set_add_tearoffs" symbol="gtk_combo_box_set_add_tearoffs">
+                       <method name="set_label" symbol="gtk_button_set_label">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="add_tearoffs" type="gboolean"/>
+                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_column_span_column" symbol="gtk_combo_box_set_column_span_column">
+                       <method name="set_relief" symbol="gtk_button_set_relief">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="column_span" type="gint"/>
+                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="newstyle" type="GtkReliefStyle"/>
                                </parameters>
                        </method>
-                       <method name="set_focus_on_click" symbol="gtk_combo_box_set_focus_on_click">
+                       <method name="set_use_stock" symbol="gtk_button_set_use_stock">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo" type="GtkComboBox*"/>
-                                       <parameter name="focus_on_click" type="gboolean"/>
+                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="use_stock" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_model" symbol="gtk_combo_box_set_model">
+                       <method name="set_use_underline" symbol="gtk_button_set_use_underline">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="button" type="GtkButton*"/>
+                                       <parameter name="use_underline" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_row_separator_func" symbol="gtk_combo_box_set_row_separator_func">
+                       <property name="focus-on-click" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="image" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="image-position" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="label" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
+                       <property name="relief" type="GtkReliefStyle" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="use-stock" 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"/>
+                       <property name="xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="activate" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="func" type="GtkTreeViewRowSeparatorFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GtkDestroyNotify"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
-                       </method>
-                       <method name="set_row_span_column" symbol="gtk_combo_box_set_row_span_column">
+                       </signal>
+                       <signal name="clicked" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="row_span" type="gint"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
-                       </method>
-                       <method name="set_title" symbol="gtk_combo_box_set_title">
+                       </signal>
+                       <signal name="enter" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
-                       </method>
-                       <method name="set_wrap_width" symbol="gtk_combo_box_set_wrap_width">
+                       </signal>
+                       <signal name="leave" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
-                                       <parameter name="width" type="gint"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </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="column-span-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-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-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">
+                       </signal>
+                       <signal name="pressed" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </signal>
-                       <signal name="move-active" when="LAST">
+                       <signal name="released" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkComboBox*"/>
-                                       <parameter name="p0" type="GtkScrollType"/>
+                                       <parameter name="button" type="GtkButton*"/>
                                </parameters>
                        </signal>
-                       <signal name="popdown" when="LAST">
+                       <field name="event_window" type="GdkWindow*"/>
+                       <field name="label_text" type="gchar*"/>
+                       <field name="activate_timeout" type="guint"/>
+                       <field name="constructed" type="guint"/>
+                       <field name="in_button" type="guint"/>
+                       <field name="button_down" type="guint"/>
+                       <field name="relief" type="guint"/>
+                       <field name="use_underline" type="guint"/>
+                       <field name="use_stock" type="guint"/>
+                       <field name="depressed" type="guint"/>
+                       <field name="depress_on_activate" type="guint"/>
+                       <field name="focus_on_click" type="guint"/>
+               </object>
+               <object name="GtkButtonBox" parent="GtkBox" type-name="GtkButtonBox" get-type="gtk_button_box_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_child_secondary" symbol="gtk_button_box_get_child_secondary">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="object" type="GtkComboBox*"/>
+                                       <parameter name="widget" type="GtkButtonBox*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
-                       <signal name="popup" when="LAST">
+                       </method>
+                       <method name="get_layout" symbol="gtk_button_box_get_layout">
+                               <return-type type="GtkButtonBoxStyle"/>
+                               <parameters>
+                                       <parameter name="widget" type="GtkButtonBox*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_child_secondary" symbol="gtk_button_box_set_child_secondary">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkComboBox*"/>
+                                       <parameter name="widget" type="GtkButtonBox*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="is_secondary" type="gboolean"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="get_active_text">
-                               <return-type type="gchar*"/>
+                       </method>
+                       <method name="set_layout" symbol="gtk_button_box_set_layout">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="widget" type="GtkButtonBox*"/>
+                                       <parameter name="layout_style" type="GtkButtonBoxStyle"/>
                                </parameters>
-                       </vfunc>
+                       </method>
+                       <property name="layout-style" type="GtkButtonBoxStyle" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <field name="child_min_width" type="gint"/>
+                       <field name="child_min_height" type="gint"/>
+                       <field name="child_ipad_x" type="gint"/>
+                       <field name="child_ipad_y" type="gint"/>
+                       <field name="layout_style" type="GtkButtonBoxStyle"/>
                </object>
-               <object name="GtkComboBoxEntry" parent="GtkComboBox" type-name="GtkComboBoxEntry" get-type="gtk_combo_box_entry_get_type">
+               <object name="GtkCalendar" parent="GtkWidget" type-name="GtkCalendar" get-type="gtk_calendar_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
-                               <interface name="GtkCellEditable"/>
-                               <interface name="GtkCellLayout"/>
                        </implements>
-                       <method name="get_text_column" symbol="gtk_combo_box_entry_get_text_column">
-                               <return-type type="gint"/>
+                       <method name="clear_marks" symbol="gtk_calendar_clear_marks">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry_box" type="GtkComboBoxEntry*"/>
+                                       <parameter name="calendar" type="GtkCalendar*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_combo_box_entry_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_text" symbol="gtk_combo_box_entry_new_text">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_model" symbol="gtk_combo_box_entry_new_with_model">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_date" symbol="gtk_calendar_get_date">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="model" type="GtkTreeModel*"/>
-                                       <parameter name="text_column" type="gint"/>
+                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="year" type="guint*"/>
+                                       <parameter name="month" type="guint*"/>
+                                       <parameter name="day" type="guint*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_display_options" symbol="gtk_calendar_get_display_options">
+                               <return-type type="GtkCalendarDisplayOptions"/>
+                               <parameters>
+                                       <parameter name="calendar" type="GtkCalendar*"/>
+                               </parameters>
+                       </method>
+                       <method name="mark_day" symbol="gtk_calendar_mark_day">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="day" type="guint"/>
                                </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_calendar_new">
+                               <return-type type="GtkWidget*"/>
                        </constructor>
-                       <method name="set_text_column" symbol="gtk_combo_box_entry_set_text_column">
+                       <method name="select_day" symbol="gtk_calendar_select_day">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry_box" type="GtkComboBoxEntry*"/>
-                                       <parameter name="text_column" type="gint"/>
+                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="day" type="guint"/>
                                </parameters>
                        </method>
-                       <property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-               </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"/>
+                       <method name="select_month" symbol="gtk_calendar_select_month">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="month" type="guint"/>
+                                       <parameter name="year" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="add_with_properties" symbol="gtk_container_add_with_properties">
+                       <method name="set_display_options" symbol="gtk_calendar_set_display_options">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="first_prop_name" type="gchar*"/>
+                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="flags" type="GtkCalendarDisplayOptions"/>
                                </parameters>
                        </method>
-                       <method name="check_resize" symbol="gtk_container_check_resize">
-                               <return-type type="void"/>
+                       <method name="unmark_day" symbol="gtk_calendar_unmark_day">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="calendar" type="GtkCalendar*"/>
+                                       <parameter name="day" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="child_get" symbol="gtk_container_child_get">
+                       <property name="day" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="month" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="no-month-change" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="show-day-names" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="show-heading" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="show-week-numbers" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="year" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="day-selected" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="first_prop_name" type="gchar*"/>
+                                       <parameter name="calendar" type="GtkCalendar*"/>
                                </parameters>
-                       </method>
-                       <method name="child_get_property" symbol="gtk_container_child_get_property">
+                       </signal>
+                       <signal name="day-selected-double-click" when="FIRST">
                                <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="calendar" type="GtkCalendar*"/>
                                </parameters>
-                       </method>
-                       <method name="child_get_valist" symbol="gtk_container_child_get_valist">
+                       </signal>
+                       <signal name="month-changed" when="FIRST">
                                <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="calendar" type="GtkCalendar*"/>
                                </parameters>
-                       </method>
-                       <method name="child_set" symbol="gtk_container_child_set">
+                       </signal>
+                       <signal name="next-month" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="first_prop_name" type="gchar*"/>
+                                       <parameter name="calendar" type="GtkCalendar*"/>
                                </parameters>
-                       </method>
-                       <method name="child_set_property" symbol="gtk_container_child_set_property">
+                       </signal>
+                       <signal name="next-year" when="FIRST">
                                <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="calendar" type="GtkCalendar*"/>
                                </parameters>
-                       </method>
-                       <method name="child_set_valist" symbol="gtk_container_child_set_valist">
+                       </signal>
+                       <signal name="prev-month" when="FIRST">
                                <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="calendar" type="GtkCalendar*"/>
                                </parameters>
-                       </method>
-                       <method name="child_type" symbol="gtk_container_child_type">
-                               <return-type type="GType"/>
+                       </signal>
+                       <signal name="prev-year" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="calendar" type="GtkCalendar*"/>
                                </parameters>
-                       </method>
-                       <method name="class_find_child_property" symbol="gtk_container_class_find_child_property">
-                               <return-type type="GParamSpec*"/>
+                       </signal>
+                       <field name="header_style" type="GtkStyle*"/>
+                       <field name="label_style" type="GtkStyle*"/>
+                       <field name="month" type="gint"/>
+                       <field name="year" type="gint"/>
+                       <field name="selected_day" type="gint"/>
+                       <field name="day_month" type="gint[][]"/>
+                       <field name="day" type="gint[][]"/>
+                       <field name="num_marked_dates" type="gint"/>
+                       <field name="marked_date" type="gint[]"/>
+                       <field name="display_flags" type="GtkCalendarDisplayOptions"/>
+                       <field name="marked_date_color" type="GdkColor[]"/>
+                       <field name="gc" type="GdkGC*"/>
+                       <field name="xor_gc" type="GdkGC*"/>
+                       <field name="focus_row" type="gint"/>
+                       <field name="focus_col" type="gint"/>
+                       <field name="highlight_row" type="gint"/>
+                       <field name="highlight_col" type="gint"/>
+                       <field name="grow_space" type="gchar[]"/>
+               </object>
+               <object name="GtkCellRenderer" parent="GtkObject" 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="cclass" type="GObjectClass*"/>
-                                       <parameter name="property_name" type="gchar*"/>
+                                       <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="class_install_child_property" symbol="gtk_container_class_install_child_property">
+                       <method name="get_fixed_size" symbol="gtk_cell_renderer_get_fixed_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cclass" type="GtkContainerClass*"/>
-                                       <parameter name="property_id" type="guint"/>
-                                       <parameter name="pspec" type="GParamSpec*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="width" type="gint*"/>
+                                       <parameter name="height" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="class_list_child_properties" symbol="gtk_container_class_list_child_properties">
-                               <return-type type="GParamSpec**"/>
+                       <method name="get_size" symbol="gtk_cell_renderer_get_size">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="cclass" type="GObjectClass*"/>
-                                       <parameter name="n_properties" type="guint*"/>
+                                       <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="forall" symbol="gtk_container_forall">
+                       <method name="render" symbol="gtk_cell_renderer_render">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="callback" type="GtkCallback"/>
-                                       <parameter name="callback_data" type="gpointer"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="expose_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
                                </parameters>
                        </method>
-                       <method name="foreach" symbol="gtk_container_foreach">
+                       <method name="set_fixed_size" symbol="gtk_cell_renderer_set_fixed_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="callback" type="GtkCallback"/>
-                                       <parameter name="callback_data" type="gpointer"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="width" type="gint"/>
+                                       <parameter name="height" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="foreach_full" symbol="gtk_container_foreach_full">
-                               <return-type type="void"/>
+                       <method name="start_editing" symbol="gtk_cell_renderer_start_editing">
+                               <return-type type="GtkCellEditable*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="callback" type="GtkCallback"/>
-                                       <parameter name="marshal" type="GtkCallbackMarshal"/>
-                                       <parameter name="callback_data" type="gpointer"/>
-                                       <parameter name="notify" type="GtkDestroyNotify"/>
+                                       <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_border_width" symbol="gtk_container_get_border_width">
-                               <return-type type="guint"/>
+                       <method name="stop_editing" symbol="gtk_cell_renderer_stop_editing">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="canceled" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_children" symbol="gtk_container_get_children">
-                               <return-type type="GList*"/>
+                       <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-set" type="gboolean" readable="1" writable="1" 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="container" type="GtkContainer*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
                                </parameters>
-                       </method>
-                       <method name="get_focus_chain" symbol="gtk_container_get_focus_chain">
+                       </signal>
+                       <signal name="editing-started" when="FIRST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="editable" type="GtkCellEditable*"/>
+                                       <parameter name="path" type="char*"/>
+                               </parameters>
+                       </signal>
+                       <vfunc name="activate">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="focusable_widgets" type="GList**"/>
+                                       <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_focus_hadjustment" symbol="gtk_container_get_focus_hadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       </vfunc>
+                       <vfunc name="get_size">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <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="get_focus_vadjustment" symbol="gtk_container_get_focus_vadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       </vfunc>
+                       <vfunc name="render">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="window" type="GdkDrawable*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="background_area" type="GdkRectangle*"/>
+                                       <parameter name="cell_area" type="GdkRectangle*"/>
+                                       <parameter name="expose_area" type="GdkRectangle*"/>
+                                       <parameter name="flags" type="GtkCellRendererState"/>
                                </parameters>
-                       </method>
-                       <method name="get_resize_mode" symbol="gtk_container_get_resize_mode">
-                               <return-type type="GtkResizeMode"/>
+                       </vfunc>
+                       <vfunc name="start_editing">
+                               <return-type type="GtkCellEditable*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <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="propagate_expose" symbol="gtk_container_propagate_expose">
+                       </vfunc>
+                       <field name="xalign" type="gfloat"/>
+                       <field name="yalign" type="gfloat"/>
+                       <field name="width" type="gint"/>
+                       <field name="height" type="gint"/>
+                       <field name="xpad" type="guint16"/>
+                       <field name="ypad" type="guint16"/>
+                       <field name="mode" type="guint"/>
+                       <field name="visible" type="guint"/>
+                       <field name="is_expander" type="guint"/>
+                       <field name="is_expanded" type="guint"/>
+                       <field name="cell_background_set" type="guint"/>
+                       <field name="sensitive" type="guint"/>
+                       <field name="editing" type="guint"/>
+               </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="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="event" type="GdkEventExpose*"/>
+                                       <parameter name="accel" type="GtkCellRendererAccel*"/>
+                                       <parameter name="path_string" type="char*"/>
                                </parameters>
-                       </method>
-                       <method name="remove" symbol="gtk_container_remove">
+                       </signal>
+                       <signal name="accel-edited" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <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>
-                       <method name="resize_children" symbol="gtk_container_resize_children">
+                       </signal>
+                       <field name="accel_key" type="guint"/>
+                       <field name="accel_mods" type="GdkModifierType"/>
+                       <field name="keycode" type="guint"/>
+                       <field name="accel_mode" type="GtkCellRendererAccelMode"/>
+                       <field name="edit_widget" type="GtkWidget*"/>
+                       <field name="grab_widget" type="GtkWidget*"/>
+                       <field name="sizing_label" type="GtkWidget*"/>
+               </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"/>
+                       <field name="model" type="GtkTreeModel*"/>
+                       <field name="text_column" type="gint"/>
+                       <field name="has_entry" type="gboolean"/>
+                       <field name="focus_out_id" type="guint"/>
+               </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="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"/>
+                       <field name="pixbuf" type="GdkPixbuf*"/>
+                       <field name="pixbuf_expander_open" type="GdkPixbuf*"/>
+                       <field name="pixbuf_expander_closed" type="GdkPixbuf*"/>
+               </object>
+               <object name="GtkCellRendererProgress" parent="GtkCellRenderer" type-name="GtkCellRendererProgress" get-type="gtk_cell_renderer_progress_get_type">
+                       <constructor name="new" symbol="gtk_cell_renderer_progress_new">
+                               <return-type type="GtkCellRenderer*"/>
+                       </constructor>
+                       <property name="orientation" type="GtkProgressBarOrientation" 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="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="container" type="GtkContainer*"/>
+                                       <parameter name="renderer" type="GtkCellRendererText*"/>
+                                       <parameter name="number_of_rows" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_border_width" symbol="gtk_container_set_border_width">
+                       <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-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-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="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="container" type="GtkContainer*"/>
-                                       <parameter name="border_width" type="guint"/>
+                                       <parameter name="cell_renderer_text" type="GtkCellRendererText*"/>
+                                       <parameter name="path" type="char*"/>
+                                       <parameter name="new_text" type="char*"/>
                                </parameters>
-                       </method>
-                       <method name="set_focus_chain" symbol="gtk_container_set_focus_chain">
-                               <return-type type="void"/>
+                       </signal>
+                       <field name="text" type="gchar*"/>
+                       <field name="font" type="PangoFontDescription*"/>
+                       <field name="font_scale" type="gdouble"/>
+                       <field name="foreground" type="PangoColor"/>
+                       <field name="background" type="PangoColor"/>
+                       <field name="extra_attrs" type="PangoAttrList*"/>
+                       <field name="underline_style" type="PangoUnderline"/>
+                       <field name="rise" type="gint"/>
+                       <field name="fixed_height_rows" type="gint"/>
+                       <field name="strikethrough" type="guint"/>
+                       <field name="editable" type="guint"/>
+                       <field name="scale_set" type="guint"/>
+                       <field name="foreground_set" type="guint"/>
+                       <field name="background_set" type="guint"/>
+                       <field name="underline_set" type="guint"/>
+                       <field name="rise_set" type="guint"/>
+                       <field name="strikethrough_set" type="guint"/>
+                       <field name="editable_set" type="guint"/>
+                       <field name="calc_fixed_height" type="guint"/>
+               </object>
+               <object name="GtkCellRendererToggle" parent="GtkCellRenderer" type-name="GtkCellRendererToggle" get-type="gtk_cell_renderer_toggle_get_type">
+                       <method name="get_active" symbol="gtk_cell_renderer_toggle_get_active">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="focusable_widgets" type="GList*"/>
+                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
                                </parameters>
                        </method>
-                       <method name="set_focus_child" symbol="gtk_container_set_focus_child">
-                               <return-type type="void"/>
+                       <method name="get_radio" symbol="gtk_cell_renderer_toggle_get_radio">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
                                </parameters>
                        </method>
-                       <method name="set_focus_hadjustment" symbol="gtk_container_set_focus_hadjustment">
+                       <constructor name="new" symbol="gtk_cell_renderer_toggle_new">
+                               <return-type type="GtkCellRenderer*"/>
+                       </constructor>
+                       <method name="set_active" symbol="gtk_cell_renderer_toggle_set_active">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_focus_vadjustment" symbol="gtk_container_set_focus_vadjustment">
+                       <method name="set_radio" symbol="gtk_cell_renderer_toggle_set_radio">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="radio" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_reallocate_redraws" symbol="gtk_container_set_reallocate_redraws">
+                       <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="container" type="GtkContainer*"/>
-                                       <parameter name="needs_redraws" type="gboolean"/>
+                                       <parameter name="cell_renderer_toggle" type="GtkCellRendererToggle*"/>
+                                       <parameter name="path" type="char*"/>
+                               </parameters>
+                       </signal>
+                       <field name="active" type="guint"/>
+                       <field name="activatable" type="guint"/>
+                       <field name="radio" type="guint"/>
+               </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_cell_renderers" symbol="gtk_cell_view_get_cell_renderers">
+                               <return-type type="GList*"/>
+                               <parameters>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
                                </parameters>
                        </method>
-                       <method name="set_resize_mode" symbol="gtk_container_set_resize_mode">
-                               <return-type type="void"/>
+                       <method name="get_displayed_row" symbol="gtk_cell_view_get_displayed_row">
+                               <return-type type="GtkTreePath*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="resize_mode" type="GtkResizeMode"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
                                </parameters>
                        </method>
-                       <method name="unset_focus_chain" symbol="gtk_container_unset_focus_chain">
-                               <return-type type="void"/>
+                       <method name="get_size_of_row" symbol="gtk_cell_view_get_size_of_row">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="requisition" type="GtkRequisition*"/>
                                </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"/>
+                       <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*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="markup" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="check-resize" when="LAST">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_with_pixbuf" symbol="gtk_cell_view_new_with_pixbuf">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
-                       </signal>
-                       <signal name="remove" when="FIRST">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_with_text" symbol="gtk_cell_view_new_with_text">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="set-focus-child" when="FIRST">
+                       </constructor>
+                       <method name="set_background_color" symbol="gtk_cell_view_set_background_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="child_type">
-                               <return-type type="GType"/>
+                       </method>
+                       <method name="set_displayed_row" symbol="gtk_cell_view_set_displayed_row">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="composite_name">
-                               <return-type type="gchar*"/>
+                       </method>
+                       <method name="set_model" symbol="gtk_cell_view_set_model">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="container" type="GtkContainer*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="cell_view" type="GtkCellView*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="forall">
-                               <return-type type="void"/>
+                       </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-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"/>
+               </object>
+               <object name="GtkCheckButton" parent="GtkToggleButton" type-name="GtkCheckButton" get-type="gtk_check_button_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </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="container" type="GtkContainer*"/>
-                                       <parameter name="include_internals" type="gboolean"/>
-                                       <parameter name="callback" type="GtkCallback"/>
-                                       <parameter name="callback_data" type="gpointer"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_child_property">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_with_mnemonic" symbol="gtk_check_button_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
                                <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="label" type="gchar*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_child_property">
+                       </constructor>
+                       <vfunc name="draw_indicator">
                                <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="check_button" type="GtkCheckButton*"/>
+                                       <parameter name="area" type="GdkRectangle*"/>
                                </parameters>
                        </vfunc>
-                       <field name="focus_child" type="GtkWidget*"/>
-                       <field name="border_width" type="guint"/>
-                       <field name="need_resize" type="guint"/>
-                       <field name="resize_mode" type="guint"/>
-                       <field name="reallocate_redraws" type="guint"/>
-                       <field name="has_focus_chain" type="guint"/>
                </object>
-               <object name="GtkCurve" parent="GtkDrawingArea" type-name="GtkCurve" get-type="gtk_curve_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"/>
                        </implements>
-                       <method name="get_vector" symbol="gtk_curve_get_vector">
-                               <return-type type="void"/>
+                       <method name="get_active" symbol="gtk_check_menu_item_get_active">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="curve" type="GtkCurve*"/>
-                                       <parameter name="veclen" type="int"/>
-                                       <parameter name="vector" type="gfloat[]"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_curve_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="reset" symbol="gtk_curve_reset">
-                               <return-type type="void"/>
+                       <method name="get_draw_as_radio" symbol="gtk_check_menu_item_get_draw_as_radio">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="curve" type="GtkCurve*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="set_curve_type" symbol="gtk_curve_set_curve_type">
-                               <return-type type="void"/>
+                       <method name="get_inconsistent" symbol="gtk_check_menu_item_get_inconsistent">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="curve" type="GtkCurve*"/>
-                                       <parameter name="type" type="GtkCurveType"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="set_gamma" symbol="gtk_curve_set_gamma">
-                               <return-type type="void"/>
+                       <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="curve" type="GtkCurve*"/>
-                                       <parameter name="gamma_" type="gfloat"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_range" symbol="gtk_curve_set_range">
+                       </constructor>
+                       <constructor name="new_with_mnemonic" symbol="gtk_check_menu_item_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="label" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_active" symbol="gtk_check_menu_item_set_active">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="curve" type="GtkCurve*"/>
-                                       <parameter name="min_x" type="gfloat"/>
-                                       <parameter name="max_x" type="gfloat"/>
-                                       <parameter name="min_y" type="gfloat"/>
-                                       <parameter name="max_y" type="gfloat"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="is_active" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_vector" symbol="gtk_curve_set_vector">
+                       <method name="set_draw_as_radio" symbol="gtk_check_menu_item_set_draw_as_radio">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="curve" type="GtkCurve*"/>
-                                       <parameter name="veclen" type="int"/>
-                                       <parameter name="vector" type="gfloat[]"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="draw_as_radio" type="gboolean"/>
                                </parameters>
                        </method>
-                       <property name="curve-type" type="GtkCurveType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="max-x" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="max-y" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="min-x" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="min-y" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="curve-type-changed" when="FIRST">
+                       <method name="set_inconsistent" symbol="gtk_check_menu_item_set_inconsistent">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="curve" type="GtkCurve*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
-                       </signal>
-                       <field name="cursor_type" type="gint"/>
-                       <field name="min_x" type="gfloat"/>
-                       <field name="max_x" type="gfloat"/>
-                       <field name="min_y" type="gfloat"/>
-                       <field name="max_y" type="gfloat"/>
-                       <field name="pixmap" type="GdkPixmap*"/>
-                       <field name="curve_type" type="GtkCurveType"/>
-                       <field name="height" type="gint"/>
-                       <field name="grab_point" type="gint"/>
-                       <field name="last" type="gint"/>
-                       <field name="num_points" type="gint"/>
-                       <field name="point" type="GdkPoint*"/>
-                       <field name="num_ctlpoints" type="gint"/>
-                       <field name="ctlpoint" type="gfloat[]*"/>
-               </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">
+                       </method>
+                       <method name="toggled" symbol="gtk_check_menu_item_toggled">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="add_button" symbol="gtk_dialog_add_button">
-                               <return-type type="GtkWidget*"/>
+                       <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="dialog" type="GtkDialog*"/>
-                                       <parameter name="button_text" type="gchar*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
                                </parameters>
-                       </method>
-                       <method name="add_buttons" symbol="gtk_dialog_add_buttons">
+                       </signal>
+                       <vfunc name="draw_indicator">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="first_button_text" type="gchar*"/>
+                                       <parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
+                                       <parameter name="area" type="GdkRectangle*"/>
                                </parameters>
-                       </method>
-                       <method name="get_has_separator" symbol="gtk_dialog_get_has_separator">
-                               <return-type type="gboolean"/>
+                       </vfunc>
+                       <field name="active" type="guint"/>
+                       <field name="always_show_toggle" type="guint"/>
+                       <field name="inconsistent" type="guint"/>
+                       <field name="draw_as_radio" type="guint"/>
+               </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="dialog" type="GtkDialog*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="get_response_for_widget" symbol="gtk_dialog_get_response_for_widget">
-                               <return-type type="gint"/>
+                       <method name="get" symbol="gtk_clipboard_get">
+                               <return-type type="GtkClipboard*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="selection" type="GdkAtom"/>
                                </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_display" symbol="gtk_clipboard_get_display">
+                               <return-type type="GdkDisplay*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="run" symbol="gtk_dialog_run">
-                               <return-type type="gint"/>
+                       <method name="get_for_display" symbol="gtk_clipboard_get_for_display">
+                               <return-type type="GtkClipboard*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="selection" type="GdkAtom"/>
                                </parameters>
                        </method>
-                       <method name="set_alternative_button_order" symbol="gtk_dialog_set_alternative_button_order">
-                               <return-type type="void"/>
+                       <method name="get_owner" symbol="gtk_clipboard_get_owner">
+                               <return-type type="GObject*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="first_response_id" type="gint"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="set_alternative_button_order_from_array" symbol="gtk_dialog_set_alternative_button_order_from_array">
+                       <method name="request_contents" symbol="gtk_clipboard_request_contents">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="n_params" type="gint"/>
-                                       <parameter name="new_order" type="gint*"/>
+                                       <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="set_default_response" symbol="gtk_dialog_set_default_response">
+                       <method name="request_image" symbol="gtk_clipboard_request_image">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="callback" type="GtkClipboardImageReceivedFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_has_separator" symbol="gtk_dialog_set_has_separator">
+                       <method name="request_rich_text" symbol="gtk_clipboard_request_rich_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <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_response_sensitive" symbol="gtk_dialog_set_response_sensitive">
+                       <method name="request_targets" symbol="gtk_clipboard_request_targets">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="response_id" type="gint"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="callback" type="GtkClipboardTargetsReceivedFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <property name="has-separator" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="close" when="LAST">
+                       <method name="request_text" symbol="gtk_clipboard_request_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="callback" type="GtkClipboardTextReceivedFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
-                       </signal>
-                       <signal name="response" when="LAST">
+                       </method>
+                       <method name="set_can_store" symbol="gtk_clipboard_set_can_store">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkDialog*"/>
-                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="targets" type="GtkTargetEntry*"/>
+                                       <parameter name="n_targets" type="gint"/>
                                </parameters>
-                       </signal>
-                       <field name="vbox" type="GtkWidget*"/>
-                       <field name="action_area" type="GtkWidget*"/>
-                       <field name="separator" type="GtkWidget*"/>
-               </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>
-                       <method name="size" symbol="gtk_drawing_area_size">
+                       </method>
+                       <method name="set_image" symbol="gtk_clipboard_set_image">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="darea" type="GtkDrawingArea*"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
                        </method>
-                       <field name="draw_data" 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="GtkCellEditable"/>
-                               <interface name="GtkEditable"/>
-                       </implements>
-                       <method name="append_text" symbol="gtk_entry_append_text">
+                       <method name="set_text" symbol="gtk_clipboard_set_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                        <parameter name="text" type="gchar*"/>
+                                       <parameter name="len" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_activates_default" symbol="gtk_entry_get_activates_default">
+                       <method name="set_with_data" symbol="gtk_clipboard_set_with_data">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <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="get_alignment" symbol="gtk_entry_get_alignment">
-                               <return-type type="gfloat"/>
+                       <method name="set_with_owner" symbol="gtk_clipboard_set_with_owner">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <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="get_completion" symbol="gtk_entry_get_completion">
-                               <return-type type="GtkEntryCompletion*"/>
+                       <method name="store" symbol="gtk_clipboard_store">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="get_cursor_hadjustment" symbol="gtk_entry_get_cursor_hadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       <method name="wait_for_contents" symbol="gtk_clipboard_wait_for_contents">
+                               <return-type type="GtkSelectionData*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="target" type="GdkAtom"/>
                                </parameters>
                        </method>
-                       <method name="get_has_frame" symbol="gtk_entry_get_has_frame">
-                               <return-type type="gboolean"/>
+                       <method name="wait_for_image" symbol="gtk_clipboard_wait_for_image">
+                               <return-type type="GdkPixbuf*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="get_inner_border" symbol="gtk_entry_get_inner_border">
-                               <return-type type="GtkBorder*"/>
+                       <method name="wait_for_rich_text" symbol="gtk_clipboard_wait_for_rich_text">
+                               <return-type type="guint8*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="buffer" type="GtkTextBuffer*"/>
+                                       <parameter name="format" type="GdkAtom*"/>
+                                       <parameter name="length" type="gsize*"/>
                                </parameters>
                        </method>
-                       <method name="get_invisible_char" symbol="gtk_entry_get_invisible_char">
-                               <return-type type="gunichar"/>
+                       <method name="wait_for_targets" symbol="gtk_clipboard_wait_for_targets">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="targets" type="GdkAtom**"/>
+                                       <parameter name="n_targets" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="get_layout" symbol="gtk_entry_get_layout">
-                               <return-type type="PangoLayout*"/>
+                       <method name="wait_for_text" symbol="gtk_clipboard_wait_for_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="get_layout_offsets" symbol="gtk_entry_get_layout_offsets">
-                               <return-type type="void"/>
+                       <method name="wait_is_image_available" symbol="gtk_clipboard_wait_is_image_available">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="x" type="gint*"/>
-                                       <parameter name="y" type="gint*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="get_max_length" symbol="gtk_entry_get_max_length">
-                               <return-type type="gint"/>
+                       <method name="wait_is_rich_text_available" symbol="gtk_clipboard_wait_is_rich_text_available">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="buffer" type="GtkTextBuffer*"/>
                                </parameters>
                        </method>
-                       <method name="get_text" symbol="gtk_entry_get_text">
-                               <return-type type="gchar*"/>
+                       <method name="wait_is_target_available" symbol="gtk_clipboard_wait_is_target_available">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
+                                       <parameter name="target" type="GdkAtom"/>
                                </parameters>
                        </method>
-                       <method name="get_visibility" symbol="gtk_entry_get_visibility">
+                       <method name="wait_is_text_available" symbol="gtk_clipboard_wait_is_text_available">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="clipboard" type="GtkClipboard*"/>
                                </parameters>
                        </method>
-                       <method name="get_width_chars" symbol="gtk_entry_get_width_chars">
-                               <return-type type="gint"/>
+                       <signal name="owner-change" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="object" type="GtkClipboard*"/>
+                                       <parameter name="p0" type="GdkEvent*"/>
                                </parameters>
-                       </method>
-                       <method name="layout_index_to_text_index" symbol="gtk_entry_layout_index_to_text_index">
-                               <return-type type="gint"/>
+                       </signal>
+               </object>
+               <object name="GtkColorButton" parent="GtkButton" type-name="GtkColorButton" get-type="gtk_color_button_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_alpha" symbol="gtk_color_button_get_alpha">
+                               <return-type type="guint16"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="layout_index" type="gint"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_entry_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_max_length" symbol="gtk_entry_new_with_max_length">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="max" type="gint"/>
-                               </parameters>
-                       </constructor>
-                       <method name="prepend_text" symbol="gtk_entry_prepend_text">
+                       <method name="get_color" symbol="gtk_color_button_get_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="select_region" symbol="gtk_entry_select_region">
-                               <return-type type="void"/>
+                       <method name="get_title" symbol="gtk_color_button_get_title">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="start" type="gint"/>
-                                       <parameter name="end" type="gint"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
                                </parameters>
                        </method>
-                       <method name="set_activates_default" symbol="gtk_entry_set_activates_default">
-                               <return-type type="void"/>
+                       <method name="get_use_alpha" symbol="gtk_color_button_get_use_alpha">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
                                </parameters>
                        </method>
-                       <method name="set_alignment" symbol="gtk_entry_set_alignment">
-                               <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="entry" type="GtkEntry*"/>
-                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
-                       </method>
-                       <method name="set_completion" symbol="gtk_entry_set_completion">
+                       </constructor>
+                       <method name="set_alpha" symbol="gtk_color_button_set_alpha">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="alpha" type="guint16"/>
                                </parameters>
                        </method>
-                       <method name="set_cursor_hadjustment" symbol="gtk_entry_set_cursor_hadjustment">
+                       <method name="set_color" symbol="gtk_color_button_set_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="set_editable" symbol="gtk_entry_set_editable">
+                       <method name="set_title" symbol="gtk_color_button_set_title">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="editable" type="gboolean"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_has_frame" symbol="gtk_entry_set_has_frame">
+                       <method name="set_use_alpha" symbol="gtk_color_button_set_use_alpha">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="color_button" type="GtkColorButton*"/>
+                                       <parameter name="use_alpha" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_inner_border" symbol="gtk_entry_set_inner_border">
+                       <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="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="entry" type="GtkEntry*"/>
-                                       <parameter name="border" type="GtkBorder*"/>
+                                       <parameter name="cp" type="GtkColorButton*"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GtkColorSelection" parent="GtkVBox" type-name="GtkColorSelection" get-type="gtk_color_selection_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_current_alpha" symbol="gtk_color_selection_get_current_alpha">
+                               <return-type type="guint16"/>
+                               <parameters>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
                                </parameters>
                        </method>
-                       <method name="set_invisible_char" symbol="gtk_entry_set_invisible_char">
+                       <method name="get_current_color" symbol="gtk_color_selection_get_current_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="ch" type="gunichar"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="set_max_length" symbol="gtk_entry_set_max_length">
-                               <return-type type="void"/>
+                       <method name="get_has_opacity_control" symbol="gtk_color_selection_get_has_opacity_control">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="max" type="gint"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
                                </parameters>
                        </method>
-                       <method name="set_position" symbol="gtk_entry_set_position">
-                               <return-type type="void"/>
+                       <method name="get_has_palette" symbol="gtk_color_selection_get_has_palette">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
                                </parameters>
                        </method>
-                       <method name="set_text" symbol="gtk_entry_set_text">
-                               <return-type type="void"/>
+                       <method name="get_previous_alpha" symbol="gtk_color_selection_get_previous_alpha">
+                               <return-type type="guint16"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
                                </parameters>
                        </method>
-                       <method name="set_visibility" symbol="gtk_entry_set_visibility">
+                       <method name="get_previous_color" symbol="gtk_color_selection_get_previous_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="visible" type="gboolean"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
                        </method>
-                       <method name="set_width_chars" symbol="gtk_entry_set_width_chars">
-                               <return-type type="void"/>
+                       <method name="is_adjusting" symbol="gtk_color_selection_is_adjusting">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="n_chars" type="gint"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
                                </parameters>
                        </method>
-                       <method name="text_index_to_layout_index" symbol="gtk_entry_text_index_to_layout_index">
-                               <return-type type="gint"/>
+                       <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="entry" type="GtkEntry*"/>
-                                       <parameter name="text_index" type="gint"/>
+                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="colors" type="GdkColor**"/>
+                                       <parameter name="n_colors" type="gint*"/>
                                </parameters>
                        </method>
-                       <property name="activates-default" 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="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="max-length" type="gint" 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="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="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"/>
+                       <method name="palette_to_string" symbol="gtk_color_selection_palette_to_string">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="colors" type="GdkColor*"/>
+                                       <parameter name="n_colors" type="gint"/>
                                </parameters>
-                       </signal>
-                       <signal name="backspace" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <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="entry" type="GtkEntry*"/>
+                                       <parameter name="func" type="GtkColorSelectionChangePaletteWithScreenFunc"/>
                                </parameters>
-                       </signal>
-                       <signal name="copy-clipboard" when="LAST">
+                       </method>
+                       <method name="set_current_alpha" symbol="gtk_color_selection_set_current_alpha">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="alpha" type="guint16"/>
                                </parameters>
-                       </signal>
-                       <signal name="cut-clipboard" when="LAST">
+                       </method>
+                       <method name="set_current_color" symbol="gtk_color_selection_set_current_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
-                       </signal>
-                       <signal name="delete-from-cursor" when="LAST">
+                       </method>
+                       <method name="set_has_opacity_control" symbol="gtk_color_selection_set_has_opacity_control">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="type" type="GtkDeleteType"/>
-                                       <parameter name="count" type="gint"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="has_opacity" type="gboolean"/>
                                </parameters>
-                       </signal>
-                       <signal name="insert-at-cursor" when="LAST">
+                       </method>
+                       <method name="set_has_palette" symbol="gtk_color_selection_set_has_palette">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
-                                       <parameter name="str" type="char*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="has_palette" type="gboolean"/>
                                </parameters>
-                       </signal>
-                       <signal name="move-cursor" when="LAST">
+                       </method>
+                       <method name="set_previous_alpha" symbol="gtk_color_selection_set_previous_alpha">
                                <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="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="alpha" type="guint16"/>
                                </parameters>
-                       </signal>
-                       <signal name="paste-clipboard" when="LAST">
+                       </method>
+                       <method name="set_previous_color" symbol="gtk_color_selection_set_previous_color">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="colorsel" type="GtkColorSelection*"/>
+                                       <parameter name="color" type="GdkColor*"/>
                                </parameters>
-                       </signal>
-                       <signal name="populate-popup" when="LAST">
+                       </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="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="entry" type="GtkEntry*"/>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="color_selection" type="GtkColorSelection*"/>
                                </parameters>
                        </signal>
-                       <signal name="toggle-overwrite" when="LAST">
-                               <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>
+                       <constructor name="new" symbol="gtk_color_selection_dialog_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <field name="text" type="gchar*"/>
-                       <field name="editable" type="guint"/>
-                       <field name="visible" type="guint"/>
-                       <field name="overwrite_mode" type="guint"/>
-                       <field name="in_drag" type="guint"/>
-                       <field name="text_length" type="guint16"/>
-                       <field name="text_max_length" type="guint16"/>
-                       <field name="text_area" type="GdkWindow*"/>
-                       <field name="im_context" type="GtkIMContext*"/>
-                       <field name="popup_menu" type="GtkWidget*"/>
-                       <field name="current_pos" type="gint"/>
-                       <field name="selection_bound" type="gint"/>
-                       <field name="cached_layout" type="PangoLayout*"/>
-                       <field name="cache_includes_preedit" type="guint"/>
-                       <field name="need_im_reset" type="guint"/>
-                       <field name="has_frame" type="guint"/>
-                       <field name="activates_default" type="guint"/>
-                       <field name="cursor_visible" type="guint"/>
-                       <field name="in_click" type="guint"/>
-                       <field name="is_cell_renderer" type="guint"/>
-                       <field name="editing_canceled" type="guint"/>
-                       <field name="mouse_cursor_obscured" type="guint"/>
-                       <field name="select_words" type="guint"/>
-                       <field name="select_lines" type="guint"/>
-                       <field name="resolved_dir" type="guint"/>
-                       <field name="truncate_multiline" type="guint"/>
-                       <field name="button" type="guint"/>
-                       <field name="blink_timeout" type="guint"/>
-                       <field name="recompute_idle" type="guint"/>
-                       <field name="scroll_offset" type="gint"/>
-                       <field name="ascent" type="gint"/>
-                       <field name="descent" type="gint"/>
-                       <field name="text_size" type="guint16"/>
-                       <field name="n_bytes" type="guint16"/>
-                       <field name="preedit_length" type="guint16"/>
-                       <field name="preedit_cursor" type="guint16"/>
-                       <field name="dnd_position" type="gint"/>
-                       <field name="drag_start_x" type="gint"/>
-                       <field name="drag_start_y" type="gint"/>
-                       <field name="invisible_char" type="gunichar"/>
-                       <field name="width_chars" type="gint"/>
+                       </constructor>
+                       <field name="colorsel" type="GtkWidget*"/>
+                       <field name="ok_button" type="GtkWidget*"/>
+                       <field name="cancel_button" type="GtkWidget*"/>
+                       <field name="help_button" type="GtkWidget*"/>
                </object>
-               <object name="GtkEntryCompletion" parent="GObject" type-name="GtkEntryCompletion" get-type="gtk_entry_completion_get_type">
+               <object name="GtkComboBox" parent="GtkBin" type-name="GtkComboBox" get-type="gtk_combo_box_get_type">
                        <implements>
+                               <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
+                               <interface name="GtkCellEditable"/>
                                <interface name="GtkCellLayout"/>
                        </implements>
-                       <method name="complete" symbol="gtk_entry_completion_complete">
+                       <method name="append_text" symbol="gtk_combo_box_append_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="delete_action" symbol="gtk_entry_completion_delete_action">
-                               <return-type type="void"/>
+                       <method name="get_active" symbol="gtk_combo_box_get_active">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="index_" type="gint"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_completion_prefix" symbol="gtk_entry_completion_get_completion_prefix">
-                               <return-type type="gchar*"/>
+                       <method name="get_active_iter" symbol="gtk_combo_box_get_active_iter">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="get_entry" symbol="gtk_entry_completion_get_entry">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_active_text" symbol="gtk_combo_box_get_active_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_inline_completion" symbol="gtk_entry_completion_get_inline_completion">
+                       <method name="get_add_tearoffs" symbol="gtk_combo_box_get_add_tearoffs">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_inline_selection" symbol="gtk_entry_completion_get_inline_selection">
-                               <return-type type="gboolean"/>
+                       <method name="get_column_span_column" symbol="gtk_combo_box_get_column_span_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_minimum_key_length" symbol="gtk_entry_completion_get_minimum_key_length">
-                               <return-type type="gint"/>
+                       <method name="get_focus_on_click" symbol="gtk_combo_box_get_focus_on_click">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_model" symbol="gtk_entry_completion_get_model">
+                       <method name="get_model" symbol="gtk_combo_box_get_model">
                                <return-type type="GtkTreeModel*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_popup_completion" symbol="gtk_entry_completion_get_popup_completion">
-                               <return-type type="gboolean"/>
+                       <method name="get_popup_accessible" symbol="gtk_combo_box_get_popup_accessible">
+                               <return-type type="AtkObject*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_popup_set_width" symbol="gtk_entry_completion_get_popup_set_width">
-                               <return-type type="gboolean"/>
+                       <method name="get_row_separator_func" symbol="gtk_combo_box_get_row_separator_func">
+                               <return-type type="GtkTreeViewRowSeparatorFunc"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_popup_single_match" symbol="gtk_entry_completion_get_popup_single_match">
-                               <return-type type="gboolean"/>
+                       <method name="get_row_span_column" symbol="gtk_combo_box_get_row_span_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="get_text_column" symbol="gtk_entry_completion_get_text_column">
-                               <return-type type="gint"/>
+                       <method name="get_title" symbol="gtk_combo_box_get_title">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="insert_action_markup" symbol="gtk_entry_completion_insert_action_markup">
-                               <return-type type="void"/>
+                       <method name="get_wrap_width" symbol="gtk_combo_box_get_wrap_width">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="index_" type="gint"/>
-                                       <parameter name="markup" type="gchar*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="insert_action_text" symbol="gtk_entry_completion_insert_action_text">
+                       <method name="insert_text" symbol="gtk_combo_box_insert_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="index_" type="gint"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="position" type="gint"/>
                                        <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="insert_prefix" symbol="gtk_entry_completion_insert_prefix">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_combo_box_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_text" symbol="gtk_combo_box_new_text">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_model" symbol="gtk_combo_box_new_with_model">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </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">
+                       <method name="popdown" symbol="gtk_combo_box_popdown">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="inline_completion" type="gboolean"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="set_inline_selection" symbol="gtk_entry_completion_set_inline_selection">
+                       <method name="popup" symbol="gtk_combo_box_popup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="inline_selection" type="gboolean"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
                        </method>
-                       <method name="set_match_func" symbol="gtk_entry_completion_set_match_func">
+                       <method name="prepend_text" symbol="gtk_combo_box_prepend_text">
                                <return-type type="void"/>
                                <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="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_minimum_key_length" symbol="gtk_entry_completion_set_minimum_key_length">
+                       <method name="remove_text" symbol="gtk_combo_box_remove_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="length" type="gint"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_model" symbol="gtk_entry_completion_set_model">
+                       <method name="set_active" symbol="gtk_combo_box_set_active">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="index_" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_popup_completion" symbol="gtk_entry_completion_set_popup_completion">
+                       <method name="set_active_iter" symbol="gtk_combo_box_set_active_iter">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="popup_completion" type="gboolean"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_popup_set_width" symbol="gtk_entry_completion_set_popup_set_width">
+                       <method name="set_add_tearoffs" symbol="gtk_combo_box_set_add_tearoffs">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="popup_set_width" type="gboolean"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="add_tearoffs" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_popup_single_match" symbol="gtk_entry_completion_set_popup_single_match">
+                       <method name="set_column_span_column" symbol="gtk_combo_box_set_column_span_column">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="popup_single_match" type="gboolean"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="column_span" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_text_column" symbol="gtk_entry_completion_set_text_column">
+                       <method name="set_focus_on_click" symbol="gtk_combo_box_set_focus_on_click">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="combo" type="GtkComboBox*"/>
+                                       <parameter name="focus_on_click" type="gboolean"/>
                                </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">
+                       <method name="set_model" symbol="gtk_combo_box_set_model">
                                <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="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="insert-prefix" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
-                                       <parameter name="prefix" type="char*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="match-selected" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                        <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"/>
+                       </method>
+                       <method name="set_row_separator_func" symbol="gtk_combo_box_set_row_separator_func">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="event_box" type="GtkEventBox*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="func" type="GtkTreeViewRowSeparatorFunc"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="destroy" type="GtkDestroyNotify"/>
                                </parameters>
                        </method>
-                       <method name="get_visible_window" symbol="gtk_event_box_get_visible_window">
-                               <return-type type="gboolean"/>
+                       <method name="set_row_span_column" symbol="gtk_combo_box_set_row_span_column">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="event_box" type="GtkEventBox*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="row_span" type="gint"/>
                                </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="set_title" symbol="gtk_combo_box_set_title">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="event_box" type="GtkEventBox*"/>
-                                       <parameter name="above_child" type="gboolean"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_visible_window" symbol="gtk_event_box_set_visible_window">
+                       <method name="set_wrap_width" symbol="gtk_combo_box_set_wrap_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="event_box" type="GtkEventBox*"/>
-                                       <parameter name="visible_window" type="gboolean"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
+                                       <parameter name="width" type="gint"/>
                                </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">
-                               <return-type type="gboolean"/>
+                       <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="column-span-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-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-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="expander" type="GtkExpander*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
-                       </method>
-                       <method name="get_label" symbol="gtk_expander_get_label">
-                               <return-type type="gchar*"/>
+                       </signal>
+                       <signal name="move-active" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="object" type="GtkComboBox*"/>
+                                       <parameter name="p0" type="GtkScrollType"/>
                                </parameters>
-                       </method>
-                       <method name="get_label_widget" symbol="gtk_expander_get_label_widget">
-                               <return-type type="GtkWidget*"/>
+                       </signal>
+                       <signal name="popdown" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="object" type="GtkComboBox*"/>
                                </parameters>
-                       </method>
-                       <method name="get_spacing" symbol="gtk_expander_get_spacing">
-                               <return-type type="gint"/>
+                       </signal>
+                       <signal name="popup" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="object" type="GtkComboBox*"/>
                                </parameters>
-                       </method>
-                       <method name="get_use_markup" symbol="gtk_expander_get_use_markup">
-                               <return-type type="gboolean"/>
+                       </signal>
+                       <vfunc name="get_active_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="combo_box" type="GtkComboBox*"/>
                                </parameters>
-                       </method>
-                       <method name="get_use_underline" symbol="gtk_expander_get_use_underline">
-                               <return-type type="gboolean"/>
+                       </vfunc>
+               </object>
+               <object name="GtkComboBoxEntry" parent="GtkComboBox" type-name="GtkComboBoxEntry" get-type="gtk_combo_box_entry_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkCellEditable"/>
+                               <interface name="GtkCellLayout"/>
+                       </implements>
+                       <method name="get_text_column" symbol="gtk_combo_box_entry_get_text_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="entry_box" type="GtkComboBoxEntry*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_expander_new">
+                       <constructor name="new" symbol="gtk_combo_box_entry_new">
                                <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="label" type="gchar*"/>
-                               </parameters>
                        </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_expander_new_with_mnemonic">
+                       <constructor name="new_text" symbol="gtk_combo_box_entry_new_text">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <constructor name="new_with_model" symbol="gtk_combo_box_entry_new_with_model">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="text_column" type="gint"/>
                                </parameters>
                        </constructor>
-                       <method name="set_expanded" symbol="gtk_expander_set_expanded">
+                       <method name="set_text_column" symbol="gtk_combo_box_entry_set_text_column">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="expanded" type="gboolean"/>
+                                       <parameter name="entry_box" type="GtkComboBoxEntry*"/>
+                                       <parameter name="text_column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_label" symbol="gtk_expander_set_label">
+                       <property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+               </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="expander" type="GtkExpander*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_label_widget" symbol="gtk_expander_set_label_widget">
+                       <method name="add_with_properties" symbol="gtk_container_add_with_properties">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="label_widget" type="GtkWidget*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="first_prop_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_spacing" symbol="gtk_expander_set_spacing">
+                       <method name="check_resize" symbol="gtk_container_check_resize">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="spacing" type="gint"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_markup" symbol="gtk_expander_set_use_markup">
+                       <method name="child_get" symbol="gtk_container_child_get">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="use_markup" type="gboolean"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="first_prop_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_underline" symbol="gtk_expander_set_use_underline">
+                       <method name="child_get_property" symbol="gtk_container_child_get_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
-                                       <parameter name="use_underline" 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>
-                       <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-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="child_get_valist" symbol="gtk_container_child_get_valist">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <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>
-                       </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="GtkFileChooser"/>
-                       </implements>
-                       <method name="get_focus_on_click" symbol="gtk_file_chooser_button_get_focus_on_click">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <method name="child_set" symbol="gtk_container_child_set">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="first_prop_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_title" symbol="gtk_file_chooser_button_get_title">
-                               <return-type type="gchar*"/>
+                       <method name="child_set_property" symbol="gtk_container_child_set_property">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
+                                       <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="get_width_chars" symbol="gtk_file_chooser_button_get_width_chars">
-                               <return-type type="gint"/>
+                       <method name="child_set_valist" symbol="gtk_container_child_set_valist">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
+                                       <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>
-                       <constructor name="new" symbol="gtk_file_chooser_button_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="child_type" symbol="gtk_container_child_type">
+                               <return-type type="GType"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="action" type="GtkFileChooserAction"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_backend" symbol="gtk_file_chooser_button_new_with_backend">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="class_find_child_property" symbol="gtk_container_class_find_child_property">
+                               <return-type type="GParamSpec*"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="action" type="GtkFileChooserAction"/>
-                                       <parameter name="backend" type="gchar*"/>
+                                       <parameter name="cclass" type="GObjectClass*"/>
+                                       <parameter name="property_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="class_install_child_property" symbol="gtk_container_class_install_child_property">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkWidget*"/>
+                                       <parameter name="cclass" type="GtkContainerClass*"/>
+                                       <parameter name="property_id" type="guint"/>
+                                       <parameter name="pspec" type="GParamSpec*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_focus_on_click" symbol="gtk_file_chooser_button_set_focus_on_click">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="class_list_child_properties" symbol="gtk_container_class_list_child_properties">
+                               <return-type type="GParamSpec**"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
-                                       <parameter name="focus_on_click" type="gboolean"/>
+                                       <parameter name="cclass" type="GObjectClass*"/>
+                                       <parameter name="n_properties" type="guint*"/>
                                </parameters>
                        </method>
-                       <method name="set_title" symbol="gtk_file_chooser_button_set_title">
+                       <method name="forall" symbol="gtk_container_forall">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="callback" type="GtkCallback"/>
+                                       <parameter name="callback_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="set_width_chars" symbol="gtk_file_chooser_button_set_width_chars">
+                       <method name="foreach" symbol="gtk_container_foreach">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkFileChooserButton*"/>
-                                       <parameter name="n_chars" type="gint"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="callback" type="GtkCallback"/>
+                                       <parameter name="callback_data" type="gpointer"/>
                                </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">
-                               <return-type type="void"/>
+                       <method name="get_border_width" symbol="gtk_container_get_border_width">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="fc" type="GtkFileChooserButton*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </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="get_children" symbol="gtk_container_get_children">
+                               <return-type type="GList*"/>
                                <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="container" type="GtkContainer*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_backend" symbol="gtk_file_chooser_dialog_new_with_backend">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="get_focus_chain" symbol="gtk_container_get_focus_chain">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="parent" type="GtkWindow*"/>
-                                       <parameter name="action" type="GtkFileChooserAction"/>
-                                       <parameter name="backend" type="gchar*"/>
-                                       <parameter name="first_button_text" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="focusable_widgets" type="GList**"/>
+                               </parameters>
+                       </method>
+                       <method name="get_focus_hadjustment" symbol="gtk_container_get_focus_hadjustment">
+                               <return-type type="GtkAdjustment*"/>
+                               <parameters>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </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="GtkFileChooser"/>
-                               <interface name="GtkFileChooserEmbed"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_file_chooser_widget_new">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="get_focus_vadjustment" symbol="gtk_container_get_focus_vadjustment">
+                               <return-type type="GtkAdjustment*"/>
                                <parameters>
-                                       <parameter name="action" type="GtkFileChooserAction"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_backend" symbol="gtk_file_chooser_widget_new_with_backend">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="get_resize_mode" symbol="gtk_container_get_resize_mode">
+                               <return-type type="GtkResizeMode"/>
                                <parameters>
-                                       <parameter name="action" type="GtkFileChooserAction"/>
-                                       <parameter name="backend" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
-                       </constructor>
-               </object>
-               <object name="GtkFileFilter" parent="GtkObject" type-name="GtkFileFilter" get-type="gtk_file_filter_get_type">
-                       <method name="add_custom" symbol="gtk_file_filter_add_custom">
+                       </method>
+                       <method name="propagate_expose" symbol="gtk_container_propagate_expose">
                                <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="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="event" type="GdkEventExpose*"/>
                                </parameters>
                        </method>
-                       <method name="add_mime_type" symbol="gtk_file_filter_add_mime_type">
+                       <method name="remove" symbol="gtk_container_remove">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
-                                       <parameter name="mime_type" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="add_pattern" symbol="gtk_file_filter_add_pattern">
+                       <method name="resize_children" symbol="gtk_container_resize_children">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
-                                       <parameter name="pattern" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </method>
-                       <method name="add_pixbuf_formats" symbol="gtk_file_filter_add_pixbuf_formats">
+                       <method name="set_border_width" symbol="gtk_container_set_border_width">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="border_width" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="filter" symbol="gtk_file_filter_filter">
-                               <return-type type="gboolean"/>
+                       <method name="set_focus_chain" symbol="gtk_container_set_focus_chain">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
-                                       <parameter name="filter_info" type="GtkFileFilterInfo*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="focusable_widgets" type="GList*"/>
                                </parameters>
                        </method>
-                       <method name="get_name" symbol="gtk_file_filter_get_name">
-                               <return-type type="gchar*"/>
+                       <method name="set_focus_child" symbol="gtk_container_set_focus_child">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_needed" symbol="gtk_file_filter_get_needed">
-                               <return-type type="GtkFileFilterFlags"/>
+                       <method name="set_focus_hadjustment" symbol="gtk_container_set_focus_hadjustment">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </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_focus_vadjustment" symbol="gtk_container_set_focus_vadjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filter" type="GtkFileFilter*"/>
-                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-               </object>
-               <object name="GtkFileSelection" parent="GtkDialog" type-name="GtkFileSelection" get-type="gtk_file_selection_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="complete" symbol="gtk_file_selection_complete">
+                       <method name="set_reallocate_redraws" symbol="gtk_container_set_reallocate_redraws">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filesel" type="GtkFileSelection*"/>
-                                       <parameter name="pattern" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="needs_redraws" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_filename" symbol="gtk_file_selection_get_filename">
-                               <return-type type="gchar*"/>
+                       <method name="set_resize_mode" symbol="gtk_container_set_resize_mode">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filesel" type="GtkFileSelection*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="resize_mode" type="GtkResizeMode"/>
                                </parameters>
                        </method>
-                       <method name="get_select_multiple" symbol="gtk_file_selection_get_select_multiple">
-                               <return-type type="gboolean"/>
+                       <method name="unset_focus_chain" symbol="gtk_container_unset_focus_chain">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filesel" type="GtkFileSelection*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
                        </method>
-                       <method name="get_selections" symbol="gtk_file_selection_get_selections">
-                               <return-type type="gchar**"/>
+                       <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="filesel" type="GtkFileSelection*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
-                       </method>
-                       <method name="hide_fileop_buttons" symbol="gtk_file_selection_hide_fileop_buttons">
+                       </signal>
+                       <signal name="check-resize" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filesel" type="GtkFileSelection*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_file_selection_new">
-                               <return-type type="GtkWidget*"/>
+                       </signal>
+                       <signal name="remove" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_filename" symbol="gtk_file_selection_set_filename">
+                       </signal>
+                       <signal name="set-focus-child" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filesel" type="GtkFileSelection*"/>
-                                       <parameter name="filename" type="gchar*"/>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
-                       </method>
-                       <method name="set_select_multiple" symbol="gtk_file_selection_set_select_multiple">
+                       </signal>
+                       <vfunc name="child_type">
+                               <return-type type="GType"/>
+                               <parameters>
+                                       <parameter name="container" type="GtkContainer*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="composite_name">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="container" type="GtkContainer*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="forall">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filesel" type="GtkFileSelection*"/>
-                                       <parameter name="select_multiple" type="gboolean"/>
+                                       <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="show_fileop_buttons" symbol="gtk_file_selection_show_fileop_buttons">
+                       </vfunc>
+                       <vfunc name="get_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*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="set_child_property">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="filesel" type="GtkFileSelection*"/>
+                                       <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>
-                       <property name="filename" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="select-multiple" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-fileops" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <field name="dir_list" type="GtkWidget*"/>
-                       <field name="file_list" type="GtkWidget*"/>
-                       <field name="selection_entry" type="GtkWidget*"/>
-                       <field name="selection_text" type="GtkWidget*"/>
-                       <field name="main_vbox" type="GtkWidget*"/>
-                       <field name="ok_button" type="GtkWidget*"/>
-                       <field name="cancel_button" type="GtkWidget*"/>
-                       <field name="help_button" type="GtkWidget*"/>
-                       <field name="history_pulldown" type="GtkWidget*"/>
-                       <field name="history_menu" type="GtkWidget*"/>
-                       <field name="history_list" type="GList*"/>
-                       <field name="fileop_dialog" type="GtkWidget*"/>
-                       <field name="fileop_entry" type="GtkWidget*"/>
-                       <field name="fileop_file" type="gchar*"/>
-                       <field name="cmpl_state" type="gpointer"/>
-                       <field name="fileop_c_dir" type="GtkWidget*"/>
-                       <field name="fileop_del_file" type="GtkWidget*"/>
-                       <field name="fileop_ren_file" type="GtkWidget*"/>
-                       <field name="button_area" type="GtkWidget*"/>
-                       <field name="action_area" type="GtkWidget*"/>
-                       <field name="selected_names" type="GPtrArray*"/>
-                       <field name="last_selected" type="gchar*"/>
+                       </vfunc>
+                       <field name="focus_child" type="GtkWidget*"/>
+                       <field name="border_width" type="guint"/>
+                       <field name="need_resize" type="guint"/>
+                       <field name="resize_mode" type="guint"/>
+                       <field name="reallocate_redraws" type="guint"/>
+                       <field name="has_focus_chain" type="guint"/>
                </object>
-               <object name="GtkFixed" parent="GtkContainer" type-name="GtkFixed" get-type="gtk_fixed_get_type">
+               <object name="GtkCurve" parent="GtkDrawingArea" type-name="GtkCurve" get-type="gtk_curve_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
                        </implements>
-                       <method name="get_has_window" symbol="gtk_fixed_get_has_window">
-                               <return-type type="gboolean"/>
+                       <method name="get_vector" symbol="gtk_curve_get_vector">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="fixed" type="GtkFixed*"/>
+                                       <parameter name="curve" type="GtkCurve*"/>
+                                       <parameter name="veclen" type="int"/>
+                                       <parameter name="vector" type="gfloat[]"/>
                                </parameters>
                        </method>
-                       <method name="move" symbol="gtk_fixed_move">
+                       <constructor name="new" symbol="gtk_curve_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="reset" symbol="gtk_curve_reset">
                                <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="curve" type="GtkCurve*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_fixed_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="put" symbol="gtk_fixed_put">
+                       <method name="set_curve_type" symbol="gtk_curve_set_curve_type">
                                <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="curve" type="GtkCurve*"/>
+                                       <parameter name="type" type="GtkCurveType"/>
                                </parameters>
                        </method>
-                       <method name="set_has_window" symbol="gtk_fixed_set_has_window">
+                       <method name="set_gamma" symbol="gtk_curve_set_gamma">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="fixed" type="GtkFixed*"/>
-                                       <parameter name="has_window" type="gboolean"/>
+                                       <parameter name="curve" type="GtkCurve*"/>
+                                       <parameter name="gamma_" type="gfloat"/>
                                </parameters>
                        </method>
-                       <field name="children" type="GList*"/>
+                       <method name="set_range" symbol="gtk_curve_set_range">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="curve" type="GtkCurve*"/>
+                                       <parameter name="min_x" type="gfloat"/>
+                                       <parameter name="max_x" type="gfloat"/>
+                                       <parameter name="min_y" type="gfloat"/>
+                                       <parameter name="max_y" type="gfloat"/>
+                               </parameters>
+                       </method>
+                       <method name="set_vector" symbol="gtk_curve_set_vector">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="curve" type="GtkCurve*"/>
+                                       <parameter name="veclen" type="int"/>
+                                       <parameter name="vector" type="gfloat[]"/>
+                               </parameters>
+                       </method>
+                       <property name="curve-type" type="GtkCurveType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="max-x" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="max-y" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="min-x" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="min-y" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="curve-type-changed" when="FIRST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="curve" type="GtkCurve*"/>
+                               </parameters>
+                       </signal>
+                       <field name="cursor_type" type="gint"/>
+                       <field name="min_x" type="gfloat"/>
+                       <field name="max_x" type="gfloat"/>
+                       <field name="min_y" type="gfloat"/>
+                       <field name="max_y" type="gfloat"/>
+                       <field name="pixmap" type="GdkPixmap*"/>
+                       <field name="curve_type" type="GtkCurveType"/>
+                       <field name="height" type="gint"/>
+                       <field name="grab_point" type="gint"/>
+                       <field name="last" type="gint"/>
+                       <field name="num_points" type="gint"/>
+                       <field name="point" type="GdkPoint*"/>
+                       <field name="num_ctlpoints" type="gint"/>
+                       <field name="ctlpoint" type="gfloat[]*"/>
                </object>
-               <object name="GtkFontButton" parent="GtkButton" type-name="GtkFontButton" get-type="gtk_font_button_get_type">
+               <object name="GtkDialog" parent="GtkWindow" type-name="GtkDialog" get-type="gtk_dialog_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
                        </implements>
-                       <method name="get_font_name" symbol="gtk_font_button_get_font_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_show_size" symbol="gtk_font_button_get_show_size">
-                               <return-type type="gboolean"/>
+                       <method name="add_action_widget" symbol="gtk_dialog_add_action_widget">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_show_style" symbol="gtk_font_button_get_show_style">
-                               <return-type type="gboolean"/>
+                       <method name="add_button" symbol="gtk_dialog_add_button">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="button_text" type="gchar*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_title" symbol="gtk_font_button_get_title">
-                               <return-type type="gchar*"/>
+                       <method name="add_buttons" symbol="gtk_dialog_add_buttons">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="first_button_text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_use_font" symbol="gtk_font_button_get_use_font">
+                       <method name="get_has_separator" symbol="gtk_dialog_get_has_separator">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
                                </parameters>
                        </method>
-                       <method name="get_use_size" symbol="gtk_font_button_get_use_size">
-                               <return-type type="gboolean"/>
+                       <method name="get_response_for_widget" symbol="gtk_dialog_get_response_for_widget">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_font_button_new">
+                       <constructor name="new" symbol="gtk_dialog_new">
                                <return-type type="GtkWidget*"/>
                        </constructor>
-                       <constructor name="new_with_font" symbol="gtk_font_button_new_with_font">
+                       <constructor name="new_with_buttons" symbol="gtk_dialog_new_with_buttons">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="fontname" type="gchar*"/>
+                                       <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="set_font_name" symbol="gtk_font_button_set_font_name">
-                               <return-type type="gboolean"/>
+                       <method name="response" symbol="gtk_dialog_response">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="fontname" type="gchar*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_show_size" symbol="gtk_font_button_set_show_size">
+                       <method name="run" symbol="gtk_dialog_run">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_alternative_button_order" symbol="gtk_dialog_set_alternative_button_order">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="show_size" type="gboolean"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="first_response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_show_style" symbol="gtk_font_button_set_show_style">
+                       <method name="set_alternative_button_order_from_array" symbol="gtk_dialog_set_alternative_button_order_from_array">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="show_style" type="gboolean"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="n_params" type="gint"/>
+                                       <parameter name="new_order" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_title" symbol="gtk_font_button_set_title">
+                       <method name="set_default_response" symbol="gtk_dialog_set_default_response">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_use_font" symbol="gtk_font_button_set_use_font">
+                       <method name="set_has_separator" symbol="gtk_dialog_set_has_separator">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="use_font" type="gboolean"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_use_size" symbol="gtk_font_button_set_use_size">
+                       <method name="set_response_sensitive" symbol="gtk_dialog_set_response_sensitive">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="font_button" type="GtkFontButton*"/>
-                                       <parameter name="use_size" type="gboolean"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="response_id" type="gint"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </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">
+                       <property name="has-separator" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="close" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="gfp" type="GtkFontButton*"/>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="response" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="dialog" type="GtkDialog*"/>
+                                       <parameter name="response_id" type="gint"/>
                                </parameters>
                        </signal>
+                       <field name="vbox" type="GtkWidget*"/>
+                       <field name="action_area" type="GtkWidget*"/>
+                       <field name="separator" type="GtkWidget*"/>
                </object>
-               <object name="GtkFontSelection" parent="GtkVBox" type-name="GtkFontSelection" get-type="gtk_font_selection_get_type">
+               <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="draw_data" 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="GtkCellEditable"/>
+                               <interface name="GtkEditable"/>
                        </implements>
-                       <method name="get_font" symbol="gtk_font_selection_get_font">
-                               <return-type type="GdkFont*"/>
+                       <method name="get_activates_default" symbol="gtk_entry_get_activates_default">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_font_name" symbol="gtk_font_selection_get_font_name">
-                               <return-type type="gchar*"/>
+                       <method name="get_alignment" symbol="gtk_entry_get_alignment">
+                               <return-type type="gfloat"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_preview_text" symbol="gtk_font_selection_get_preview_text">
-                               <return-type type="gchar*"/>
+                       <method name="get_completion" symbol="gtk_entry_get_completion">
+                               <return-type type="GtkEntryCompletion*"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </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="get_cursor_hadjustment" symbol="gtk_entry_get_cursor_hadjustment">
+                               <return-type type="GtkAdjustment*"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
-                                       <parameter name="fontname" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="set_preview_text" symbol="gtk_font_selection_set_preview_text">
-                               <return-type type="void"/>
+                       <method name="get_has_frame" symbol="gtk_entry_get_has_frame">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="fontsel" type="GtkFontSelection*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <property name="font" type="GdkFont*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <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"/>
-                       <field name="font_entry" type="GtkWidget*"/>
-                       <field name="family_list" type="GtkWidget*"/>
-                       <field name="font_style_entry" type="GtkWidget*"/>
-                       <field name="face_list" type="GtkWidget*"/>
-                       <field name="size_entry" type="GtkWidget*"/>
-                       <field name="size_list" type="GtkWidget*"/>
-                       <field name="pixels_button" type="GtkWidget*"/>
-                       <field name="points_button" type="GtkWidget*"/>
-                       <field name="filter_button" type="GtkWidget*"/>
-                       <field name="preview_entry" type="GtkWidget*"/>
-                       <field name="family" type="PangoFontFamily*"/>
-                       <field name="face" type="PangoFontFace*"/>
-                       <field name="size" type="gint"/>
-                       <field name="font" type="GdkFont*"/>
-               </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_font" symbol="gtk_font_selection_dialog_get_font">
-                               <return-type type="GdkFont*"/>
+                       <method name="get_inner_border" symbol="gtk_entry_get_inner_border">
+                               <return-type type="GtkBorder*"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_font_name" symbol="gtk_font_selection_dialog_get_font_name">
-                               <return-type type="gchar*"/>
+                       <method name="get_invisible_char" symbol="gtk_entry_get_invisible_char">
+                               <return-type type="gunichar"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_preview_text" symbol="gtk_font_selection_dialog_get_preview_text">
-                               <return-type type="gchar*"/>
+                       <method name="get_layout" symbol="gtk_entry_get_layout">
+                               <return-type type="PangoLayout*"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_font_selection_dialog_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_layout_offsets" symbol="gtk_entry_get_layout_offsets">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="x" type="gint*"/>
+                                       <parameter name="y" type="gint*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_font_name" symbol="gtk_font_selection_dialog_set_font_name">
-                               <return-type type="gboolean"/>
+                       </method>
+                       <method name="get_max_length" symbol="gtk_entry_get_max_length">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
-                                       <parameter name="fontname" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="set_preview_text" symbol="gtk_font_selection_dialog_set_preview_text">
-                               <return-type type="void"/>
+                       <method name="get_text" symbol="gtk_entry_get_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <field name="fontsel" type="GtkWidget*"/>
-                       <field name="main_vbox" type="GtkWidget*"/>
-                       <field name="action_area" type="GtkWidget*"/>
-                       <field name="ok_button" type="GtkWidget*"/>
-                       <field name="apply_button" type="GtkWidget*"/>
-                       <field name="cancel_button" type="GtkWidget*"/>
-                       <field name="dialog_width" type="gint"/>
-                       <field name="auto_resize" type="gboolean"/>
-               </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_visibility" symbol="gtk_entry_get_visibility">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_label_align" symbol="gtk_frame_get_label_align">
-                               <return-type type="void"/>
+                       <method name="get_width_chars" symbol="gtk_entry_get_width_chars">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="xalign" type="gfloat*"/>
-                                       <parameter name="yalign" type="gfloat*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </method>
-                       <method name="get_label_widget" symbol="gtk_frame_get_label_widget">
-                               <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="frame" type="GtkFrame*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="layout_index" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_shadow_type" symbol="gtk_frame_get_shadow_type">
-                               <return-type type="GtkShadowType"/>
+                       <constructor name="new" symbol="gtk_entry_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="set_activates_default" symbol="gtk_entry_set_activates_default">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_frame_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="set_alignment" symbol="gtk_entry_set_alignment">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="xalign" type="gfloat"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_label" symbol="gtk_frame_set_label">
+                       </method>
+                       <method name="set_completion" symbol="gtk_entry_set_completion">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="set_label_align" symbol="gtk_frame_set_label_align">
+                       <method name="set_cursor_hadjustment" symbol="gtk_entry_set_cursor_hadjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="xalign" type="gfloat"/>
-                                       <parameter name="yalign" type="gfloat"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <method name="set_label_widget" symbol="gtk_frame_set_label_widget">
+                       <method name="set_has_frame" symbol="gtk_entry_set_has_frame">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="label_widget" type="GtkWidget*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_shadow_type" symbol="gtk_frame_set_shadow_type">
+                       <method name="set_inner_border" symbol="gtk_entry_set_inner_border">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="type" type="GtkShadowType"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="border" type="GtkBorder*"/>
                                </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="GtkShadowType" 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_invisible_char" symbol="gtk_entry_set_invisible_char">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="frame" type="GtkFrame*"/>
-                                       <parameter name="allocation" type="GtkAllocation*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="ch" type="gunichar"/>
                                </parameters>
-                       </vfunc>
-                       <field name="label_widget" type="GtkWidget*"/>
-                       <field name="shadow_type" type="gint16"/>
-                       <field name="label_xalign" type="gfloat"/>
-                       <field name="label_yalign" type="gfloat"/>
-                       <field name="child_allocation" type="GtkAllocation"/>
-               </object>
-               <object name="GtkGammaCurve" parent="GtkVBox" type-name="GtkGammaCurve" get-type="gtk_gamma_curve_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_gamma_curve_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <field name="table" type="GtkWidget*"/>
-                       <field name="curve" type="GtkWidget*"/>
-                       <field name="button" type="GtkWidget*[]"/>
-                       <field name="gamma" type="gfloat"/>
-                       <field name="gamma_dialog" type="GtkWidget*"/>
-                       <field name="gamma_text" type="GtkWidget*"/>
-               </object>
-               <object name="GtkHBox" parent="GtkBox" type-name="GtkHBox" get-type="gtk_hbox_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_hbox_new">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <method name="set_max_length" symbol="gtk_entry_set_max_length">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="homogeneous" type="gboolean"/>
-                                       <parameter name="spacing" type="gint"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="max" type="gint"/>
                                </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"/>
-                       </implements>
-                       <method name="get_layout_default" symbol="gtk_hbutton_box_get_layout_default">
-                               <return-type type="GtkButtonBoxStyle"/>
                        </method>
-                       <method name="get_spacing_default" symbol="gtk_hbutton_box_get_spacing_default">
-                               <return-type type="gint"/>
+                       <method name="set_text" symbol="gtk_entry_set_text">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="text" type="gchar*"/>
+                               </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_hbutton_box_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="set_layout_default" symbol="gtk_hbutton_box_set_layout_default">
+                       <method name="set_visibility" symbol="gtk_entry_set_visibility">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkButtonBoxStyle"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="visible" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_spacing_default" symbol="gtk_hbutton_box_set_spacing_default">
+                       <method name="set_width_chars" symbol="gtk_entry_set_width_chars">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="spacing" type="gint"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-               </object>
-               <object name="GtkHPaned" parent="GtkPaned" type-name="GtkHPaned" get-type="gtk_hpaned_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </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"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_hruler_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-               </object>
-               <object name="GtkHScale" parent="GtkScale" type-name="GtkHScale" get-type="gtk_hscale_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_hscale_new">
-                               <return-type type="GtkWidget*"/>
+                       <method name="text_index_to_layout_index" symbol="gtk_entry_text_index_to_layout_index">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="text_index" type="gint"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_with_range" symbol="gtk_hscale_new_with_range">
-                               <return-type type="GtkWidget*"/>
+                       </method>
+                       <property name="activates-default" 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="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="max-length" type="gint" 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="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="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="min" type="gdouble"/>
-                                       <parameter name="max" type="gdouble"/>
-                                       <parameter name="step" type="gdouble"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </constructor>
-               </object>
-               <object name="GtkHScrollbar" parent="GtkScrollbar" type-name="GtkHScrollbar" get-type="gtk_hscrollbar_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_hscrollbar_new">
-                               <return-type type="GtkWidget*"/>
+                       </signal>
+                       <signal name="backspace" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </constructor>
-               </object>
-               <object name="GtkHSeparator" parent="GtkSeparator" type-name="GtkHSeparator" get-type="gtk_hseparator_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </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_handle_position" symbol="gtk_handle_box_get_handle_position">
-                               <return-type type="GtkPositionType"/>
+                       </signal>
+                       <signal name="copy-clipboard" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </method>
-                       <method name="get_shadow_type" symbol="gtk_handle_box_get_shadow_type">
-                               <return-type type="GtkShadowType"/>
+                       </signal>
+                       <signal name="cut-clipboard" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </method>
-                       <method name="get_snap_edge" symbol="gtk_handle_box_get_snap_edge">
-                               <return-type type="GtkPositionType"/>
+                       </signal>
+                       <signal name="delete-from-cursor" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="type" type="GtkDeleteType"/>
+                                       <parameter name="count" type="gint"/>
                                </parameters>
-                       </method>
-                       <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">
+                       </signal>
+                       <signal name="insert-at-cursor" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
-                                       <parameter name="position" type="GtkPositionType"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="str" type="char*"/>
                                </parameters>
-                       </method>
-                       <method name="set_shadow_type" symbol="gtk_handle_box_set_shadow_type">
+                       </signal>
+                       <signal name="move-cursor" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
-                                       <parameter name="type" type="GtkShadowType"/>
+                                       <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_snap_edge" symbol="gtk_handle_box_set_snap_edge">
+                       </signal>
+                       <signal name="paste-clipboard" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
-                                       <parameter name="edge" type="GtkPositionType"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
-                       </method>
-                       <property name="handle-position" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="shadow" type="GtkShadowType" 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">
+                       </signal>
+                       <signal name="populate-popup" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
                        </signal>
-                       <signal name="child-detached" when="FIRST">
+                       <signal name="toggle-overwrite" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="handle_box" type="GtkHandleBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="entry" type="GtkEntry*"/>
                                </parameters>
                        </signal>
-                       <field name="bin_window" type="GdkWindow*"/>
-                       <field name="float_window" type="GdkWindow*"/>
-                       <field name="shadow_type" type="GtkShadowType"/>
-                       <field name="handle_position" type="guint"/>
-                       <field name="float_window_mapped" type="guint"/>
-                       <field name="child_detached" type="guint"/>
+                       <field name="text" type="gchar*"/>
+                       <field name="editable" type="guint"/>
+                       <field name="visible" type="guint"/>
+                       <field name="overwrite_mode" type="guint"/>
                        <field name="in_drag" type="guint"/>
-                       <field name="shrink_on_detach" type="guint"/>
-                       <field name="snap_edge" type="signed"/>
-                       <field name="deskoff_x" type="gint"/>
-                       <field name="deskoff_y" type="gint"/>
-                       <field name="attach_allocation" type="GtkAllocation"/>
-                       <field name="float_allocation" type="GtkAllocation"/>
+                       <field name="text_length" type="guint16"/>
+                       <field name="text_max_length" type="guint16"/>
+                       <field name="text_area" type="GdkWindow*"/>
+                       <field name="im_context" type="GtkIMContext*"/>
+                       <field name="popup_menu" type="GtkWidget*"/>
+                       <field name="current_pos" type="gint"/>
+                       <field name="selection_bound" type="gint"/>
+                       <field name="cached_layout" type="PangoLayout*"/>
+                       <field name="cache_includes_preedit" type="guint"/>
+                       <field name="need_im_reset" type="guint"/>
+                       <field name="has_frame" type="guint"/>
+                       <field name="activates_default" type="guint"/>
+                       <field name="cursor_visible" type="guint"/>
+                       <field name="in_click" type="guint"/>
+                       <field name="is_cell_renderer" type="guint"/>
+                       <field name="editing_canceled" type="guint"/>
+                       <field name="mouse_cursor_obscured" type="guint"/>
+                       <field name="select_words" type="guint"/>
+                       <field name="select_lines" type="guint"/>
+                       <field name="resolved_dir" type="guint"/>
+                       <field name="truncate_multiline" type="guint"/>
+                       <field name="button" type="guint"/>
+                       <field name="blink_timeout" type="guint"/>
+                       <field name="recompute_idle" type="guint"/>
+                       <field name="scroll_offset" type="gint"/>
+                       <field name="ascent" type="gint"/>
+                       <field name="descent" type="gint"/>
+                       <field name="text_size" type="guint16"/>
+                       <field name="n_bytes" type="guint16"/>
+                       <field name="preedit_length" type="guint16"/>
+                       <field name="preedit_cursor" type="guint16"/>
+                       <field name="dnd_position" type="gint"/>
+                       <field name="drag_start_x" type="gint"/>
+                       <field name="drag_start_y" type="gint"/>
+                       <field name="invisible_char" type="gunichar"/>
+                       <field name="width_chars" type="gint"/>
                </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="context" type="GtkIMContext*"/>
-                                       <parameter name="offset" type="gint"/>
-                                       <parameter name="n_chars" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="filter_keypress" symbol="gtk_im_context_filter_keypress">
-                               <return-type type="gboolean"/>
+               <object name="GtkEntryCompletion" parent="GObject" type-name="GtkEntryCompletion" get-type="gtk_entry_completion_get_type">
+                       <implements>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkCellLayout"/>
+                       </implements>
+                       <method name="complete" symbol="gtk_entry_completion_complete">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="event" type="GdkEventKey*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="focus_in" symbol="gtk_im_context_focus_in">
+                       <method name="delete_action" symbol="gtk_entry_completion_delete_action">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="index_" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="focus_out" symbol="gtk_im_context_focus_out">
-                               <return-type type="void"/>
+                       <method name="get_completion_prefix" symbol="gtk_entry_completion_get_completion_prefix">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="get_preedit_string" symbol="gtk_im_context_get_preedit_string">
-                               <return-type type="void"/>
+                       <method name="get_entry" symbol="gtk_entry_completion_get_entry">
+                               <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="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="get_surrounding" symbol="gtk_im_context_get_surrounding">
+                       <method name="get_inline_completion" symbol="gtk_entry_completion_get_inline_completion">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="text" type="gchar**"/>
-                                       <parameter name="cursor_index" type="gint*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="reset" symbol="gtk_im_context_reset">
-                               <return-type type="void"/>
+                       <method name="get_inline_selection" symbol="gtk_entry_completion_get_inline_selection">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="set_client_window" symbol="gtk_im_context_set_client_window">
-                               <return-type type="void"/>
+                       <method name="get_minimum_key_length" symbol="gtk_entry_completion_get_minimum_key_length">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="set_cursor_location" symbol="gtk_im_context_set_cursor_location">
-                               <return-type type="void"/>
+                       <method name="get_model" symbol="gtk_entry_completion_get_model">
+                               <return-type type="GtkTreeModel*"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="area" type="GdkRectangle*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="set_surrounding" symbol="gtk_im_context_set_surrounding">
-                               <return-type type="void"/>
+                       <method name="get_popup_completion" symbol="gtk_entry_completion_get_popup_completion">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="text" type="gchar*"/>
-                                       <parameter name="len" type="gint"/>
-                                       <parameter name="cursor_index" type="gint"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <method name="set_use_preedit" symbol="gtk_im_context_set_use_preedit">
-                               <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="context" type="GtkIMContext*"/>
-                                       <parameter name="use_preedit" type="gboolean"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
                        </method>
-                       <signal name="commit" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="str" type="char*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="delete-surrounding" when="LAST">
+                       <method name="get_popup_single_match" symbol="gtk_entry_completion_get_popup_single_match">
                                <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="completion" type="GtkEntryCompletion*"/>
                                </parameters>
-                       </signal>
-                       <signal name="preedit-end" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_text_column" symbol="gtk_entry_completion_get_text_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
-                       </signal>
-                       <signal name="preedit-start" when="LAST">
+                       </method>
+                       <method name="insert_action_markup" symbol="gtk_entry_completion_insert_action_markup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                               </parameters>
-                       </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*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="index_" type="gint"/>
+                                       <parameter name="markup" type="gchar*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="focus_in">
+                       </method>
+                       <method name="insert_action_text" symbol="gtk_entry_completion_insert_action_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="index_" type="gint"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="focus_out">
+                       </method>
+                       <method name="insert_prefix" symbol="gtk_entry_completion_insert_prefix">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="get_preedit_string">
+                       </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"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="str" type="gchar**"/>
-                                       <parameter name="attrs" type="PangoAttrList**"/>
-                                       <parameter name="cursor_pos" type="gint*"/>
-                               </parameters>
-                       </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">
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="inline_completion" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_inline_selection" symbol="gtk_entry_completion_set_inline_selection">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="inline_selection" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_client_window">
+                       </method>
+                       <method name="set_match_func" symbol="gtk_entry_completion_set_match_func">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="window" type="GdkWindow*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="func" type="GtkEntryCompletionMatchFunc"/>
+                                       <parameter name="func_data" type="gpointer"/>
+                                       <parameter name="func_notify" type="GDestroyNotify"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_cursor_location">
+                       </method>
+                       <method name="set_minimum_key_length" symbol="gtk_entry_completion_set_minimum_key_length">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="area" type="GdkRectangle*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="length" type="gint"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_surrounding">
+                       </method>
+                       <method name="set_model" symbol="gtk_entry_completion_set_model">
                                <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="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_use_preedit">
+                       </method>
+                       <method name="set_popup_completion" symbol="gtk_entry_completion_set_popup_completion">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMContext*"/>
-                                       <parameter name="use_preedit" type="gboolean"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="popup_completion" 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>
+                       <method name="set_popup_set_width" symbol="gtk_entry_completion_set_popup_set_width">
                                <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="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="popup_set_width" type="gboolean"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_im_context_simple_new">
-                               <return-type type="GtkIMContext*"/>
-                       </constructor>
-                       <field name="tables" type="GSList*"/>
-                       <field name="compose_buffer" type="guint[]"/>
-                       <field name="tentative_match" type="gunichar"/>
-                       <field name="tentative_match_len" type="gint"/>
-                       <field name="in_hex_sequence" type="guint"/>
-                       <field name="modifiers_dropped" type="guint"/>
-               </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">
+                       <method name="set_popup_single_match" symbol="gtk_entry_completion_set_popup_single_match">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="context" type="GtkIMMulticontext*"/>
-                                       <parameter name="menushell" type="GtkMenuShell*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="popup_single_match" type="gboolean"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_im_multicontext_new">
-                               <return-type type="GtkIMContext*"/>
-                       </constructor>
-                       <field name="slave" type="GtkIMContext*"/>
-                       <field name="context_id" type="gchar*"/>
-               </object>
-               <object name="GtkIconFactory" parent="GObject" type-name="GtkIconFactory" get-type="gtk_icon_factory_get_type">
-                       <method name="add" symbol="gtk_icon_factory_add">
+                       <method name="set_text_column" symbol="gtk_entry_completion_set_text_column">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="factory" type="GtkIconFactory*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="add_default" symbol="gtk_icon_factory_add_default">
+                       <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="factory" type="GtkIconFactory*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="index_" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="lookup" symbol="gtk_icon_factory_lookup">
-                               <return-type type="GtkIconSet*"/>
+                       </signal>
+                       <signal name="cursor-on-match" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="factory" type="GtkIconFactory*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
-                       </method>
-                       <method name="lookup_default" symbol="gtk_icon_factory_lookup_default">
-                               <return-type type="GtkIconSet*"/>
+                       </signal>
+                       <signal name="insert-prefix" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="prefix" type="char*"/>
                                </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"/>
+                       </signal>
+                       <signal name="match-selected" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="factory" type="GtkIconFactory*"/>
+                                       <parameter name="completion" type="GtkEntryCompletion*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
-                       </method>
-                       <field name="icons" type="GHashTable*"/>
+                       </signal>
                </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"/>
+               <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="icon_name" type="gchar*"/>
-                                       <parameter name="size" type="gint"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="event_box" type="GtkEventBox*"/>
                                </parameters>
                        </method>
-                       <method name="append_search_path" symbol="gtk_icon_theme_append_search_path">
-                               <return-type type="void"/>
+                       <method name="get_visible_window" symbol="gtk_event_box_get_visible_window">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="event_box" type="GtkEventBox*"/>
                                </parameters>
                        </method>
-                       <method name="choose_icon" symbol="gtk_icon_theme_choose_icon">
-                               <return-type type="GtkIconInfo*"/>
+                       <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="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="icon_names" type="gchar*[]"/>
-                                       <parameter name="size" type="gint"/>
-                                       <parameter name="flags" type="GtkIconLookupFlags"/>
+                                       <parameter name="event_box" type="GtkEventBox*"/>
+                                       <parameter name="above_child" type="gboolean"/>
                                </parameters>
                        </method>
-                       <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 name="set_visible_window" symbol="gtk_event_box_set_visible_window">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="event_box" type="GtkEventBox*"/>
+                                       <parameter name="visible_window" type="gboolean"/>
+                               </parameters>
                        </method>
-                       <method name="get_example_icon_name" symbol="gtk_icon_theme_get_example_icon_name">
-                               <return-type type="char*"/>
+                       <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">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
                                </parameters>
                        </method>
-                       <method name="get_for_screen" symbol="gtk_icon_theme_get_for_screen">
-                               <return-type type="GtkIconTheme*"/>
+                       <method name="get_label" symbol="gtk_expander_get_label">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_sizes" symbol="gtk_icon_theme_get_icon_sizes">
-                               <return-type type="gint*"/>
+                       <method name="get_label_widget" symbol="gtk_expander_get_label_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
                                </parameters>
                        </method>
-                       <method name="get_search_path" symbol="gtk_icon_theme_get_search_path">
-                               <return-type type="void"/>
+                       <method name="get_spacing" symbol="gtk_expander_get_spacing">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="path" type="gchar**[]"/>
-                                       <parameter name="n_elements" type="gint*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
                                </parameters>
                        </method>
-                       <method name="has_icon" symbol="gtk_icon_theme_has_icon">
+                       <method name="get_use_markup" symbol="gtk_expander_get_use_markup">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
                                </parameters>
                        </method>
-                       <method name="list_contexts" symbol="gtk_icon_theme_list_contexts">
-                               <return-type type="GList*"/>
+                       <method name="get_use_underline" symbol="gtk_expander_get_use_underline">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
                                </parameters>
                        </method>
-                       <method name="list_icons" symbol="gtk_icon_theme_list_icons">
-                               <return-type type="GList*"/>
+                       <constructor name="new" symbol="gtk_expander_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="context" type="gchar*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="load_icon" symbol="gtk_icon_theme_load_icon">
-                               <return-type type="GdkPixbuf*"/>
+                       </constructor>
+                       <constructor name="new_with_mnemonic" symbol="gtk_expander_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
                                <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="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="lookup_icon" symbol="gtk_icon_theme_lookup_icon">
-                               <return-type type="GtkIconInfo*"/>
+                       </constructor>
+                       <method name="set_expanded" symbol="gtk_expander_set_expanded">
+                               <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="expander" type="GtkExpander*"/>
+                                       <parameter name="expanded" type="gboolean"/>
                                </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">
+                       <method name="set_label" symbol="gtk_expander_set_label">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="rescan_if_needed" symbol="gtk_icon_theme_rescan_if_needed">
-                               <return-type type="gboolean"/>
+                       <method name="set_label_widget" symbol="gtk_expander_set_label_widget">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="label_widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_custom_theme" symbol="gtk_icon_theme_set_custom_theme">
+                       <method name="set_spacing" symbol="gtk_expander_set_spacing">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="theme_name" type="gchar*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="spacing" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_screen" symbol="gtk_icon_theme_set_screen">
+                       <method name="set_use_markup" symbol="gtk_expander_set_use_markup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="use_markup" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_search_path" symbol="gtk_icon_theme_set_search_path">
+                       <method name="set_use_underline" symbol="gtk_expander_set_use_underline">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
-                                       <parameter name="path" type="gchar*[]"/>
-                                       <parameter name="n_elements" type="gint"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
+                                       <parameter name="use_underline" type="gboolean"/>
                                </parameters>
                        </method>
-                       <signal name="changed" when="LAST">
+                       <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-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="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="expander" type="GtkExpander*"/>
                                </parameters>
                        </signal>
                </object>
-               <object name="GtkIconView" parent="GtkContainer" type-name="GtkIconView" get-type="gtk_icon_view_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="GtkCellLayout"/>
+                               <interface name="GtkFileChooser"/>
                        </implements>
-                       <method name="convert_widget_to_bin_window_coords" symbol="gtk_icon_view_convert_widget_to_bin_window_coords">
-                               <return-type type="void"/>
+                       <method name="get_focus_on_click" symbol="gtk_file_chooser_button_get_focus_on_click">
+                               <return-type type="gboolean"/>
                                <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*"/>
+                                       <parameter name="button" type="GtkFileChooserButton*"/>
                                </parameters>
                        </method>
-                       <method name="create_drag_icon" symbol="gtk_icon_view_create_drag_icon">
-                               <return-type type="GdkPixmap*"/>
+                       <method name="get_title" symbol="gtk_file_chooser_button_get_title">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="button" type="GtkFileChooserButton*"/>
                                </parameters>
                        </method>
-                       <method name="enable_model_drag_dest" symbol="gtk_icon_view_enable_model_drag_dest">
-                               <return-type type="void"/>
+                       <method name="get_width_chars" symbol="gtk_file_chooser_button_get_width_chars">
+                               <return-type type="gint"/>
                                <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="button" type="GtkFileChooserButton*"/>
                                </parameters>
                        </method>
-                       <method name="enable_model_drag_source" symbol="gtk_icon_view_enable_model_drag_source">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_file_chooser_button_new">
+                               <return-type type="GtkWidget*"/>
                                <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="title" type="gchar*"/>
+                                       <parameter name="action" type="GtkFileChooserAction"/>
                                </parameters>
-                       </method>
-                       <method name="get_column_spacing" symbol="gtk_icon_view_get_column_spacing">
-                               <return-type type="gint"/>
+                       </constructor>
+                       <constructor name="new_with_backend" symbol="gtk_file_chooser_button_new_with_backend">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="action" type="GtkFileChooserAction"/>
+                                       <parameter name="backend" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="get_columns" symbol="gtk_icon_view_get_columns">
-                               <return-type type="gint"/>
+                       </constructor>
+                       <constructor name="new_with_dialog" symbol="gtk_file_chooser_button_new_with_dialog">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="dialog" type="GtkWidget*"/>
                                </parameters>
-                       </method>
-                       <method name="get_cursor" symbol="gtk_icon_view_get_cursor">
-                               <return-type type="gboolean"/>
+                       </constructor>
+                       <method name="set_focus_on_click" symbol="gtk_file_chooser_button_set_focus_on_click">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath**"/>
-                                       <parameter name="cell" type="GtkCellRenderer**"/>
+                                       <parameter name="button" type="GtkFileChooserButton*"/>
+                                       <parameter name="focus_on_click" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_dest_item_at_pos" symbol="gtk_icon_view_get_dest_item_at_pos">
-                               <return-type type="gboolean"/>
+                       <method name="set_title" symbol="gtk_file_chooser_button_set_title">
+                               <return-type type="void"/>
                                <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="button" type="GtkFileChooserButton*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_drag_dest_item" symbol="gtk_icon_view_get_drag_dest_item">
+                       <method name="set_width_chars" symbol="gtk_file_chooser_button_set_width_chars">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath**"/>
-                                       <parameter name="pos" type="GtkIconViewDropPosition*"/>
+                                       <parameter name="button" type="GtkFileChooserButton*"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_item_at_pos" symbol="gtk_icon_view_get_item_at_pos">
-                               <return-type type="gboolean"/>
+                       <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="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="fc" type="GtkFileChooserButton*"/>
+                               </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*"/>
+                               <parameters>
+                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="action" type="GtkFileChooserAction"/>
+                                       <parameter name="first_button_text" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_with_backend" symbol="gtk_file_chooser_dialog_new_with_backend">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="parent" type="GtkWindow*"/>
+                                       <parameter name="action" type="GtkFileChooserAction"/>
+                                       <parameter name="backend" type="gchar*"/>
+                                       <parameter name="first_button_text" type="gchar*"/>
+                               </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="GtkFileChooser"/>
+                               <interface name="GtkFileChooserEmbed"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_file_chooser_widget_new">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="action" type="GtkFileChooserAction"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_with_backend" symbol="gtk_file_chooser_widget_new_with_backend">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="action" type="GtkFileChooserAction"/>
+                                       <parameter name="backend" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+               </object>
+               <object name="GtkFileFilter" parent="GtkObject" 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="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="get_item_width" symbol="gtk_icon_view_get_item_width">
-                               <return-type type="gint"/>
+                       <method name="add_mime_type" symbol="gtk_file_filter_add_mime_type">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="mime_type" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_margin" symbol="gtk_icon_view_get_margin">
-                               <return-type type="gint"/>
+                       <method name="add_pattern" symbol="gtk_file_filter_add_pattern">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="pattern" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_markup_column" symbol="gtk_icon_view_get_markup_column">
-                               <return-type type="gint"/>
+                       <method name="add_pixbuf_formats" symbol="gtk_file_filter_add_pixbuf_formats">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
                                </parameters>
                        </method>
-                       <method name="get_model" symbol="gtk_icon_view_get_model">
-                               <return-type type="GtkTreeModel*"/>
+                       <method name="filter" symbol="gtk_file_filter_filter">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="filter_info" type="GtkFileFilterInfo*"/>
                                </parameters>
                        </method>
-                       <method name="get_orientation" symbol="gtk_icon_view_get_orientation">
-                               <return-type type="GtkOrientation"/>
+                       <method name="get_name" symbol="gtk_file_filter_get_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
                                </parameters>
                        </method>
-                       <method name="get_path_at_pos" symbol="gtk_icon_view_get_path_at_pos">
-                               <return-type type="GtkTreePath*"/>
+                       <method name="get_needed" symbol="gtk_file_filter_get_needed">
+                               <return-type type="GtkFileFilterFlags"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
                                </parameters>
                        </method>
-                       <method name="get_pixbuf_column" symbol="gtk_icon_view_get_pixbuf_column">
-                               <return-type type="gint"/>
+                       <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="icon_view" type="GtkIconView*"/>
+                                       <parameter name="filter" type="GtkFileFilter*"/>
+                                       <parameter name="name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_reorderable" symbol="gtk_icon_view_get_reorderable">
+               </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="get_has_window" symbol="gtk_fixed_get_has_window">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="fixed" type="GtkFixed*"/>
                                </parameters>
                        </method>
-                       <method name="get_row_spacing" symbol="gtk_icon_view_get_row_spacing">
-                               <return-type type="gint"/>
+                       <method name="move" symbol="gtk_fixed_move">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="fixed" type="GtkFixed*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_selected_items" symbol="gtk_icon_view_get_selected_items">
-                               <return-type type="GList*"/>
+                       <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="icon_view" type="GtkIconView*"/>
+                                       <parameter name="fixed" type="GtkFixed*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_selection_mode" symbol="gtk_icon_view_get_selection_mode">
-                               <return-type type="GtkSelectionMode"/>
+                       <method name="set_has_window" symbol="gtk_fixed_set_has_window">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="fixed" type="GtkFixed*"/>
+                                       <parameter name="has_window" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_spacing" symbol="gtk_icon_view_get_spacing">
-                               <return-type type="gint"/>
+                       <field name="children" type="GList*"/>
+               </object>
+               <object name="GtkFontButton" parent="GtkButton" type-name="GtkFontButton" get-type="gtk_font_button_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_font_name" symbol="gtk_font_button_get_font_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_text_column" symbol="gtk_icon_view_get_text_column">
-                               <return-type type="gint"/>
+                       <method name="get_show_size" symbol="gtk_font_button_get_show_size">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_tooltip_column" symbol="gtk_icon_view_get_tooltip_column">
-                               <return-type type="gint"/>
+                       <method name="get_show_style" symbol="gtk_font_button_get_show_style">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_tooltip_context" symbol="gtk_icon_view_get_tooltip_context">
-                               <return-type type="gboolean"/>
+                       <method name="get_title" symbol="gtk_font_button_get_title">
+                               <return-type type="gchar*"/>
                                <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="font_button" type="GtkFontButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_visible_range" symbol="gtk_icon_view_get_visible_range">
+                       <method name="get_use_font" symbol="gtk_font_button_get_use_font">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="start_path" type="GtkTreePath**"/>
-                                       <parameter name="end_path" type="GtkTreePath**"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
                                </parameters>
                        </method>
-                       <method name="item_activated" symbol="gtk_icon_view_item_activated">
-                               <return-type type="void"/>
+                       <method name="get_use_size" symbol="gtk_font_button_get_use_size">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_icon_view_new">
+                       <constructor name="new" symbol="gtk_font_button_new">
                                <return-type type="GtkWidget*"/>
                        </constructor>
-                       <constructor name="new_with_model" symbol="gtk_icon_view_new_with_model">
+                       <constructor name="new_with_font" symbol="gtk_font_button_new_with_font">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="fontname" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <method name="path_is_selected" symbol="gtk_icon_view_path_is_selected">
+                       <method name="set_font_name" symbol="gtk_font_button_set_font_name">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="fontname" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="scroll_to_path" symbol="gtk_icon_view_scroll_to_path">
+                       <method name="set_show_size" symbol="gtk_font_button_set_show_size">
                                <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="font_button" type="GtkFontButton*"/>
+                                       <parameter name="show_size" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="select_all" symbol="gtk_icon_view_select_all">
+                       <method name="set_show_style" symbol="gtk_font_button_set_show_style">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="show_style" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="select_path" symbol="gtk_icon_view_select_path">
+                       <method name="set_title" symbol="gtk_font_button_set_title">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="title" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="selected_foreach" symbol="gtk_icon_view_selected_foreach">
+                       <method name="set_use_font" symbol="gtk_font_button_set_use_font">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="func" type="GtkIconViewForeachFunc"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="use_font" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_column_spacing" symbol="gtk_icon_view_set_column_spacing">
+                       <method name="set_use_size" symbol="gtk_font_button_set_use_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="column_spacing" type="gint"/>
+                                       <parameter name="font_button" type="GtkFontButton*"/>
+                                       <parameter name="use_size" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_columns" symbol="gtk_icon_view_set_columns">
+                       <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="icon_view" type="GtkIconView*"/>
-                                       <parameter name="columns" type="gint"/>
+                                       <parameter name="gfp" type="GtkFontButton*"/>
+                               </parameters>
+                       </signal>
+               </object>
+               <object name="GtkFontSelection" parent="GtkVBox" type-name="GtkFontSelection" get-type="gtk_font_selection_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_font_name" symbol="gtk_font_selection_get_font_name">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-                       <method name="set_cursor" symbol="gtk_icon_view_set_cursor">
-                               <return-type type="void"/>
+                       <method name="get_preview_text" symbol="gtk_font_selection_get_preview_text">
+                               <return-type type="gchar*"/>
                                <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="fontsel" type="GtkFontSelection*"/>
                                </parameters>
                        </method>
-                       <method name="set_drag_dest_item" symbol="gtk_icon_view_set_drag_dest_item">
-                               <return-type type="void"/>
+                       <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_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="pos" type="GtkIconViewDropPosition"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="fontname" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_item_width" symbol="gtk_icon_view_set_item_width">
+                       <method name="set_preview_text" symbol="gtk_font_selection_set_preview_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="item_width" type="gint"/>
+                                       <parameter name="fontsel" type="GtkFontSelection*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_margin" symbol="gtk_icon_view_set_margin">
-                               <return-type type="void"/>
+                       <property name="font" type="GdkFont*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <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"/>
+                       <field name="font_entry" type="GtkWidget*"/>
+                       <field name="family_list" type="GtkWidget*"/>
+                       <field name="font_style_entry" type="GtkWidget*"/>
+                       <field name="face_list" type="GtkWidget*"/>
+                       <field name="size_entry" type="GtkWidget*"/>
+                       <field name="size_list" type="GtkWidget*"/>
+                       <field name="pixels_button" type="GtkWidget*"/>
+                       <field name="points_button" type="GtkWidget*"/>
+                       <field name="filter_button" type="GtkWidget*"/>
+                       <field name="preview_entry" type="GtkWidget*"/>
+                       <field name="family" type="PangoFontFamily*"/>
+                       <field name="face" type="PangoFontFace*"/>
+                       <field name="size" type="gint"/>
+                       <field name="font" type="GdkFont*"/>
+               </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_font_name" symbol="gtk_font_selection_dialog_get_font_name">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="margin" type="gint"/>
+                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
                                </parameters>
                        </method>
-                       <method name="set_markup_column" symbol="gtk_icon_view_set_markup_column">
+                       <method name="get_preview_text" symbol="gtk_font_selection_dialog_get_preview_text">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                               </parameters>
+                       </method>
+                       <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="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="fontname" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_preview_text" symbol="gtk_font_selection_dialog_set_preview_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="fsd" type="GtkFontSelectionDialog*"/>
+                                       <parameter name="text" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <field name="fontsel" type="GtkWidget*"/>
+                       <field name="main_vbox" type="GtkWidget*"/>
+                       <field name="action_area" type="GtkWidget*"/>
+                       <field name="ok_button" type="GtkWidget*"/>
+                       <field name="apply_button" type="GtkWidget*"/>
+                       <field name="cancel_button" type="GtkWidget*"/>
+                       <field name="dialog_width" type="gint"/>
+                       <field name="auto_resize" type="gboolean"/>
+               </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="frame" type="GtkFrame*"/>
                                </parameters>
                        </method>
-                       <method name="set_model" symbol="gtk_icon_view_set_model">
+                       <method name="get_label_align" symbol="gtk_frame_get_label_align">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="model" type="GtkTreeModel*"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="xalign" type="gfloat*"/>
+                                       <parameter name="yalign" type="gfloat*"/>
                                </parameters>
                        </method>
-                       <method name="set_orientation" symbol="gtk_icon_view_set_orientation">
-                               <return-type type="void"/>
+                       <method name="get_label_widget" symbol="gtk_frame_get_label_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="orientation" type="GtkOrientation"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
                                </parameters>
                        </method>
-                       <method name="set_pixbuf_column" symbol="gtk_icon_view_set_pixbuf_column">
-                               <return-type type="void"/>
+                       <method name="get_shadow_type" symbol="gtk_frame_get_shadow_type">
+                               <return-type type="GtkShadowType"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
                                </parameters>
                        </method>
-                       <method name="set_reorderable" symbol="gtk_icon_view_set_reorderable">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_frame_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="reorderable" type="gboolean"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_row_spacing" symbol="gtk_icon_view_set_row_spacing">
+                       </constructor>
+                       <method name="set_label" symbol="gtk_frame_set_label">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="row_spacing" type="gint"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_selection_mode" symbol="gtk_icon_view_set_selection_mode">
+                       <method name="set_label_align" symbol="gtk_frame_set_label_align">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="mode" type="GtkSelectionMode"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="yalign" type="gfloat"/>
                                </parameters>
                        </method>
-                       <method name="set_spacing" symbol="gtk_icon_view_set_spacing">
+                       <method name="set_label_widget" symbol="gtk_frame_set_label_widget">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="spacing" type="gint"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="label_widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_text_column" symbol="gtk_icon_view_set_text_column">
+                       <method name="set_shadow_type" symbol="gtk_frame_set_shadow_type">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="type" type="GtkShadowType"/>
                                </parameters>
                        </method>
-                       <method name="set_tooltip_cell" symbol="gtk_icon_view_set_tooltip_cell">
+                       <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="GtkShadowType" 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_view" type="GtkIconView*"/>
-                                       <parameter name="tooltip" type="GtkTooltip*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                                       <parameter name="cell" type="GtkCellRenderer*"/>
+                                       <parameter name="frame" type="GtkFrame*"/>
+                                       <parameter name="allocation" type="GtkAllocation*"/>
                                </parameters>
-                       </method>
-                       <method name="set_tooltip_column" symbol="gtk_icon_view_set_tooltip_column">
-                               <return-type type="void"/>
+                       </vfunc>
+                       <field name="label_widget" type="GtkWidget*"/>
+                       <field name="shadow_type" type="gint16"/>
+                       <field name="label_xalign" type="gfloat"/>
+                       <field name="label_yalign" type="gfloat"/>
+                       <field name="child_allocation" type="GtkAllocation"/>
+               </object>
+               <object name="GtkGammaCurve" parent="GtkVBox" type-name="GtkGammaCurve" get-type="gtk_gamma_curve_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_gamma_curve_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <field name="table" type="GtkWidget*"/>
+                       <field name="curve" type="GtkWidget*"/>
+                       <field name="button" type="GtkWidget*[]"/>
+                       <field name="gamma" type="gfloat"/>
+                       <field name="gamma_dialog" type="GtkWidget*"/>
+                       <field name="gamma_text" type="GtkWidget*"/>
+               </object>
+               <object name="GtkHBox" parent="GtkBox" type-name="GtkHBox" get-type="gtk_hbox_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_hbox_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="column" type="gint"/>
+                                       <parameter name="homogeneous" type="gboolean"/>
+                                       <parameter name="spacing" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="set_tooltip_item" symbol="gtk_icon_view_set_tooltip_item">
-                               <return-type type="void"/>
+                       </constructor>
+               </object>
+               <object name="GtkHButtonBox" parent="GtkButtonBox" type-name="GtkHButtonBox" get-type="gtk_hbutton_box_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </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"/>
+                       </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"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_hruler_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+               </object>
+               <object name="GtkHScale" parent="GtkScale" type-name="GtkHScale" get-type="gtk_hscale_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_hscale_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="tooltip" type="GtkTooltip*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </method>
-                       <method name="unselect_all" symbol="gtk_icon_view_unselect_all">
-                               <return-type type="void"/>
+                       </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="unselect_path" symbol="gtk_icon_view_unselect_path">
-                               <return-type type="void"/>
+                       </constructor>
+               </object>
+               <object name="GtkHScrollbar" parent="GtkScrollbar" type-name="GtkHScrollbar" get-type="gtk_hscrollbar_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_hscrollbar_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </method>
-                       <method name="unset_model_drag_dest" symbol="gtk_icon_view_unset_model_drag_dest">
-                               <return-type type="void"/>
+                       </constructor>
+               </object>
+               <object name="GtkHSeparator" parent="GtkSeparator" type-name="GtkHSeparator" get-type="gtk_hseparator_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </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_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="unset_model_drag_source" symbol="gtk_icon_view_unset_model_drag_source">
-                               <return-type type="void"/>
+                       <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>
-                       <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-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="orientation" type="GtkOrientation" 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">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="path" type="GtkTreePath*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="move-cursor" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="icon_view" type="GtkIconView*"/>
-                                       <parameter name="step" type="GtkMovementStep"/>
-                                       <parameter name="count" type="gint"/>
-                               </parameters>
-                       </signal>
-                       <signal name="select-all" when="LAST">
-                               <return-type type="void"/>
+                       <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="handle_box" type="GtkHandleBox*"/>
                                </parameters>
-                       </signal>
-                       <signal name="select-cursor-item" when="LAST">
+                       </method>
+                       <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="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="position" type="GtkPositionType"/>
                                </parameters>
-                       </signal>
-                       <signal name="selection-changed" when="FIRST">
+                       </method>
+                       <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="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="type" type="GtkShadowType"/>
                                </parameters>
-                       </signal>
-                       <signal name="set-scroll-adjustments" when="LAST">
+                       </method>
+                       <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="hadjustment" type="GtkAdjustment*"/>
-                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
+                                       <parameter name="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="edge" type="GtkPositionType"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-cursor-item" when="LAST">
+                       </method>
+                       <property name="handle-position" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="shadow" type="GtkShadowType" 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="handle_box" type="GtkHandleBox*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </signal>
-                       <signal name="unselect-all" when="LAST">
+                       <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>
                        </signal>
+                       <field name="bin_window" type="GdkWindow*"/>
+                       <field name="float_window" type="GdkWindow*"/>
+                       <field name="shadow_type" type="GtkShadowType"/>
+                       <field name="handle_position" type="guint"/>
+                       <field name="float_window_mapped" type="guint"/>
+                       <field name="child_detached" type="guint"/>
+                       <field name="in_drag" type="guint"/>
+                       <field name="shrink_on_detach" type="guint"/>
+                       <field name="snap_edge" type="signed"/>
+                       <field name="deskoff_x" type="gint"/>
+                       <field name="deskoff_y" type="gint"/>
+                       <field name="attach_allocation" type="GtkAllocation"/>
+                       <field name="float_allocation" type="GtkAllocation"/>
                </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">
-                               <return-type type="void"/>
+               <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="image" type="GtkImage*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="offset" type="gint"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get" symbol="gtk_image_get">
-                               <return-type type="void"/>
+                       <method name="filter_keypress" symbol="gtk_im_context_filter_keypress">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="val" type="GdkImage**"/>
-                                       <parameter name="mask" type="GdkBitmap**"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="event" type="GdkEventKey*"/>
                                </parameters>
                        </method>
-                       <method name="get_animation" symbol="gtk_image_get_animation">
-                               <return-type type="GdkPixbufAnimation*"/>
+                       <method name="focus_in" symbol="gtk_im_context_focus_in">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_name" symbol="gtk_image_get_icon_name">
+                       <method name="focus_out" symbol="gtk_im_context_focus_out">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="icon_name" type="gchar**"/>
-                                       <parameter name="size" type="GtkIconSize*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
                        </method>
-                       <method name="get_icon_set" symbol="gtk_image_get_icon_set">
+                       <method name="get_preedit_string" symbol="gtk_im_context_get_preedit_string">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="icon_set" type="GtkIconSet**"/>
-                                       <parameter name="size" type="GtkIconSize*"/>
+                                       <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="get_image" symbol="gtk_image_get_image">
-                               <return-type type="void"/>
+                       <method name="get_surrounding" symbol="gtk_im_context_get_surrounding">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="gdk_image" type="GdkImage**"/>
-                                       <parameter name="mask" type="GdkBitmap**"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="text" type="gchar**"/>
+                                       <parameter name="cursor_index" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="get_pixbuf" symbol="gtk_image_get_pixbuf">
-                               <return-type type="GdkPixbuf*"/>
+                       <method name="reset" symbol="gtk_im_context_reset">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
                        </method>
-                       <method name="get_pixel_size" symbol="gtk_image_get_pixel_size">
-                               <return-type type="gint"/>
+                       <method name="set_client_window" symbol="gtk_im_context_set_client_window">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
                                </parameters>
                        </method>
-                       <method name="get_pixmap" symbol="gtk_image_get_pixmap">
+                       <method name="set_cursor_location" symbol="gtk_im_context_set_cursor_location">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="pixmap" type="GdkPixmap**"/>
-                                       <parameter name="mask" type="GdkBitmap**"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="area" type="GdkRectangle*"/>
                                </parameters>
                        </method>
-                       <method name="get_stock" symbol="gtk_image_get_stock">
+                       <method name="set_surrounding" symbol="gtk_im_context_set_surrounding">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="stock_id" type="gchar**"/>
-                                       <parameter name="size" type="GtkIconSize*"/>
+                                       <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="get_storage_type" symbol="gtk_image_get_storage_type">
-                               <return-type type="GtkImageType"/>
+                       <method name="set_use_preedit" symbol="gtk_im_context_set_use_preedit">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="use_preedit" type="gboolean"/>
                                </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*"/>
+                       <signal name="commit" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="animation" type="GdkPixbufAnimation*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="str" type="char*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_file" symbol="gtk_image_new_from_file">
-                               <return-type type="GtkWidget*"/>
+                       </signal>
+                       <signal name="delete-surrounding" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="filename" type="gchar*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="offset" type="gint"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_icon_name" symbol="gtk_image_new_from_icon_name">
-                               <return-type type="GtkWidget*"/>
+                       </signal>
+                       <signal name="preedit-changed" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_name" type="gchar*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_icon_set" symbol="gtk_image_new_from_icon_set">
-                               <return-type type="GtkWidget*"/>
+                       </signal>
+                       <signal name="preedit-end" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_image" symbol="gtk_image_new_from_image">
-                               <return-type type="GtkWidget*"/>
+                       </signal>
+                       <signal name="preedit-start" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GdkImage*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_pixbuf" symbol="gtk_image_new_from_pixbuf">
-                               <return-type type="GtkWidget*"/>
+                       </signal>
+                       <signal name="retrieve-surrounding" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_pixmap" symbol="gtk_image_new_from_pixmap">
-                               <return-type type="GtkWidget*"/>
+                       </signal>
+                       <vfunc name="filter_keypress">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="pixmap" type="GdkPixmap*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="event" type="GdkEventKey*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_stock" symbol="gtk_image_new_from_stock">
-                               <return-type type="GtkWidget*"/>
+                       </vfunc>
+                       <vfunc name="focus_in">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set" symbol="gtk_image_set">
+                       </vfunc>
+                       <vfunc name="focus_out">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="val" type="GdkImage*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </method>
-                       <method name="set_from_animation" symbol="gtk_image_set_from_animation">
+                       </vfunc>
+                       <vfunc name="get_preedit_string">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="animation" type="GdkPixbufAnimation*"/>
+                                       <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_from_file" symbol="gtk_image_set_from_file">
+                       </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="image" type="GtkImage*"/>
-                                       <parameter name="filename" type="gchar*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
                                </parameters>
-                       </method>
-                       <method name="set_from_icon_name" symbol="gtk_image_set_from_icon_name">
+                       </vfunc>
+                       <vfunc name="set_client_window">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="window" type="GdkWindow*"/>
                                </parameters>
-                       </method>
-                       <method name="set_from_icon_set" symbol="gtk_image_set_from_icon_set">
+                       </vfunc>
+                       <vfunc name="set_cursor_location">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="area" type="GdkRectangle*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="set_surrounding">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="icon_set" type="GtkIconSet*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
+                                       <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_from_image" symbol="gtk_image_set_from_image">
+                       </vfunc>
+                       <vfunc name="set_use_preedit">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="gdk_image" type="GdkImage*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
+                                       <parameter name="context" type="GtkIMContext*"/>
+                                       <parameter name="use_preedit" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <method name="set_from_pixbuf" symbol="gtk_image_set_from_pixbuf">
+                       </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="image" type="GtkImage*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
+                                       <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>
-                       <method name="set_from_pixmap" symbol="gtk_image_set_from_pixmap">
+                       <constructor name="new" symbol="gtk_im_context_simple_new">
+                               <return-type type="GtkIMContext*"/>
+                       </constructor>
+                       <field name="tables" type="GSList*"/>
+                       <field name="compose_buffer" type="guint[]"/>
+                       <field name="tentative_match" type="gunichar"/>
+                       <field name="tentative_match_len" type="gint"/>
+                       <field name="in_hex_sequence" type="guint"/>
+                       <field name="modifiers_dropped" type="guint"/>
+               </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="image" type="GtkImage*"/>
-                                       <parameter name="pixmap" type="GdkPixmap*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
+                                       <parameter name="context" type="GtkIMMulticontext*"/>
+                                       <parameter name="menushell" type="GtkMenuShell*"/>
                                </parameters>
                        </method>
-                       <method name="set_from_stock" symbol="gtk_image_set_from_stock">
+                       <constructor name="new" symbol="gtk_im_multicontext_new">
+                               <return-type type="GtkIMContext*"/>
+                       </constructor>
+                       <field name="slave" type="GtkIMContext*"/>
+                       <field name="context_id" type="gchar*"/>
+               </object>
+               <object name="GtkIconFactory" parent="GObject" type-name="GtkIconFactory" get-type="gtk_icon_factory_get_type">
+                       <method name="add" symbol="gtk_icon_factory_add">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="factory" type="GtkIconFactory*"/>
                                        <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="size" type="GtkIconSize"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
                                </parameters>
                        </method>
-                       <method name="set_pixel_size" symbol="gtk_image_set_pixel_size">
+                       <method name="add_default" symbol="gtk_icon_factory_add_default">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image" type="GtkImage*"/>
-                                       <parameter name="pixel_size" type="gint"/>
+                                       <parameter name="factory" type="GtkIconFactory*"/>
                                </parameters>
                        </method>
-                       <property name="file" type="char*" 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="image" type="GdkImage*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="mask" type="GdkPixmap*" 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="pixmap" type="GdkPixmap*" 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"/>
-                       <field name="storage_type" type="GtkImageType"/>
-                       <field name="data" type="gpointer"/>
-                       <field name="mask" type="GdkBitmap*"/>
-                       <field name="icon_size" type="GtkIconSize"/>
-               </object>
-               <object name="GtkImageMenuItem" parent="GtkMenuItem" type-name="GtkImageMenuItem" get-type="gtk_image_menu_item_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_image" symbol="gtk_image_menu_item_get_image">
-                               <return-type type="GtkWidget*"/>
+                       <method name="lookup" symbol="gtk_icon_factory_lookup">
+                               <return-type type="GtkIconSet*"/>
                                <parameters>
-                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
+                                       <parameter name="factory" type="GtkIconFactory*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
                                </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="lookup_default" symbol="gtk_icon_factory_lookup_default">
+                               <return-type type="GtkIconSet*"/>
                                <parameters>
                                        <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_with_label" symbol="gtk_image_menu_item_new_with_label">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="label" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_image_menu_item_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="label" type="gchar*"/>
                                </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_icon_factory_new">
+                               <return-type type="GtkIconFactory*"/>
                        </constructor>
-                       <method name="set_image" symbol="gtk_image_menu_item_set_image">
+                       <method name="remove_default" symbol="gtk_icon_factory_remove_default">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
-                                       <parameter name="image" type="GtkWidget*"/>
+                                       <parameter name="factory" type="GtkIconFactory*"/>
                                </parameters>
                        </method>
-                       <property name="image" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <field name="image" type="GtkWidget*"/>
+                       <field name="icons" type="GHashTable*"/>
                </object>
-               <object name="GtkInputDialog" parent="GtkDialog" type-name="GtkInputDialog" get-type="gtk_input_dialog_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_input_dialog_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <signal name="disable-device" when="LAST">
+               <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="inputd" type="GtkInputDialog*"/>
-                                       <parameter name="device" type="GdkDevice*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="size" type="gint"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
-                       </signal>
-                       <signal name="enable-device" when="LAST">
+                       </method>
+                       <method name="append_search_path" symbol="gtk_icon_theme_append_search_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="inputd" type="GtkInputDialog*"/>
-                                       <parameter name="device" type="GdkDevice*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="path" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <field name="axis_list" type="GtkWidget*"/>
-                       <field name="axis_listbox" type="GtkWidget*"/>
-                       <field name="mode_optionmenu" type="GtkWidget*"/>
-                       <field name="close_button" type="GtkWidget*"/>
-                       <field name="save_button" type="GtkWidget*"/>
-                       <field name="axis_items" type="GtkWidget*[]"/>
-                       <field name="current_device" type="GdkDevice*"/>
-                       <field name="keys_list" type="GtkWidget*"/>
-                       <field name="keys_listbox" type="GtkWidget*"/>
-               </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*"/>
+                       </method>
+                       <method name="choose_icon" symbol="gtk_icon_theme_choose_icon">
+                               <return-type type="GtkIconInfo*"/>
                                <parameters>
-                                       <parameter name="invisible" type="GtkInvisible*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="icon_names" type="gchar*[]"/>
+                                       <parameter name="size" type="gint"/>
+                                       <parameter name="flags" type="GtkIconLookupFlags"/>
                                </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*"/>
+                       <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="screen" type="GdkScreen*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_screen" symbol="gtk_invisible_set_screen">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_for_screen" symbol="gtk_icon_theme_get_for_screen">
+                               <return-type type="GtkIconTheme*"/>
                                <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"/>
-                       <field name="has_user_ref_count" type="gboolean"/>
-                       <field name="screen" type="GdkScreen*"/>
-               </object>
-               <object name="GtkItem" parent="GtkBin" type-name="GtkItem" get-type="gtk_item_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="deselect" symbol="gtk_item_deselect">
-                               <return-type type="void"/>
+                       <method name="get_icon_sizes" symbol="gtk_icon_theme_get_icon_sizes">
+                               <return-type type="gint*"/>
                                <parameters>
-                                       <parameter name="item" type="GtkItem*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="factories_path_delete" symbol="gtk_item_factories_path_delete">
+                       <method name="get_search_path" symbol="gtk_icon_theme_get_search_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ifactory_path" type="gchar*"/>
-                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="path" type="gchar**[]"/>
+                                       <parameter name="n_elements" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="select" symbol="gtk_item_select">
-                               <return-type type="void"/>
+                       <method name="has_icon" symbol="gtk_icon_theme_has_icon">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="item" type="GtkItem*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="toggle" symbol="gtk_item_toggle">
-                               <return-type type="void"/>
+                       <method name="list_contexts" symbol="gtk_icon_theme_list_contexts">
+                               <return-type type="GList*"/>
                                <parameters>
-                                       <parameter name="item" type="GtkItem*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
                                </parameters>
                        </method>
-                       <signal name="deselect" when="FIRST">
-                               <return-type type="void"/>
+                       <method name="list_icons" symbol="gtk_icon_theme_list_icons">
+                               <return-type type="GList*"/>
                                <parameters>
-                                       <parameter name="item" type="GtkItem*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="context" type="gchar*"/>
                                </parameters>
-                       </signal>
-                       <signal name="select" when="FIRST">
-                               <return-type type="void"/>
+                       </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="gint"/>
+                                       <parameter name="flags" type="GtkIconLookupFlags"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </method>
+                       <method name="lookup_icon" symbol="gtk_icon_theme_lookup_icon">
+                               <return-type type="GtkIconInfo*"/>
                                <parameters>
-                                       <parameter name="item" type="GtkItem*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="size" type="gint"/>
+                                       <parameter name="flags" type="GtkIconLookupFlags"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle" when="FIRST">
+                       </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"/>
                                <parameters>
-                                       <parameter name="item" type="GtkItem*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="path" type="gchar*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkItemFactory" parent="GtkObject" type-name="GtkItemFactory" get-type="gtk_item_factory_get_type">
-                       <method name="add_foreign" symbol="gtk_item_factory_add_foreign">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="rescan_if_needed" symbol="gtk_icon_theme_rescan_if_needed">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="accel_widget" type="GtkWidget*"/>
-                                       <parameter name="full_path" type="gchar*"/>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
-                                       <parameter name="keyval" type="guint"/>
-                                       <parameter name="modifiers" type="GdkModifierType"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
                                </parameters>
                        </method>
-                       <method name="construct" symbol="gtk_item_factory_construct">
+                       <method name="set_custom_theme" symbol="gtk_icon_theme_set_custom_theme">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="container_type" type="GType"/>
-                                       <parameter name="path" type="gchar*"/>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="theme_name" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="create_item" symbol="gtk_item_factory_create_item">
+                       <method name="set_screen" symbol="gtk_icon_theme_set_screen">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="entry" type="GtkItemFactoryEntry*"/>
-                                       <parameter name="callback_data" type="gpointer"/>
-                                       <parameter name="callback_type" type="guint"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
                                </parameters>
                        </method>
-                       <method name="create_items" symbol="gtk_item_factory_create_items">
+                       <method name="set_search_path" symbol="gtk_icon_theme_set_search_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="n_entries" type="guint"/>
-                                       <parameter name="entries" type="GtkItemFactoryEntry*"/>
-                                       <parameter name="callback_data" type="gpointer"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
+                                       <parameter name="path" type="gchar*[]"/>
+                                       <parameter name="n_elements" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="create_items_ac" symbol="gtk_item_factory_create_items_ac">
+                       <signal name="changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="n_entries" type="guint"/>
-                                       <parameter name="entries" type="GtkItemFactoryEntry*"/>
-                                       <parameter name="callback_data" type="gpointer"/>
-                                       <parameter name="callback_type" type="guint"/>
+                                       <parameter name="icon_theme" type="GtkIconTheme*"/>
                                </parameters>
-                       </method>
-                       <method name="create_menu_entries" symbol="gtk_item_factory_create_menu_entries">
+                       </signal>
+               </object>
+               <object name="GtkIconView" parent="GtkContainer" type-name="GtkIconView" get-type="gtk_icon_view_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GtkCellLayout"/>
+                       </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="n_entries" type="guint"/>
-                                       <parameter name="entries" type="GtkMenuEntry*"/>
+                                       <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="delete_entries" symbol="gtk_item_factory_delete_entries">
-                               <return-type type="void"/>
+                       <method name="create_drag_icon" symbol="gtk_icon_view_create_drag_icon">
+                               <return-type type="GdkPixmap*"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="n_entries" type="guint"/>
-                                       <parameter name="entries" type="GtkItemFactoryEntry*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="delete_entry" symbol="gtk_item_factory_delete_entry">
+                       <method name="enable_model_drag_dest" symbol="gtk_icon_view_enable_model_drag_dest">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="entry" type="GtkItemFactoryEntry*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="targets" type="GtkTargetEntry*"/>
+                                       <parameter name="n_targets" type="gint"/>
+                                       <parameter name="actions" type="GdkDragAction"/>
                                </parameters>
                        </method>
-                       <method name="delete_item" symbol="gtk_item_factory_delete_item">
+                       <method name="enable_model_drag_source" symbol="gtk_icon_view_enable_model_drag_source">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="path" type="gchar*"/>
+                                       <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>
                        </method>
-                       <method name="from_path" symbol="gtk_item_factory_from_path">
-                               <return-type type="GtkItemFactory*"/>
+                       <method name="get_column_spacing" symbol="gtk_icon_view_get_column_spacing">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="from_widget" symbol="gtk_item_factory_from_widget">
-                               <return-type type="GtkItemFactory*"/>
+                       <method name="get_columns" symbol="gtk_icon_view_get_columns">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_item" symbol="gtk_item_factory_get_item">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_cursor" symbol="gtk_icon_view_get_cursor">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath**"/>
+                                       <parameter name="cell" type="GtkCellRenderer**"/>
                                </parameters>
                        </method>
-                       <method name="get_item_by_action" symbol="gtk_item_factory_get_item_by_action">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_dest_item_at_pos" symbol="gtk_icon_view_get_dest_item_at_pos">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="action" type="guint"/>
+                                       <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="get_widget" symbol="gtk_item_factory_get_widget">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_drag_dest_item" symbol="gtk_icon_view_get_drag_dest_item">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="path" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath**"/>
+                                       <parameter name="pos" type="GtkIconViewDropPosition*"/>
                                </parameters>
                        </method>
-                       <method name="get_widget_by_action" symbol="gtk_item_factory_get_widget_by_action">
-                               <return-type type="GtkWidget*"/>
+                       <method name="get_item_at_pos" symbol="gtk_icon_view_get_item_at_pos">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="action" type="guint"/>
+                                       <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>
-                       <constructor name="new" symbol="gtk_item_factory_new">
-                               <return-type type="GtkItemFactory*"/>
+                       <method name="get_item_width" symbol="gtk_icon_view_get_item_width">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="container_type" type="GType"/>
-                                       <parameter name="path" type="gchar*"/>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
-                       </constructor>
-                       <method name="path_from_widget" symbol="gtk_item_factory_path_from_widget">
-                               <return-type type="gchar*"/>
+                       </method>
+                       <method name="get_margin" symbol="gtk_icon_view_get_margin">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="popup" symbol="gtk_item_factory_popup">
-                               <return-type type="void"/>
+                       <method name="get_markup_column" symbol="gtk_icon_view_get_markup_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="x" type="guint"/>
-                                       <parameter name="y" type="guint"/>
-                                       <parameter name="mouse_button" type="guint"/>
-                                       <parameter name="time_" type="guint32"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="popup_data" symbol="gtk_item_factory_popup_data">
-                               <return-type type="gpointer"/>
+                       <method name="get_model" symbol="gtk_icon_view_get_model">
+                               <return-type type="GtkTreeModel*"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="popup_data_from_widget" symbol="gtk_item_factory_popup_data_from_widget">
-                               <return-type type="gpointer"/>
+                       <method name="get_orientation" symbol="gtk_icon_view_get_orientation">
+                               <return-type type="GtkOrientation"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="popup_with_data" symbol="gtk_item_factory_popup_with_data">
-                               <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="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="popup_data" type="gpointer"/>
-                                       <parameter name="destroy" type="GtkDestroyNotify"/>
-                                       <parameter name="x" type="guint"/>
-                                       <parameter name="y" type="guint"/>
-                                       <parameter name="mouse_button" type="guint"/>
-                                       <parameter name="time_" type="guint32"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_translate_func" symbol="gtk_item_factory_set_translate_func">
-                               <return-type type="void"/>
+                       <method name="get_pixbuf_column" symbol="gtk_icon_view_get_pixbuf_column">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="ifactory" type="GtkItemFactory*"/>
-                                       <parameter name="func" type="GtkTranslateFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="notify" type="GtkDestroyNotify"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <field name="path" type="gchar*"/>
-                       <field name="accel_group" type="GtkAccelGroup*"/>
-                       <field name="widget" type="GtkWidget*"/>
-                       <field name="items" type="GSList*"/>
-                       <field name="translate_func" type="GtkTranslateFunc"/>
-                       <field name="translate_data" type="gpointer"/>
-                       <field name="translate_notify" type="GtkDestroyNotify"/>
-               </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" symbol="gtk_label_get">
-                               <return-type type="void"/>
+                       <method name="get_reorderable" symbol="gtk_icon_view_get_reorderable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="str" type="gchar**"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_angle" symbol="gtk_label_get_angle">
-                               <return-type type="gdouble"/>
+                       <method name="get_row_spacing" symbol="gtk_icon_view_get_row_spacing">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="get_attributes" symbol="gtk_label_get_attributes">
-                               <return-type type="PangoAttrList*"/>
+                       <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*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="start_path" type="GtkTreePath**"/>
+                                       <parameter name="end_path" type="GtkTreePath**"/>
                                </parameters>
                        </method>
-                       <method name="get_line_wrap_mode" symbol="gtk_label_get_line_wrap_mode">
-                               <return-type type="PangoWrapMode"/>
+                       <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_max_width_chars" symbol="gtk_label_get_max_width_chars">
-                               <return-type type="gint"/>
+                       <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="label" type="GtkLabel*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </parameters>
-                       </method>
-                       <method name="get_mnemonic_keyval" symbol="gtk_label_get_mnemonic_keyval">
-                               <return-type type="guint"/>
+                       </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_mnemonic_widget" symbol="gtk_label_get_mnemonic_widget">
-                               <return-type type="GtkWidget*"/>
+                       <method name="scroll_to_path" symbol="gtk_icon_view_scroll_to_path">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <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_selectable" symbol="gtk_label_get_selectable">
-                               <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_selection_bounds" symbol="gtk_label_get_selection_bounds">
-                               <return-type type="gboolean"/>
+                       <method name="select_path" symbol="gtk_icon_view_select_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*"/>
                                </parameters>
                        </method>
-                       <method name="get_single_line_mode" symbol="gtk_label_get_single_line_mode">
-                               <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_text" symbol="gtk_label_get_text">
-                               <return-type type="gchar*"/>
+                       <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_markup" symbol="gtk_label_get_use_markup">
-                               <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_use_underline" symbol="gtk_label_get_use_underline">
-                               <return-type type="gboolean"/>
+                       <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>
-                       <method name="get_width_chars" symbol="gtk_label_get_width_chars">
-                               <return-type type="gint"/>
+                       <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="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
+                                       <parameter name="pos" type="GtkIconViewDropPosition"/>
                                </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*"/>
+                       <method name="set_item_width" symbol="gtk_icon_view_set_item_width">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="item_width" type="gint"/>
                                </parameters>
-                       </constructor>
-                       <method name="parse_uline" symbol="gtk_label_parse_uline">
-                               <return-type type="guint"/>
+                       </method>
+                       <method name="set_margin" symbol="gtk_icon_view_set_margin">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="string" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="margin" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="select_region" symbol="gtk_label_select_region">
+                       <method name="set_markup_column" symbol="gtk_icon_view_set_markup_column">
                                <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="column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_angle" symbol="gtk_label_set_angle">
+                       <method name="set_model" symbol="gtk_icon_view_set_model">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="angle" type="gdouble"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="model" type="GtkTreeModel*"/>
                                </parameters>
                        </method>
-                       <method name="set_attributes" symbol="gtk_label_set_attributes">
+                       <method name="set_orientation" symbol="gtk_icon_view_set_orientation">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="attrs" type="PangoAttrList*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="orientation" type="GtkOrientation"/>
                                </parameters>
                        </method>
-                       <method name="set_ellipsize" symbol="gtk_label_set_ellipsize">
+                       <method name="set_pixbuf_column" symbol="gtk_icon_view_set_pixbuf_column">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="mode" type="PangoEllipsizeMode"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_justify" symbol="gtk_label_set_justify">
+                       <method name="set_reorderable" symbol="gtk_icon_view_set_reorderable">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="jtype" type="GtkJustification"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="reorderable" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_label" symbol="gtk_label_set_label">
+                       <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_line_wrap" symbol="gtk_label_set_line_wrap">
+                       <method name="set_selection_mode" symbol="gtk_icon_view_set_selection_mode">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="wrap" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="mode" type="GtkSelectionMode"/>
                                </parameters>
                        </method>
-                       <method name="set_line_wrap_mode" symbol="gtk_label_set_line_wrap_mode">
+                       <method name="set_spacing" symbol="gtk_icon_view_set_spacing">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="wrap_mode" type="PangoWrapMode"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="spacing" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_markup" symbol="gtk_label_set_markup">
+                       <method name="set_text_column" symbol="gtk_icon_view_set_text_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_markup_with_mnemonic" symbol="gtk_label_set_markup_with_mnemonic">
+                       <method name="set_tooltip_cell" symbol="gtk_icon_view_set_tooltip_cell">
                                <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*"/>
+                                       <parameter name="cell" type="GtkCellRenderer*"/>
                                </parameters>
                        </method>
-                       <method name="set_max_width_chars" symbol="gtk_label_set_max_width_chars">
+                       <method name="set_tooltip_column" symbol="gtk_icon_view_set_tooltip_column">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="n_chars" type="gint"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="column" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_mnemonic_widget" symbol="gtk_label_set_mnemonic_widget">
+                       <method name="set_tooltip_item" symbol="gtk_icon_view_set_tooltip_item">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="tooltip" type="GtkTooltip*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="set_pattern" symbol="gtk_label_set_pattern">
+                       <method name="unselect_all" symbol="gtk_icon_view_unselect_all">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="pattern" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="set_selectable" symbol="gtk_label_set_selectable">
+                       <method name="unselect_path" symbol="gtk_icon_view_unselect_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="setting" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
                        </method>
-                       <method name="set_single_line_mode" symbol="gtk_label_set_single_line_mode">
+                       <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="single_line_mode" type="gboolean"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="set_text" symbol="gtk_label_set_text">
+                       <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="str" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </method>
-                       <method name="set_text_with_mnemonic" symbol="gtk_label_set_text_with_mnemonic">
+                       <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-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="orientation" type="GtkOrientation" 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">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="path" type="GtkTreePath*"/>
                                </parameters>
-                       </method>
-                       <method name="set_use_markup" symbol="gtk_label_set_use_markup">
+                       </signal>
+                       <signal name="move-cursor" when="LAST">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="step" type="GtkMovementStep"/>
+                                       <parameter name="count" type="gint"/>
+                               </parameters>
+                       </signal>
+                       <signal name="select-all" when="LAST">
                                <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">
+                       </signal>
+                       <signal name="select-cursor-item" when="LAST">
                                <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">
+                       </signal>
+                       <signal name="selection-changed" when="FIRST">
                                <return-type type="void"/>
                                <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="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="copy-clipboard" when="LAST">
+                       </signal>
+                       <signal name="set-scroll-adjustments" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
+                                       <parameter name="hadjustment" type="GtkAdjustment*"/>
+                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </signal>
-                       <signal name="move-cursor" when="LAST">
+                       <signal name="toggle-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="unselect-all" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="label" type="GtkLabel*"/>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="icon_view" type="GtkIconView*"/>
                                </parameters>
                        </signal>
-                       <field name="label" type="gchar*"/>
-                       <field name="jtype" type="guint"/>
-                       <field name="wrap" type="guint"/>
-                       <field name="use_underline" type="guint"/>
-                       <field name="use_markup" type="guint"/>
-                       <field name="ellipsize" type="guint"/>
-                       <field name="single_line_mode" type="guint"/>
-                       <field name="have_transform" type="guint"/>
-                       <field name="in_click" type="guint"/>
-                       <field name="wrap_mode" type="guint"/>
-                       <field name="pattern_set" type="guint"/>
-                       <field name="mnemonic_keyval" type="guint"/>
-                       <field name="text" type="gchar*"/>
-                       <field name="attrs" type="PangoAttrList*"/>
-                       <field name="effective_attrs" type="PangoAttrList*"/>
-                       <field name="layout" type="PangoLayout*"/>
-                       <field name="mnemonic_widget" type="GtkWidget*"/>
-                       <field name="mnemonic_window" type="GtkWindow*"/>
-                       <field name="select_info" type="GtkLabelSelectionInfo*"/>
                </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"/>
                        </implements>
-                       <method name="freeze" symbol="gtk_layout_freeze">
+                       <method name="clear" symbol="gtk_image_clear">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="image" type="GtkImage*"/>
                                </parameters>
                        </method>
-                       <method name="get_hadjustment" symbol="gtk_layout_get_hadjustment">
-                               <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="get_size" symbol="gtk_layout_get_size">
+                       <method name="get_icon_name" symbol="gtk_image_get_icon_name">
                                <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*"/>
+                                       <parameter name="icon_name" type="gchar**"/>
+                                       <parameter name="size" type="GtkIconSize*"/>
                                </parameters>
                        </method>
-                       <method name="get_vadjustment" symbol="gtk_layout_get_vadjustment">
-                               <return-type type="GtkAdjustment*"/>
+                       <method name="get_icon_set" symbol="gtk_image_get_icon_set">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="icon_set" type="GtkIconSet**"/>
+                                       <parameter name="size" type="GtkIconSize*"/>
                                </parameters>
                        </method>
-                       <method name="move" symbol="gtk_layout_move">
+                       <method name="get_image" symbol="gtk_image_get_image">
                                <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="gdk_image" type="GdkImage**"/>
+                                       <parameter name="mask" type="GdkBitmap**"/>
                                </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">
-                               <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="child_widget" type="GtkWidget*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="image" type="GtkImage*"/>
                                </parameters>
                        </method>
-                       <method name="set_hadjustment" symbol="gtk_layout_set_hadjustment">
-                               <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>
-                       <method name="set_size" symbol="gtk_layout_set_size">
+                       <method name="get_pixmap" symbol="gtk_image_get_pixmap">
                                <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*"/>
+                                       <parameter name="pixmap" type="GdkPixmap**"/>
+                                       <parameter name="mask" type="GdkBitmap**"/>
                                </parameters>
                        </method>
-                       <method name="set_vadjustment" symbol="gtk_layout_set_vadjustment">
+                       <method name="get_stock" symbol="gtk_image_get_stock">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="stock_id" type="gchar**"/>
+                                       <parameter name="size" type="GtkIconSize*"/>
                                </parameters>
                        </method>
-                       <method name="thaw" symbol="gtk_layout_thaw">
-                               <return-type type="void"/>
+                       <method name="get_storage_type" symbol="gtk_image_get_storage_type">
+                               <return-type type="GtkImageType"/>
                                <parameters>
-                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="image" type="GtkImage*"/>
                                </parameters>
                        </method>
-                       <property name="hadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="height" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="vadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="width" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="set-scroll-adjustments" when="LAST">
-                               <return-type type="void"/>
+                       <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="layout" type="GtkLayout*"/>
-                                       <parameter name="hadjustment" type="GtkAdjustment*"/>
-                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
+                                       <parameter name="animation" type="GdkPixbufAnimation*"/>
                                </parameters>
-                       </signal>
-                       <field name="children" type="GList*"/>
-                       <field name="width" type="guint"/>
-                       <field name="height" type="guint"/>
-                       <field name="hadjustment" type="GtkAdjustment*"/>
-                       <field name="vadjustment" type="GtkAdjustment*"/>
-                       <field name="bin_window" type="GdkWindow*"/>
-                       <field name="visibility" type="GdkVisibilityState"/>
-                       <field name="scroll_x" type="gint"/>
-                       <field name="scroll_y" type="gint"/>
-                       <field name="freeze_count" type="guint"/>
-               </object>
-               <object name="GtkLinkButton" parent="GtkButton" type-name="GtkLinkButton" get-type="gtk_link_button_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_uri" symbol="gtk_link_button_get_uri">
-                               <return-type type="gchar*"/>
+                       </constructor>
+                       <constructor name="new_from_file" symbol="gtk_image_new_from_file">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="link_button" type="GtkLinkButton*"/>
+                                       <parameter name="filename" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_link_button_new">
+                       </constructor>
+                       <constructor name="new_from_icon_name" symbol="gtk_image_new_from_icon_name">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="uri" type="gchar*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
                        </constructor>
-                       <constructor name="new_with_label" symbol="gtk_link_button_new_with_label">
+                       <constructor name="new_from_icon_set" symbol="gtk_image_new_from_icon_set">
                                <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="uri" type="gchar*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
                        </constructor>
-                       <method name="set_uri" symbol="gtk_link_button_set_uri">
-                               <return-type type="void"/>
+                       <constructor name="new_from_image" symbol="gtk_image_new_from_image">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="link_button" type="GtkLinkButton*"/>
-                                       <parameter name="uri" type="gchar*"/>
+                                       <parameter name="image" type="GdkImage*"/>
+                                       <parameter name="mask" type="GdkBitmap*"/>
                                </parameters>
-                       </method>
-                       <method name="set_uri_hook" symbol="gtk_link_button_set_uri_hook">
-                               <return-type type="GtkLinkButtonUriFunc"/>
+                       </constructor>
+                       <constructor name="new_from_pixbuf" symbol="gtk_image_new_from_pixbuf">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="func" type="GtkLinkButtonUriFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GDestroyNotify"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
-                       </method>
-                       <property name="uri" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GtkList" parent="GtkContainer" type-name="GtkList" get-type="gtk_list_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="append_items" symbol="gtk_list_append_items">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="new_from_pixmap" symbol="gtk_image_new_from_pixmap">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="items" type="GList*"/>
+                                       <parameter name="pixmap" type="GdkPixmap*"/>
+                                       <parameter name="mask" type="GdkBitmap*"/>
                                </parameters>
-                       </method>
-                       <method name="child_position" symbol="gtk_list_child_position">
-                               <return-type type="gint"/>
+                       </constructor>
+                       <constructor name="new_from_stock" symbol="gtk_image_new_from_stock">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
-                       </method>
-                       <method name="clear_items" symbol="gtk_list_clear_items">
+                       </constructor>
+                       <method name="set_from_animation" symbol="gtk_image_set_from_animation">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="start" type="gint"/>
-                                       <parameter name="end" type="gint"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="animation" type="GdkPixbufAnimation*"/>
                                </parameters>
                        </method>
-                       <method name="end_drag_selection" symbol="gtk_list_end_drag_selection">
+                       <method name="set_from_file" symbol="gtk_image_set_from_file">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="filename" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="end_selection" symbol="gtk_list_end_selection">
+                       <method name="set_from_icon_name" symbol="gtk_image_set_from_icon_name">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="icon_name" type="gchar*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
                        </method>
-                       <method name="extend_selection" symbol="gtk_list_extend_selection">
+                       <method name="set_from_icon_set" symbol="gtk_image_set_from_icon_set">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="scroll_type" type="GtkScrollType"/>
-                                       <parameter name="position" type="gfloat"/>
-                                       <parameter name="auto_start_selection" type="gboolean"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="icon_set" type="GtkIconSet*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
                        </method>
-                       <method name="insert_items" symbol="gtk_list_insert_items">
+                       <method name="set_from_image" symbol="gtk_image_set_from_image">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="items" type="GList*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="gdk_image" type="GdkImage*"/>
+                                       <parameter name="mask" type="GdkBitmap*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_list_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="prepend_items" symbol="gtk_list_prepend_items">
+                       <method name="set_from_pixbuf" symbol="gtk_image_set_from_pixbuf">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="items" type="GList*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
                                </parameters>
                        </method>
-                       <method name="remove_items" symbol="gtk_list_remove_items">
+                       <method name="set_from_pixmap" symbol="gtk_image_set_from_pixmap">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="items" type="GList*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="pixmap" type="GdkPixmap*"/>
+                                       <parameter name="mask" type="GdkBitmap*"/>
                                </parameters>
                        </method>
-                       <method name="remove_items_no_unref" symbol="gtk_list_remove_items_no_unref">
+                       <method name="set_from_stock" symbol="gtk_image_set_from_stock">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="items" type="GList*"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="size" type="GtkIconSize"/>
                                </parameters>
                        </method>
-                       <method name="scroll_horizontal" symbol="gtk_list_scroll_horizontal">
+                       <method name="set_pixel_size" symbol="gtk_image_set_pixel_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="scroll_type" type="GtkScrollType"/>
-                                       <parameter name="position" type="gfloat"/>
+                                       <parameter name="image" type="GtkImage*"/>
+                                       <parameter name="pixel_size" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="scroll_vertical" symbol="gtk_list_scroll_vertical">
-                               <return-type type="void"/>
+                       <property name="file" type="char*" 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="image" type="GdkImage*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="mask" type="GdkPixmap*" 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="pixmap" type="GdkPixmap*" 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"/>
+                       <field name="storage_type" type="GtkImageType"/>
+                       <field name="data" type="gpointer"/>
+                       <field name="mask" type="GdkBitmap*"/>
+                       <field name="icon_size" type="GtkIconSize"/>
+               </object>
+               <object name="GtkImageMenuItem" parent="GtkMenuItem" type-name="GtkImageMenuItem" get-type="gtk_image_menu_item_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_image" symbol="gtk_image_menu_item_get_image">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="scroll_type" type="GtkScrollType"/>
-                                       <parameter name="position" type="gfloat"/>
+                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="select_all" symbol="gtk_list_select_all">
-                               <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="list" type="GtkList*"/>
+                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
                                </parameters>
-                       </method>
-                       <method name="select_child" symbol="gtk_list_select_child">
-                               <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" type="GtkList*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="select_item" symbol="gtk_list_select_item">
-                               <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" type="GtkList*"/>
-                                       <parameter name="item" type="gint"/>
+                                       <parameter name="label" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="set_selection_mode" symbol="gtk_list_set_selection_mode">
+                       </constructor>
+                       <method name="set_image" symbol="gtk_image_menu_item_set_image">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="mode" type="GtkSelectionMode"/>
+                                       <parameter name="image_menu_item" type="GtkImageMenuItem*"/>
+                                       <parameter name="image" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="start_selection" symbol="gtk_list_start_selection">
+                       <property name="image" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <field name="image" type="GtkWidget*"/>
+               </object>
+               <object name="GtkInputDialog" parent="GtkDialog" type-name="GtkInputDialog" get-type="gtk_input_dialog_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <constructor name="new" symbol="gtk_input_dialog_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <signal name="disable-device" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
+                                       <parameter name="inputd" type="GtkInputDialog*"/>
+                                       <parameter name="device" type="GdkDevice*"/>
                                </parameters>
-                       </method>
-                       <method name="toggle_add_mode" symbol="gtk_list_toggle_add_mode">
+                       </signal>
+                       <signal name="enable-device" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
+                                       <parameter name="inputd" type="GtkInputDialog*"/>
+                                       <parameter name="device" type="GdkDevice*"/>
                                </parameters>
-                       </method>
-                       <method name="toggle_focus_row" symbol="gtk_list_toggle_focus_row">
-                               <return-type type="void"/>
+                       </signal>
+                       <field name="axis_list" type="GtkWidget*"/>
+                       <field name="axis_listbox" type="GtkWidget*"/>
+                       <field name="mode_optionmenu" type="GtkWidget*"/>
+                       <field name="close_button" type="GtkWidget*"/>
+                       <field name="save_button" type="GtkWidget*"/>
+                       <field name="axis_items" type="GtkWidget*[]"/>
+                       <field name="current_device" type="GdkDevice*"/>
+                       <field name="keys_list" type="GtkWidget*"/>
+                       <field name="keys_listbox" type="GtkWidget*"/>
+               </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="list" type="GtkList*"/>
+                                       <parameter name="invisible" type="GtkInvisible*"/>
                                </parameters>
                        </method>
-                       <method name="toggle_row" symbol="gtk_list_toggle_row">
-                               <return-type type="void"/>
+                       <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="list" type="GtkList*"/>
-                                       <parameter name="item" type="GtkWidget*"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
                                </parameters>
-                       </method>
-                       <method name="undo_selection" symbol="gtk_list_undo_selection">
+                       </constructor>
+                       <method name="set_screen" symbol="gtk_invisible_set_screen">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
+                                       <parameter name="invisible" type="GtkInvisible*"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
                                </parameters>
                        </method>
-                       <method name="unselect_all" symbol="gtk_list_unselect_all">
+                       <property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <field name="has_user_ref_count" type="gboolean"/>
+                       <field name="screen" type="GdkScreen*"/>
+               </object>
+               <object name="GtkItem" parent="GtkBin" type-name="GtkItem" get-type="gtk_item_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="deselect" symbol="gtk_item_deselect">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
+                                       <parameter name="item" type="GtkItem*"/>
                                </parameters>
                        </method>
-                       <method name="unselect_child" symbol="gtk_list_unselect_child">
+                       <method name="select" symbol="gtk_item_select">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="item" type="GtkItem*"/>
                                </parameters>
                        </method>
-                       <method name="unselect_item" symbol="gtk_list_unselect_item">
+                       <method name="toggle" symbol="gtk_item_toggle">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="item" type="gint"/>
+                                       <parameter name="item" type="GtkItem*"/>
                                </parameters>
                        </method>
-                       <property name="selection-mode" type="GtkSelectionMode" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="select-child" when="FIRST">
+                       <signal name="deselect" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="item" type="GtkItem*"/>
                                </parameters>
                        </signal>
-                       <signal name="selection-changed" when="FIRST">
+                       <signal name="select" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
+                                       <parameter name="item" type="GtkItem*"/>
                                </parameters>
                        </signal>
-                       <signal name="unselect-child" when="FIRST">
+                       <signal name="toggle" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list" type="GtkList*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="item" type="GtkItem*"/>
                                </parameters>
                        </signal>
-                       <field name="children" type="GList*"/>
-                       <field name="selection" type="GList*"/>
-                       <field name="undo_selection" type="GList*"/>
-                       <field name="undo_unselection" type="GList*"/>
-                       <field name="last_focus_child" type="GtkWidget*"/>
-                       <field name="undo_focus_child" type="GtkWidget*"/>
-                       <field name="htimer" type="guint"/>
-                       <field name="vtimer" type="guint"/>
-                       <field name="anchor" type="gint"/>
-                       <field name="drag_pos" type="gint"/>
-                       <field name="anchor_state" type="GtkStateType"/>
-                       <field name="selection_mode" type="guint"/>
-                       <field name="drag_selection" type="guint"/>
-                       <field name="add_mode" type="guint"/>
                </object>
-               <object name="GtkListItem" parent="GtkItem" type-name="GtkListItem" get-type="gtk_list_item_get_type">
+               <object name="GtkLabel" parent="GtkMisc" type-name="GtkLabel" get-type="gtk_label_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
                        </implements>
-                       <method name="deselect" symbol="gtk_list_item_deselect">
-                               <return-type type="void"/>
+                       <method name="get_angle" symbol="gtk_label_get_angle">
+                               <return-type type="gdouble"/>
                                <parameters>
-                                       <parameter name="list_item" type="GtkListItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_list_item_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_label" symbol="gtk_list_item_new_with_label">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="label" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="select" symbol="gtk_list_item_select">
-                               <return-type type="void"/>
+                       <method name="get_attributes" symbol="gtk_label_get_attributes">
+                               <return-type type="PangoAttrList*"/>
                                <parameters>
-                                       <parameter name="list_item" type="GtkListItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <signal name="end-selection" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="list_item" type="GtkListItem*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="extend-selection" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="list_item" type="GtkListItem*"/>
-                                       <parameter name="scroll_type" type="GtkScrollType"/>
-                                       <parameter name="position" type="gfloat"/>
-                                       <parameter name="auto_start_selection" type="gboolean"/>
-                               </parameters>
-                       </signal>
-                       <signal name="scroll-horizontal" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="list_item" type="GtkListItem*"/>
-                                       <parameter name="scroll_type" type="GtkScrollType"/>
-                                       <parameter name="position" type="gfloat"/>
-                               </parameters>
-                       </signal>
-                       <signal name="scroll-vertical" when="LAST">
-                               <return-type type="void"/>
+                       <method name="get_ellipsize" symbol="gtk_label_get_ellipsize">
+                               <return-type type="PangoEllipsizeMode"/>
                                <parameters>
-                                       <parameter name="list_item" type="GtkListItem*"/>
-                                       <parameter name="scroll_type" type="GtkScrollType"/>
-                                       <parameter name="position" type="gfloat"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
-                       </signal>
-                       <signal name="select-all" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_justify" symbol="gtk_label_get_justify">
+                               <return-type type="GtkJustification"/>
                                <parameters>
-                                       <parameter name="list_item" type="GtkListItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
-                       </signal>
-                       <signal name="start-selection" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_label" symbol="gtk_label_get_label">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="list_item" type="GtkListItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-add-mode" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_layout" symbol="gtk_label_get_layout">
+                               <return-type type="PangoLayout*"/>
                                <parameters>
-                                       <parameter name="list_item" type="GtkListItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-focus-row" when="LAST">
+                       </method>
+                       <method name="get_layout_offsets" symbol="gtk_label_get_layout_offsets">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_item" type="GtkListItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="x" type="gint*"/>
+                                       <parameter name="y" type="gint*"/>
                                </parameters>
-                       </signal>
-                       <signal name="undo-selection" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_line_wrap" symbol="gtk_label_get_line_wrap">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="list_item" type="GtkListItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
-                       </signal>
-                       <signal name="unselect-all" when="LAST">
-                               <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="list_item" type="GtkListItem*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
-                       </signal>
-               </object>
-               <object name="GtkListStore" parent="GObject" type-name="GtkListStore" get-type="gtk_list_store_get_type">
-                       <implements>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkTreeModel"/>
-                               <interface name="GtkTreeSortable"/>
-                               <interface name="GtkTreeDragSource"/>
-                               <interface name="GtkTreeDragDest"/>
-                       </implements>
-                       <method name="append" symbol="gtk_list_store_append">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_max_width_chars" symbol="gtk_label_get_max_width_chars">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="clear" symbol="gtk_list_store_clear">
-                               <return-type type="void"/>
+                       <method name="get_mnemonic_keyval" symbol="gtk_label_get_mnemonic_keyval">
+                               <return-type type="guint"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="insert" symbol="gtk_list_store_insert">
-                               <return-type type="void"/>
+                       <method name="get_mnemonic_widget" symbol="gtk_label_get_mnemonic_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="insert_after" symbol="gtk_list_store_insert_after">
-                               <return-type type="void"/>
+                       <method name="get_selectable" symbol="gtk_label_get_selectable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="sibling" type="GtkTreeIter*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="insert_before" symbol="gtk_list_store_insert_before">
-                               <return-type type="void"/>
+                       <method name="get_selection_bounds" symbol="gtk_label_get_selection_bounds">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="sibling" type="GtkTreeIter*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="start" type="gint*"/>
+                                       <parameter name="end" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="insert_with_values" symbol="gtk_list_store_insert_with_values">
-                               <return-type type="void"/>
+                       <method name="get_single_line_mode" symbol="gtk_label_get_single_line_mode">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="insert_with_valuesv" symbol="gtk_list_store_insert_with_valuesv">
-                               <return-type type="void"/>
+                       <method name="get_text" symbol="gtk_label_get_text">
+                               <return-type type="gchar*"/>
                                <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="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="iter_is_valid" symbol="gtk_list_store_iter_is_valid">
+                       <method name="get_use_markup" symbol="gtk_label_get_use_markup">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="move_after" symbol="gtk_list_store_move_after">
-                               <return-type type="void"/>
+                       <method name="get_use_underline" symbol="gtk_label_get_use_underline">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="position" type="GtkTreeIter*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <method name="move_before" symbol="gtk_list_store_move_before">
-                               <return-type type="void"/>
+                       <method name="get_width_chars" symbol="gtk_label_get_width_chars">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
-                                       <parameter name="position" type="GtkTreeIter*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_list_store_new">
-                               <return-type type="GtkListStore*"/>
+                       <constructor name="new" symbol="gtk_label_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="n_columns" type="gint"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <constructor name="newv" symbol="gtk_list_store_newv">
-                               <return-type type="GtkListStore*"/>
+                       <constructor name="new_with_mnemonic" symbol="gtk_label_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="n_columns" type="gint"/>
-                                       <parameter name="types" type="GType*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <method name="prepend" symbol="gtk_list_store_prepend">
+                       <method name="select_region" symbol="gtk_label_select_region">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="start_offset" type="gint"/>
+                                       <parameter name="end_offset" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="remove" symbol="gtk_list_store_remove">
-                               <return-type type="gboolean"/>
+                       <method name="set_angle" symbol="gtk_label_set_angle">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="angle" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="reorder" symbol="gtk_list_store_reorder">
+                       <method name="set_attributes" symbol="gtk_label_set_attributes">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="store" type="GtkListStore*"/>
-                                       <parameter name="new_order" type="gint*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="attrs" type="PangoAttrList*"/>
                                </parameters>
                        </method>
-                       <method name="set" symbol="gtk_list_store_set">
+                       <method name="set_ellipsize" symbol="gtk_label_set_ellipsize">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="mode" type="PangoEllipsizeMode"/>
                                </parameters>
                        </method>
-                       <method name="set_column_types" symbol="gtk_list_store_set_column_types">
+                       <method name="set_justify" symbol="gtk_label_set_justify">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="list_store" type="GtkListStore*"/>
-                                       <parameter name="n_columns" type="gint"/>
-                                       <parameter name="types" type="GType*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="jtype" type="GtkJustification"/>
                                </parameters>
                        </method>
-                       <method name="set_valist" symbol="gtk_list_store_set_valist">
+                       <method name="set_label" symbol="gtk_label_set_label">
                                <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="label" type="GtkLabel*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_value" symbol="gtk_list_store_set_value">
+                       <method name="set_line_wrap" symbol="gtk_label_set_line_wrap">
                                <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="label" type="GtkLabel*"/>
+                                       <parameter name="wrap" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_valuesv" symbol="gtk_list_store_set_valuesv">
+                       <method name="set_line_wrap_mode" symbol="gtk_label_set_line_wrap_mode">
                                <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="label" type="GtkLabel*"/>
+                                       <parameter name="wrap_mode" type="PangoWrapMode"/>
                                </parameters>
                        </method>
-                       <method name="swap" symbol="gtk_list_store_swap">
+                       <method name="set_markup" symbol="gtk_label_set_markup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="store" type="GtkListStore*"/>
-                                       <parameter name="a" type="GtkTreeIter*"/>
-                                       <parameter name="b" type="GtkTreeIter*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </method>
-                       <field name="stamp" type="gint"/>
-                       <field name="seq" type="gpointer"/>
-                       <field name="sort_list" type="GList*"/>
-                       <field name="n_columns" type="gint"/>
-                       <field name="sort_column_id" type="gint"/>
-                       <field name="order" type="GtkSortType"/>
-                       <field name="column_headers" type="GType*"/>
-                       <field name="length" type="gint"/>
-                       <field name="default_sort_func" type="GtkTreeIterCompareFunc"/>
-                       <field name="default_sort_data" type="gpointer"/>
-                       <field name="default_sort_destroy" type="GtkDestroyNotify"/>
-                       <field name="columns_dirty" type="guint"/>
-               </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">
+                       <method name="set_markup_with_mnemonic" symbol="gtk_label_set_markup_with_mnemonic">
                                <return-type type="void"/>
                                <parameters>
-                                       <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"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="attach_to_widget" symbol="gtk_menu_attach_to_widget">
+                       <method name="set_max_width_chars" symbol="gtk_label_set_max_width_chars">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="attach_widget" type="GtkWidget*"/>
-                                       <parameter name="detacher" type="GtkMenuDetachFunc"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="detach" symbol="gtk_menu_detach">
+                       <method name="set_mnemonic_widget" symbol="gtk_label_set_mnemonic_widget">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_accel_group" symbol="gtk_menu_get_accel_group">
-                               <return-type type="GtkAccelGroup*"/>
+                       <method name="set_pattern" symbol="gtk_label_set_pattern">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="pattern" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_active" symbol="gtk_menu_get_active">
-                               <return-type type="GtkWidget*"/>
+                       <method name="set_selectable" symbol="gtk_label_set_selectable">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_attach_widget" symbol="gtk_menu_get_attach_widget">
-                               <return-type type="GtkWidget*"/>
+                       <method name="set_single_line_mode" symbol="gtk_label_set_single_line_mode">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="single_line_mode" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_for_attach_widget" symbol="gtk_menu_get_for_attach_widget">
-                               <return-type type="GList*"/>
+                       <method name="set_text" symbol="gtk_label_set_text">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_tearoff_state" symbol="gtk_menu_get_tearoff_state">
-                               <return-type type="gboolean"/>
+                       <method name="set_text_with_mnemonic" symbol="gtk_label_set_text_with_mnemonic">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="get_title" symbol="gtk_menu_get_title">
-                               <return-type type="gchar*"/>
+                       <method name="set_use_markup" symbol="gtk_label_set_use_markup">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_menu_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="popdown" symbol="gtk_menu_popdown">
+                       <method name="set_use_underline" symbol="gtk_label_set_use_underline">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="setting" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="popup" symbol="gtk_menu_popup">
+                       <method name="set_width_chars" symbol="gtk_label_set_width_chars">
                                <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"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="n_chars" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="reorder_child" symbol="gtk_menu_reorder_child">
+                       <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="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="copy-clipboard" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="label" type="GtkLabel*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="move-cursor" 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"/>
+                               </parameters>
+                       </signal>
+                       <signal name="populate-popup" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="label" type="GtkLabel*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                               </parameters>
+                       </signal>
+                       <field name="label" type="gchar*"/>
+                       <field name="jtype" type="guint"/>
+                       <field name="wrap" type="guint"/>
+                       <field name="use_underline" type="guint"/>
+                       <field name="use_markup" type="guint"/>
+                       <field name="ellipsize" type="guint"/>
+                       <field name="single_line_mode" type="guint"/>
+                       <field name="have_transform" type="guint"/>
+                       <field name="in_click" type="guint"/>
+                       <field name="wrap_mode" type="guint"/>
+                       <field name="pattern_set" type="guint"/>
+                       <field name="mnemonic_keyval" type="guint"/>
+                       <field name="text" type="gchar*"/>
+                       <field name="attrs" type="PangoAttrList*"/>
+                       <field name="effective_attrs" type="PangoAttrList*"/>
+                       <field name="layout" type="PangoLayout*"/>
+                       <field name="mnemonic_widget" type="GtkWidget*"/>
+                       <field name="mnemonic_window" type="GtkWindow*"/>
+                       <field name="select_info" type="GtkLabelSelectionInfo*"/>
+               </object>
+               <object name="GtkLayout" parent="GtkContainer" type-name="GtkLayout" get-type="gtk_layout_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_hadjustment" symbol="gtk_layout_get_hadjustment">
+                               <return-type type="GtkAdjustment*"/>
+                               <parameters>
+                                       <parameter name="layout" type="GtkLayout*"/>
                                </parameters>
                        </method>
-                       <method name="reposition" symbol="gtk_menu_reposition">
+                       <method name="get_size" symbol="gtk_layout_get_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="width" type="guint*"/>
+                                       <parameter name="height" type="guint*"/>
                                </parameters>
                        </method>
-                       <method name="set_accel_group" symbol="gtk_menu_set_accel_group">
-                               <return-type type="void"/>
+                       <method name="get_vadjustment" symbol="gtk_layout_get_vadjustment">
+                               <return-type type="GtkAdjustment*"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
                                </parameters>
                        </method>
-                       <method name="set_accel_path" symbol="gtk_menu_set_accel_path">
+                       <method name="move" symbol="gtk_layout_move">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="accel_path" 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_active" symbol="gtk_menu_set_active">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_layout_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="index_" type="guint"/>
+                                       <parameter name="hadjustment" type="GtkAdjustment*"/>
+                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
                                </parameters>
-                       </method>
-                       <method name="set_monitor" symbol="gtk_menu_set_monitor">
+                       </constructor>
+                       <method name="put" symbol="gtk_layout_put">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="monitor_num" type="gint"/>
+                                       <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_screen" symbol="gtk_menu_set_screen">
+                       <method name="set_hadjustment" symbol="gtk_layout_set_hadjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="screen" type="GdkScreen*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <method name="set_tearoff_state" symbol="gtk_menu_set_tearoff_state">
+                       <method name="set_size" symbol="gtk_layout_set_size">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="torn_off" type="gboolean"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="width" type="guint"/>
+                                       <parameter name="height" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="set_title" symbol="gtk_menu_set_title">
+                       <method name="set_vadjustment" symbol="gtk_layout_set_vadjustment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu" type="GtkMenu*"/>
-                                       <parameter name="title" type="gchar*"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <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">
+                       <property name="hadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="height" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="vadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="width" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="set-scroll-adjustments" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkMenu*"/>
-                                       <parameter name="p0" type="GtkScrollType"/>
+                                       <parameter name="layout" type="GtkLayout*"/>
+                                       <parameter name="hadjustment" type="GtkAdjustment*"/>
+                                       <parameter name="vadjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </signal>
-                       <field name="parent_menu_item" type="GtkWidget*"/>
-                       <field name="old_active_menu_item" type="GtkWidget*"/>
-                       <field name="accel_group" type="GtkAccelGroup*"/>
-                       <field name="accel_path" type="gchar*"/>
-                       <field name="position_func" type="GtkMenuPositionFunc"/>
-                       <field name="position_func_data" type="gpointer"/>
-                       <field name="toggle_size" type="guint"/>
-                       <field name="toplevel" type="GtkWidget*"/>
-                       <field name="tearoff_window" type="GtkWidget*"/>
-                       <field name="tearoff_hbox" type="GtkWidget*"/>
-                       <field name="tearoff_scrollbar" type="GtkWidget*"/>
-                       <field name="tearoff_adjustment" type="GtkAdjustment*"/>
-                       <field name="view_window" type="GdkWindow*"/>
+                       <field name="children" type="GList*"/>
+                       <field name="width" type="guint"/>
+                       <field name="height" type="guint"/>
+                       <field name="hadjustment" type="GtkAdjustment*"/>
+                       <field name="vadjustment" type="GtkAdjustment*"/>
                        <field name="bin_window" type="GdkWindow*"/>
-                       <field name="scroll_offset" type="gint"/>
-                       <field name="saved_scroll_offset" type="gint"/>
-                       <field name="scroll_step" type="gint"/>
-                       <field name="timeout_id" type="guint"/>
-                       <field name="navigation_region" type="GdkRegion*"/>
-                       <field name="navigation_timeout" type="guint"/>
-                       <field name="needs_destruction_ref_count" type="guint"/>
-                       <field name="torn_off" type="guint"/>
-                       <field name="tearoff_active" type="guint"/>
-                       <field name="scroll_fast" type="guint"/>
-                       <field name="upper_arrow_visible" type="guint"/>
-                       <field name="lower_arrow_visible" type="guint"/>
-                       <field name="upper_arrow_prelight" type="guint"/>
-                       <field name="lower_arrow_prelight" type="guint"/>
+                       <field name="visibility" type="GdkVisibilityState"/>
+                       <field name="scroll_x" type="gint"/>
+                       <field name="scroll_y" type="gint"/>
+                       <field name="freeze_count" type="guint"/>
                </object>
-               <object name="GtkMenuBar" parent="GtkMenuShell" type-name="GtkMenuBar" get-type="gtk_menu_bar_get_type">
+               <object name="GtkLinkButton" parent="GtkButton" type-name="GtkLinkButton" get-type="gtk_link_button_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"/>
+                       <method name="get_uri" symbol="gtk_link_button_get_uri">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="menubar" type="GtkMenuBar*"/>
+                                       <parameter name="link_button" type="GtkLinkButton*"/>
                                </parameters>
                        </method>
-                       <method name="get_pack_direction" symbol="gtk_menu_bar_get_pack_direction">
-                               <return-type type="GtkPackDirection"/>
+                       <constructor name="new" symbol="gtk_link_button_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="menubar" type="GtkMenuBar*"/>
+                                       <parameter name="uri" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_menu_bar_new">
+                       </constructor>
+                       <constructor name="new_with_label" symbol="gtk_link_button_new_with_label">
                                <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="uri" type="gchar*"/>
+                                       <parameter name="label" type="gchar*"/>
+                               </parameters>
                        </constructor>
-                       <method name="set_child_pack_direction" symbol="gtk_menu_bar_set_child_pack_direction">
+                       <method name="set_uri" symbol="gtk_link_button_set_uri">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menubar" type="GtkMenuBar*"/>
-                                       <parameter name="child_pack_dir" type="GtkPackDirection"/>
+                                       <parameter name="link_button" type="GtkLinkButton*"/>
+                                       <parameter name="uri" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_pack_direction" symbol="gtk_menu_bar_set_pack_direction">
-                               <return-type type="void"/>
+                       <method name="set_uri_hook" symbol="gtk_link_button_set_uri_hook">
+                               <return-type type="GtkLinkButtonUriFunc"/>
                                <parameters>
-                                       <parameter name="menubar" type="GtkMenuBar*"/>
-                                       <parameter name="pack_dir" type="GtkPackDirection"/>
+                                       <parameter name="func" type="GtkLinkButtonUriFunc"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </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="uri" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
-               <object name="GtkMenuItem" parent="GtkItem" type-name="GtkMenuItem" get-type="gtk_menu_item_get_type">
+               <object name="GtkListStore" parent="GObject" type-name="GtkListStore" get-type="gtk_list_store_get_type">
                        <implements>
-                               <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
+                               <interface name="GtkTreeModel"/>
+                               <interface name="GtkTreeSortable"/>
+                               <interface name="GtkTreeDragSource"/>
+                               <interface name="GtkTreeDragDest"/>
                        </implements>
-                       <method name="activate" symbol="gtk_menu_item_activate">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                               </parameters>
-                       </method>
-                       <method name="deselect" symbol="gtk_menu_item_deselect">
+                       <method name="append" symbol="gtk_list_store_append">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_right_justified" symbol="gtk_menu_item_get_right_justified">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_submenu" symbol="gtk_menu_item_get_submenu">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </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*"/>
-                               <parameters>
-                                       <parameter name="label" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_with_mnemonic" symbol="gtk_menu_item_new_with_mnemonic">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="label" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="remove_submenu" symbol="gtk_menu_item_remove_submenu">
+                       <method name="clear" symbol="gtk_list_store_clear">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
                                </parameters>
                        </method>
-                       <method name="select" symbol="gtk_menu_item_select">
+                       <method name="insert" symbol="gtk_list_store_insert">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_accel_path" symbol="gtk_menu_item_set_accel_path">
+                       <method name="insert_after" symbol="gtk_list_store_insert_after">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="accel_path" type="gchar*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="sibling" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_right_justified" symbol="gtk_menu_item_set_right_justified">
+                       <method name="insert_before" symbol="gtk_list_store_insert_before">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="right_justified" type="gboolean"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="sibling" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="set_submenu" symbol="gtk_menu_item_set_submenu">
+                       <method name="insert_with_values" symbol="gtk_list_store_insert_with_values">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="submenu" type="GtkWidget*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="toggle_size_allocate" symbol="gtk_menu_item_toggle_size_allocate">
+                       <method name="insert_with_valuesv" symbol="gtk_list_store_insert_with_valuesv">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="allocation" type="gint"/>
+                                       <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>
-                       <method name="toggle_size_request" symbol="gtk_menu_item_toggle_size_request">
-                               <return-type type="void"/>
+                       <method name="iter_is_valid" symbol="gtk_list_store_iter_is_valid">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="requisition" type="gint*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <property name="submenu" type="GtkMenu*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="activate" when="FIRST">
+                       <method name="move_after" symbol="gtk_list_store_move_after">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="position" type="GtkTreeIter*"/>
                                </parameters>
-                       </signal>
-                       <signal name="activate-item" when="FIRST">
+                       </method>
+                       <method name="move_before" symbol="gtk_list_store_move_before">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="position" type="GtkTreeIter*"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-size-allocate" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <constructor name="new" symbol="gtk_list_store_new">
+                               <return-type type="GtkListStore*"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="allocation" type="gint"/>
+                                       <parameter name="n_columns" type="gint"/>
                                </parameters>
-                       </signal>
-                       <signal name="toggle-size-request" when="FIRST">
-                               <return-type type="void"/>
+                       </constructor>
+                       <constructor name="newv" symbol="gtk_list_store_newv">
+                               <return-type type="GtkListStore*"/>
                                <parameters>
-                                       <parameter name="menu_item" type="GtkMenuItem*"/>
-                                       <parameter name="requisition" type="gpointer"/>
+                                       <parameter name="n_columns" type="gint"/>
+                                       <parameter name="types" type="GType*"/>
                                </parameters>
-                       </signal>
-                       <field name="submenu" type="GtkWidget*"/>
-                       <field name="event_window" type="GdkWindow*"/>
-                       <field name="toggle_size" type="guint16"/>
-                       <field name="accelerator_width" type="guint16"/>
-                       <field name="accel_path" type="gchar*"/>
-                       <field name="show_submenu_indicator" type="guint"/>
-                       <field name="submenu_placement" type="guint"/>
-                       <field name="submenu_direction" type="guint"/>
-                       <field name="right_justify" type="guint"/>
-                       <field name="timer_from_keypress" type="guint"/>
-                       <field name="from_menubar" type="guint"/>
-                       <field name="timer" type="guint"/>
-               </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">
+                       </constructor>
+                       <method name="prepend" symbol="gtk_list_store_prepend">
                                <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="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="append" symbol="gtk_menu_shell_append">
-                               <return-type type="void"/>
+                       <method name="remove" symbol="gtk_list_store_remove">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="cancel" symbol="gtk_menu_shell_cancel">
+                       <method name="reorder" symbol="gtk_list_store_reorder">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="store" type="GtkListStore*"/>
+                                       <parameter name="new_order" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="deactivate" symbol="gtk_menu_shell_deactivate">
+                       <method name="set" symbol="gtk_list_store_set">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="deselect" symbol="gtk_menu_shell_deselect">
+                       <method name="set_column_types" symbol="gtk_list_store_set_column_types">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="n_columns" type="gint"/>
+                                       <parameter name="types" type="GType*"/>
                                </parameters>
                        </method>
-                       <method name="get_take_focus" symbol="gtk_menu_shell_get_take_focus">
-                               <return-type type="gboolean"/>
+                       <method name="set_valist" symbol="gtk_list_store_set_valist">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="list_store" type="GtkListStore*"/>
+                                       <parameter name="iter" type="GtkTreeIter*"/>
+                                       <parameter name="var_args" type="va_list"/>
                                </parameters>
                        </method>
-                       <method name="insert" symbol="gtk_menu_shell_insert">
+                       <method name="set_value" symbol="gtk_list_store_set_value">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="position" 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="prepend" symbol="gtk_menu_shell_prepend">
+                       <method name="set_valuesv" symbol="gtk_list_store_set_valuesv">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <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="select_first" symbol="gtk_menu_shell_select_first">
+                       <method name="swap" symbol="gtk_list_store_swap">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="search_sensitive" type="gboolean"/>
+                                       <parameter name="store" type="GtkListStore*"/>
+                                       <parameter name="a" type="GtkTreeIter*"/>
+                                       <parameter name="b" type="GtkTreeIter*"/>
                                </parameters>
                        </method>
-                       <method name="select_item" symbol="gtk_menu_shell_select_item">
+                       <field name="stamp" type="gint"/>
+                       <field name="seq" type="gpointer"/>
+                       <field name="sort_list" type="GList*"/>
+                       <field name="n_columns" type="gint"/>
+                       <field name="sort_column_id" type="gint"/>
+                       <field name="order" type="GtkSortType"/>
+                       <field name="column_headers" type="GType*"/>
+                       <field name="length" type="gint"/>
+                       <field name="default_sort_func" type="GtkTreeIterCompareFunc"/>
+                       <field name="default_sort_data" type="gpointer"/>
+                       <field name="default_sort_destroy" type="GtkDestroyNotify"/>
+                       <field name="columns_dirty" type="guint"/>
+               </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="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="menu_item" type="GtkWidget*"/>
+                                       <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="set_take_focus" symbol="gtk_menu_shell_set_take_focus">
+                       <method name="attach_to_widget" symbol="gtk_menu_attach_to_widget">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="take_focus" type="gboolean"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="attach_widget" type="GtkWidget*"/>
+                                       <parameter name="detacher" type="GtkMenuDetachFunc"/>
                                </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="detach" symbol="gtk_menu_detach">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="force_hide" type="gboolean"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
-                       </signal>
-                       <signal name="cancel" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_accel_group" symbol="gtk_menu_get_accel_group">
+                               <return-type type="GtkAccelGroup*"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
-                       </signal>
-                       <signal name="cycle-focus" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_active" symbol="gtk_menu_get_active">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="object" type="GtkMenuShell*"/>
-                                       <parameter name="p0" type="GtkDirectionType"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
-                       </signal>
-                       <signal name="deactivate" when="FIRST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_attach_widget" symbol="gtk_menu_get_attach_widget">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
-                       </signal>
-                       <signal name="move-current" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_for_attach_widget" symbol="gtk_menu_get_for_attach_widget">
+                               <return-type type="GList*"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="direction" type="GtkMenuDirectionType"/>
+                                       <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
-                       </signal>
-                       <signal name="move-selected" when="LAST">
+                       </method>
+                       <method name="get_tearoff_state" symbol="gtk_menu_get_tearoff_state">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="distance" type="gint"/>
-                               </parameters>
-                       </signal>
-                       <signal name="selection-done" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="get_popup_delay">
-                               <return-type type="gint"/>
+                       </method>
+                       <method name="get_title" symbol="gtk_menu_get_title">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="insert">
+                       </method>
+                       <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="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="select_item">
+                       </method>
+                       <method name="popup" symbol="gtk_menu_popup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
-                                       <parameter name="menu_item" type="GtkWidget*"/>
-                               </parameters>
-                       </vfunc>
-                       <field name="children" type="GList*"/>
-                       <field name="active_menu_item" type="GtkWidget*"/>
-                       <field name="parent_menu_shell" type="GtkWidget*"/>
-                       <field name="button" type="guint"/>
-                       <field name="activate_time" type="guint32"/>
-                       <field name="active" type="guint"/>
-                       <field name="have_grab" type="guint"/>
-                       <field name="have_xgrab" type="guint"/>
-                       <field name="ignore_leave" type="guint"/>
-                       <field name="menu_flag" type="guint"/>
-                       <field name="ignore_enter" type="guint"/>
-               </object>
-               <object name="GtkMenuToolButton" parent="GtkToolButton" type-name="GtkMenuToolButton" get-type="gtk_menu_tool_button_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_menu" symbol="gtk_menu_tool_button_get_menu">
-                               <return-type type="GtkWidget*"/>
+                                       <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="reorder_child" symbol="gtk_menu_reorder_child">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkMenuToolButton*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_menu_tool_button_new">
-                               <return-type type="GtkToolItem*"/>
+                       <method name="reposition" symbol="gtk_menu_reposition">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="icon_widget" type="GtkWidget*"/>
-                                       <parameter name="label" type="gchar*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
                                </parameters>
-                       </constructor>
-                       <constructor name="new_from_stock" symbol="gtk_menu_tool_button_new_from_stock">
-                               <return-type type="GtkToolItem*"/>
+                       </method>
+                       <method name="set_accel_group" symbol="gtk_menu_set_accel_group">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="stock_id" type="gchar*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="accel_group" type="GtkAccelGroup*"/>
                                </parameters>
-                       </constructor>
-                       <method name="set_arrow_tooltip" symbol="gtk_menu_tool_button_set_arrow_tooltip">
+                       </method>
+                       <method name="set_accel_path" symbol="gtk_menu_set_accel_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkMenuToolButton*"/>
-                                       <parameter name="tooltips" type="GtkTooltips*"/>
-                                       <parameter name="tip_text" type="gchar*"/>
-                                       <parameter name="tip_private" type="gchar*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="accel_path" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_arrow_tooltip_markup" symbol="gtk_menu_tool_button_set_arrow_tooltip_markup">
+                       <method name="set_active" symbol="gtk_menu_set_active">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkMenuToolButton*"/>
-                                       <parameter name="markup" type="gchar*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="index_" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="set_arrow_tooltip_text" symbol="gtk_menu_tool_button_set_arrow_tooltip_text">
+                       <method name="set_monitor" symbol="gtk_menu_set_monitor">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkMenuToolButton*"/>
-                                       <parameter name="text" type="gchar*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="monitor_num" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_menu" symbol="gtk_menu_tool_button_set_menu">
+                       <method name="set_screen" symbol="gtk_menu_set_screen">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkMenuToolButton*"/>
-                                       <parameter name="menu" type="GtkWidget*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="screen" type="GdkScreen*"/>
                                </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_tearoff_state" symbol="gtk_menu_set_tearoff_state">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="button" type="GtkMenuToolButton*"/>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="torn_off" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <method name="set_title" symbol="gtk_menu_set_title">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="menu" type="GtkMenu*"/>
+                                       <parameter name="title" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <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="object" type="GtkMenu*"/>
+                                       <parameter name="p0" type="GtkScrollType"/>
                                </parameters>
                        </signal>
+                       <field name="parent_menu_item" type="GtkWidget*"/>
+                       <field name="old_active_menu_item" type="GtkWidget*"/>
+                       <field name="accel_group" type="GtkAccelGroup*"/>
+                       <field name="accel_path" type="gchar*"/>
+                       <field name="position_func" type="GtkMenuPositionFunc"/>
+                       <field name="position_func_data" type="gpointer"/>
+                       <field name="toggle_size" type="guint"/>
+                       <field name="toplevel" type="GtkWidget*"/>
+                       <field name="tearoff_window" type="GtkWidget*"/>
+                       <field name="tearoff_hbox" type="GtkWidget*"/>
+                       <field name="tearoff_scrollbar" type="GtkWidget*"/>
+                       <field name="tearoff_adjustment" type="GtkAdjustment*"/>
+                       <field name="view_window" type="GdkWindow*"/>
+                       <field name="bin_window" type="GdkWindow*"/>
+                       <field name="scroll_offset" type="gint"/>
+                       <field name="saved_scroll_offset" type="gint"/>
+                       <field name="scroll_step" type="gint"/>
+                       <field name="timeout_id" type="guint"/>
+                       <field name="navigation_region" type="GdkRegion*"/>
+                       <field name="navigation_timeout" type="guint"/>
+                       <field name="needs_destruction_ref_count" type="guint"/>
+                       <field name="torn_off" type="guint"/>
+                       <field name="tearoff_active" type="guint"/>
+                       <field name="scroll_fast" type="guint"/>
+                       <field name="upper_arrow_visible" type="guint"/>
+                       <field name="lower_arrow_visible" type="guint"/>
+                       <field name="upper_arrow_prelight" type="guint"/>
+                       <field name="lower_arrow_prelight" type="guint"/>
                </object>
-               <object name="GtkMessageDialog" parent="GtkDialog" type-name="GtkMessageDialog" get-type="gtk_message_dialog_get_type">
+               <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="format_secondary_markup" symbol="gtk_message_dialog_format_secondary_markup">
-                               <return-type type="void"/>
+                       <method name="get_child_pack_direction" symbol="gtk_menu_bar_get_child_pack_direction">
+                               <return-type type="GtkPackDirection"/>
                                <parameters>
-                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
-                                       <parameter name="message_format" type="gchar*"/>
+                                       <parameter name="menubar" type="GtkMenuBar*"/>
                                </parameters>
                        </method>
-                       <method name="format_secondary_text" symbol="gtk_message_dialog_format_secondary_text">
-                               <return-type type="void"/>
+                       <method name="get_pack_direction" symbol="gtk_menu_bar_get_pack_direction">
+                               <return-type type="GtkPackDirection"/>
                                <parameters>
-                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
-                                       <parameter name="message_format" type="gchar*"/>
+                                       <parameter name="menubar" type="GtkMenuBar*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_message_dialog_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*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_with_markup" symbol="gtk_message_dialog_new_with_markup">
+                       <constructor name="new" symbol="gtk_menu_bar_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*"/>
-                               </parameters>
                        </constructor>
-                       <method name="set_image" symbol="gtk_message_dialog_set_image">
+                       <method name="set_child_pack_direction" symbol="gtk_menu_bar_set_child_pack_direction">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GtkMessageDialog*"/>
-                                       <parameter name="image" type="GtkWidget*"/>
+                                       <parameter name="menubar" type="GtkMenuBar*"/>
+                                       <parameter name="child_pack_dir" type="GtkPackDirection"/>
                                </parameters>
                        </method>
-                       <method name="set_markup" symbol="gtk_message_dialog_set_markup">
+                       <method name="set_pack_direction" symbol="gtk_menu_bar_set_pack_direction">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
-                                       <parameter name="str" type="gchar*"/>
+                                       <parameter name="menubar" type="GtkMenuBar*"/>
+                                       <parameter name="pack_dir" type="GtkPackDirection"/>
                                </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-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"/>
-                       <field name="image" type="GtkWidget*"/>
-                       <field name="label" type="GtkWidget*"/>
+                       <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="GtkMisc" parent="GtkWidget" type-name="GtkMisc" get-type="gtk_misc_get_type">
+               <object name="GtkMenuItem" parent="GtkItem" type-name="GtkMenuItem" get-type="gtk_menu_item_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
                        </implements>
-                       <method name="get_alignment" symbol="gtk_misc_get_alignment">
+                       <method name="activate" symbol="gtk_menu_item_activate">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="misc" type="GtkMisc*"/>
-                                       <parameter name="xalign" type="gfloat*"/>
-                                       <parameter name="yalign" type="gfloat*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="get_padding" symbol="gtk_misc_get_padding">
+                       <method name="deselect" symbol="gtk_menu_item_deselect">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="misc" type="GtkMisc*"/>
-                                       <parameter name="xpad" type="gint*"/>
-                                       <parameter name="ypad" type="gint*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="set_alignment" symbol="gtk_misc_set_alignment">
+                       <method name="get_right_justified" symbol="gtk_menu_item_get_right_justified">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_submenu" symbol="gtk_menu_item_get_submenu">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                               </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*"/>
+                               <parameters>
+                                       <parameter name="label" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_with_mnemonic" symbol="gtk_menu_item_new_with_mnemonic">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="label" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="select" symbol="gtk_menu_item_select">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="misc" type="GtkMisc*"/>
-                                       <parameter name="xalign" type="gfloat"/>
-                                       <parameter name="yalign" type="gfloat"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
                        </method>
-                       <method name="set_padding" symbol="gtk_misc_set_padding">
+                       <method name="set_accel_path" symbol="gtk_menu_item_set_accel_path">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="misc" type="GtkMisc*"/>
-                                       <parameter name="xpad" type="gint"/>
-                                       <parameter name="ypad" type="gint"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="accel_path" type="gchar*"/>
                                </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"/>
-                       <field name="xalign" type="gfloat"/>
-                       <field name="yalign" type="gfloat"/>
-                       <field name="xpad" type="guint16"/>
-                       <field name="ypad" type="guint16"/>
-               </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"/>
+                       <method name="set_right_justified" symbol="gtk_menu_item_set_right_justified">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="right_justified" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="append_page_menu" symbol="gtk_notebook_append_page_menu">
-                               <return-type type="gint"/>
+                       <method name="set_submenu" symbol="gtk_menu_item_set_submenu">
+                               <return-type type="void"/>
                                <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="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="submenu" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_current_page" symbol="gtk_notebook_get_current_page">
-                               <return-type type="gint"/>
+                       <method name="toggle_size_allocate" symbol="gtk_menu_item_toggle_size_allocate">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="allocation" type="gint"/>
+                               </parameters>
+                       </method>
+                       <method name="toggle_size_request" symbol="gtk_menu_item_toggle_size_request">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="requisition" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="get_group" symbol="gtk_notebook_get_group">
-                               <return-type type="gpointer"/>
+                       <property name="submenu" type="GtkMenu*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="activate" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </method>
-                       <method name="get_group_id" symbol="gtk_notebook_get_group_id">
-                               <return-type type="gint"/>
+                       </signal>
+                       <signal name="activate-item" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
                                </parameters>
-                       </method>
-                       <method name="get_menu_label" symbol="gtk_notebook_get_menu_label">
-                               <return-type type="GtkWidget*"/>
+                       </signal>
+                       <signal name="toggle-size-allocate" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="allocation" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="get_menu_label_text" symbol="gtk_notebook_get_menu_label_text">
-                               <return-type type="gchar*"/>
+                       </signal>
+                       <signal name="toggle-size-request" when="FIRST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu_item" type="GtkMenuItem*"/>
+                                       <parameter name="requisition" type="gpointer"/>
                                </parameters>
-                       </method>
-                       <method name="get_n_pages" symbol="gtk_notebook_get_n_pages">
-                               <return-type type="gint"/>
+                       </signal>
+                       <field name="submenu" type="GtkWidget*"/>
+                       <field name="event_window" type="GdkWindow*"/>
+                       <field name="toggle_size" type="guint16"/>
+                       <field name="accelerator_width" type="guint16"/>
+                       <field name="accel_path" type="gchar*"/>
+                       <field name="show_submenu_indicator" type="guint"/>
+                       <field name="submenu_placement" type="guint"/>
+                       <field name="submenu_direction" type="guint"/>
+                       <field name="right_justify" type="guint"/>
+                       <field name="timer_from_keypress" type="guint"/>
+                       <field name="from_menubar" type="guint"/>
+                       <field name="timer" type="guint"/>
+               </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="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="menu_item" type="GtkWidget*"/>
+                                       <parameter name="force_deactivate" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_nth_page" symbol="gtk_notebook_get_nth_page">
-                               <return-type type="GtkWidget*"/>
+                       <method name="append" symbol="gtk_menu_shell_append">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="page_num" type="gint"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_scrollable" symbol="gtk_notebook_get_scrollable">
-                               <return-type type="gboolean"/>
+                       <method name="cancel" symbol="gtk_menu_shell_cancel">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
                        </method>
-                       <method name="get_show_border" symbol="gtk_notebook_get_show_border">
-                               <return-type type="gboolean"/>
+                       <method name="deactivate" symbol="gtk_menu_shell_deactivate">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
                        </method>
-                       <method name="get_show_tabs" symbol="gtk_notebook_get_show_tabs">
-                               <return-type type="gboolean"/>
+                       <method name="deselect" symbol="gtk_menu_shell_deselect">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_detachable" symbol="gtk_notebook_get_tab_detachable">
+                       <method name="get_take_focus" symbol="gtk_menu_shell_get_take_focus">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_label" symbol="gtk_notebook_get_tab_label">
-                               <return-type type="GtkWidget*"/>
+                       <method name="insert" symbol="gtk_menu_shell_insert">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                        <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_label_text" symbol="gtk_notebook_get_tab_label_text">
-                               <return-type type="gchar*"/>
+                       <method name="prepend" symbol="gtk_menu_shell_prepend">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                        <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_pos" symbol="gtk_notebook_get_tab_pos">
-                               <return-type type="GtkPositionType"/>
+                       <method name="select_first" symbol="gtk_menu_shell_select_first">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="search_sensitive" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="get_tab_reorderable" symbol="gtk_notebook_get_tab_reorderable">
-                               <return-type type="gboolean"/>
+                       <method name="select_item" symbol="gtk_menu_shell_select_item">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="menu_item" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="insert_page" symbol="gtk_notebook_insert_page">
-                               <return-type type="gint"/>
+                       <method name="set_take_focus" symbol="gtk_menu_shell_set_take_focus">
+                               <return-type type="void"/>
                                <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_shell" type="GtkMenuShell*"/>
+                                       <parameter name="take_focus" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="insert_page_menu" symbol="gtk_notebook_insert_page_menu">
-                               <return-type type="gint"/>
+                       <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="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_shell" type="GtkMenuShell*"/>
+                                       <parameter name="force_hide" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_notebook_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="next_page" symbol="gtk_notebook_next_page">
+                       </signal>
+                       <signal name="cancel" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
-                       </method>
-                       <method name="popup_disable" symbol="gtk_notebook_popup_disable">
+                       </signal>
+                       <signal name="cycle-focus" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="object" type="GtkMenuShell*"/>
+                                       <parameter name="p0" type="GtkDirectionType"/>
                                </parameters>
-                       </method>
-                       <method name="popup_enable" symbol="gtk_notebook_popup_enable">
+                       </signal>
+                       <signal name="deactivate" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
-                       </method>
-                       <method name="prepend_page" symbol="gtk_notebook_prepend_page">
-                               <return-type type="gint"/>
+                       </signal>
+                       <signal name="move-current" when="LAST">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="direction" type="GtkMenuDirectionType"/>
                                </parameters>
-                       </method>
-                       <method name="prepend_page_menu" symbol="gtk_notebook_prepend_page_menu">
-                               <return-type type="gint"/>
+                       </signal>
+                       <signal name="move-selected" when="LAST">
+                               <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="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="distance" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="prev_page" symbol="gtk_notebook_prev_page">
+                       </signal>
+                       <signal name="selection-done" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                </parameters>
-                       </method>
-                       <method name="query_tab_label_packing" symbol="gtk_notebook_query_tab_label_packing">
+                       </signal>
+                       <vfunc name="get_popup_delay">
+                               <return-type type="gint"/>
+                               <parameters>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="insert">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
                                        <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="expand" type="gboolean*"/>
-                                       <parameter name="fill" type="gboolean*"/>
-                                       <parameter name="pack_type" type="GtkPackType*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
-                       </method>
-                       <method name="remove_page" symbol="gtk_notebook_remove_page">
+                       </vfunc>
+                       <vfunc name="select_item">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="page_num" type="gint"/>
+                                       <parameter name="menu_shell" type="GtkMenuShell*"/>
+                                       <parameter name="menu_item" type="GtkWidget*"/>
+                               </parameters>
+                       </vfunc>
+                       <field name="children" type="GList*"/>
+                       <field name="active_menu_item" type="GtkWidget*"/>
+                       <field name="parent_menu_shell" type="GtkWidget*"/>
+                       <field name="button" type="guint"/>
+                       <field name="activate_time" type="guint32"/>
+                       <field name="active" type="guint"/>
+                       <field name="have_grab" type="guint"/>
+                       <field name="have_xgrab" type="guint"/>
+                       <field name="ignore_leave" type="guint"/>
+                       <field name="menu_flag" type="guint"/>
+                       <field name="ignore_enter" type="guint"/>
+               </object>
+               <object name="GtkMenuToolButton" parent="GtkToolButton" type-name="GtkMenuToolButton" get-type="gtk_menu_tool_button_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="get_menu" symbol="gtk_menu_tool_button_get_menu">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="button" type="GtkMenuToolButton*"/>
                                </parameters>
                        </method>
-                       <method name="reorder_child" symbol="gtk_notebook_reorder_child">
+                       <constructor name="new" symbol="gtk_menu_tool_button_new">
+                               <return-type type="GtkToolItem*"/>
+                               <parameters>
+                                       <parameter name="icon_widget" type="GtkWidget*"/>
+                                       <parameter name="label" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_from_stock" symbol="gtk_menu_tool_button_new_from_stock">
+                               <return-type type="GtkToolItem*"/>
+                               <parameters>
+                                       <parameter name="stock_id" type="gchar*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_arrow_tooltip_markup" symbol="gtk_menu_tool_button_set_arrow_tooltip_markup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="position" type="gint"/>
+                                       <parameter name="button" type="GtkMenuToolButton*"/>
+                                       <parameter name="markup" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_current_page" symbol="gtk_notebook_set_current_page">
+                       <method name="set_arrow_tooltip_text" symbol="gtk_menu_tool_button_set_arrow_tooltip_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="page_num" type="gint"/>
+                                       <parameter name="button" type="GtkMenuToolButton*"/>
+                                       <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_group" symbol="gtk_notebook_set_group">
+                       <method name="set_menu" symbol="gtk_menu_tool_button_set_menu">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="group" type="gpointer"/>
+                                       <parameter name="button" type="GtkMenuToolButton*"/>
+                                       <parameter name="menu" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_group_id" symbol="gtk_notebook_set_group_id">
+                       <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="notebook" type="GtkNotebook*"/>
-                                       <parameter name="group_id" type="gint"/>
+                                       <parameter name="button" type="GtkMenuToolButton*"/>
                                </parameters>
-                       </method>
-                       <method name="set_homogeneous_tabs" symbol="gtk_notebook_set_homogeneous_tabs">
+                       </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">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="homogeneous" type="gboolean"/>
+                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
+                                       <parameter name="message_format" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_menu_label" symbol="gtk_notebook_set_menu_label">
+                       <method name="format_secondary_text" symbol="gtk_message_dialog_format_secondary_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="menu_label" type="GtkWidget*"/>
+                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
+                                       <parameter name="message_format" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_menu_label_text" symbol="gtk_notebook_set_menu_label_text">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gtk_message_dialog_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="menu_text" type="gchar*"/>
+                                       <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="set_scrollable" symbol="gtk_notebook_set_scrollable">
+                       </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>
+                       </constructor>
+                       <method name="set_image" symbol="gtk_message_dialog_set_image">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="scrollable" type="gboolean"/>
+                                       <parameter name="dialog" type="GtkMessageDialog*"/>
+                                       <parameter name="image" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_show_border" symbol="gtk_notebook_set_show_border">
+                       <method name="set_markup" symbol="gtk_message_dialog_set_markup">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="show_border" type="gboolean"/>
+                                       <parameter name="message_dialog" type="GtkMessageDialog*"/>
+                                       <parameter name="str" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_show_tabs" symbol="gtk_notebook_set_show_tabs">
+                       <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-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"/>
+                       <field name="image" type="GtkWidget*"/>
+                       <field name="label" type="GtkWidget*"/>
+               </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="notebook" type="GtkNotebook*"/>
-                                       <parameter name="show_tabs" type="gboolean"/>
+                                       <parameter name="misc" type="GtkMisc*"/>
+                                       <parameter name="xalign" type="gfloat*"/>
+                                       <parameter name="yalign" type="gfloat*"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_border" symbol="gtk_notebook_set_tab_border">
+                       <method name="get_padding" symbol="gtk_misc_get_padding">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="border_width" type="guint"/>
+                                       <parameter name="misc" type="GtkMisc*"/>
+                                       <parameter name="xpad" type="gint*"/>
+                                       <parameter name="ypad" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_detachable" symbol="gtk_notebook_set_tab_detachable">
+                       <method name="set_alignment" symbol="gtk_misc_set_alignment">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="detachable" type="gboolean"/>
+                                       <parameter name="misc" type="GtkMisc*"/>
+                                       <parameter name="xalign" type="gfloat"/>
+                                       <parameter name="yalign" type="gfloat"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_hborder" symbol="gtk_notebook_set_tab_hborder">
+                       <method name="set_padding" symbol="gtk_misc_set_padding">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="tab_hborder" type="guint"/>
+                                       <parameter name="misc" type="GtkMisc*"/>
+                                       <parameter name="xpad" type="gint"/>
+                                       <parameter name="ypad" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_label" symbol="gtk_notebook_set_tab_label">
-                               <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"/>
+                       <field name="xalign" type="gfloat"/>
+                       <field name="yalign" type="gfloat"/>
+                       <field name="xpad" type="guint16"/>
+                       <field name="ypad" type="guint16"/>
+               </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="notebook" type="GtkNotebook*"/>
                                        <parameter name="child" type="GtkWidget*"/>
                                        <parameter name="tab_label" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_label_packing" symbol="gtk_notebook_set_tab_label_packing">
-                               <return-type type="void"/>
+                       <method name="append_page_menu" symbol="gtk_notebook_append_page_menu">
+                               <return-type type="gint"/>
                                <parameters>
                                        <parameter name="notebook" type="GtkNotebook*"/>
                                        <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="expand" type="gboolean"/>
-                                       <parameter name="fill" type="gboolean"/>
-                                       <parameter name="pack_type" type="GtkPackType"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="menu_label" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_label_text" symbol="gtk_notebook_set_tab_label_text">
-                               <return-type type="void"/>
+                       <method name="get_current_page" symbol="gtk_notebook_get_current_page">
+                               <return-type type="gint"/>
                                <parameters>
                                        <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_pos" symbol="gtk_notebook_set_tab_pos">
-                               <return-type type="void"/>
+                       <method name="get_group" symbol="gtk_notebook_get_group">
+                               <return-type type="gpointer"/>
                                <parameters>
                                        <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="pos" type="GtkPositionType"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_reorderable" symbol="gtk_notebook_set_tab_reorderable">
-                               <return-type type="void"/>
+                       <method name="get_menu_label" symbol="gtk_notebook_get_menu_label">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
                                        <parameter name="notebook" type="GtkNotebook*"/>
                                        <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="reorderable" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_tab_vborder" symbol="gtk_notebook_set_tab_vborder">
-                               <return-type type="void"/>
+                       <method name="get_menu_label_text" symbol="gtk_notebook_get_menu_label_text">
+                               <return-type type="gchar*"/>
                                <parameters>
                                        <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="tab_vborder" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_window_creation_hook" symbol="gtk_notebook_set_window_creation_hook">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="func" type="GtkNotebookWindowCreationFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GDestroyNotify"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <property name="enable-popup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="group" type="gpointer" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="group-id" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="homogeneous" type="gboolean" 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-border" type="guint" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="tab-hborder" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="tab-pos" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="tab-vborder" type="guint" 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"/>
+                       <method name="get_n_pages" symbol="gtk_notebook_get_n_pages">
+                               <return-type type="gint"/>
                                <parameters>
                                        <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="type" type="GtkNotebookTab"/>
                                </parameters>
-                       </signal>
-                       <signal name="move-focus-out" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <method name="get_nth_page" symbol="gtk_notebook_get_nth_page">
+                               <return-type type="GtkWidget*"/>
                                <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="object" type="GtkNotebook*"/>
-                                       <parameter name="p0" type="GtkWidget*"/>
-                                       <parameter name="p1" type="guint"/>
-                               </parameters>
-                       </signal>
-                       <signal name="page-removed" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="object" type="GtkNotebook*"/>
-                                       <parameter name="p0" type="GtkWidget*"/>
-                                       <parameter name="p1" type="guint"/>
-                               </parameters>
-                       </signal>
-                       <signal name="page-reordered" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="object" type="GtkNotebook*"/>
-                                       <parameter name="p0" type="GtkWidget*"/>
-                                       <parameter name="p1" type="guint"/>
+                                       <parameter name="page_num" type="gint"/>
                                </parameters>
-                       </signal>
-                       <signal name="reorder-tab" when="LAST">
+                       </method>
+                       <method name="get_scrollable" symbol="gtk_notebook_get_scrollable">
                                <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">
+                       </method>
+                       <method name="get_show_border" symbol="gtk_notebook_get_show_border">
                                <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"/>
+                       </method>
+                       <method name="get_show_tabs" symbol="gtk_notebook_get_show_tabs">
+                               <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="notebook" type="GtkNotebook*"/>
-                                       <parameter name="page" type="gpointer"/>
-                                       <parameter name="page_num" type="guint"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="insert_page">
-                               <return-type type="gint"/>
+                       </method>
+                       <method name="get_tab_detachable" symbol="gtk_notebook_get_tab_detachable">
+                               <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"/>
-                               </parameters>
-                       </vfunc>
-                       <field name="cur_page" type="GtkNotebookPage*"/>
-                       <field name="children" type="GList*"/>
-                       <field name="first_tab" type="GList*"/>
-                       <field name="focus_tab" type="GList*"/>
-                       <field name="menu" type="GtkWidget*"/>
-                       <field name="event_window" type="GdkWindow*"/>
-                       <field name="timer" type="guint32"/>
-                       <field name="tab_hborder" type="guint16"/>
-                       <field name="tab_vborder" type="guint16"/>
-                       <field name="show_tabs" type="guint"/>
-                       <field name="homogeneous" type="guint"/>
-                       <field name="show_border" type="guint"/>
-                       <field name="tab_pos" type="guint"/>
-                       <field name="scrollable" type="guint"/>
-                       <field name="in_child" type="guint"/>
-                       <field name="click_child" type="guint"/>
-                       <field name="button" type="guint"/>
-                       <field name="need_timer" type="guint"/>
-                       <field name="child_has_focus" type="guint"/>
-                       <field name="have_visible_child" type="guint"/>
-                       <field name="focus_out" type="guint"/>
-                       <field name="has_before_previous" type="guint"/>
-                       <field name="has_before_next" type="guint"/>
-                       <field name="has_after_previous" type="guint"/>
-                       <field name="has_after_next" type="guint"/>
-               </object>
-               <object name="GtkObject" parent="GInitiallyUnowned" type-name="GtkObject" get-type="gtk_object_get_type">
-                       <method name="add_arg_type" symbol="gtk_object_add_arg_type">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="arg_name" type="gchar*"/>
-                                       <parameter name="arg_type" type="GtkType"/>
-                                       <parameter name="arg_flags" type="guint"/>
-                                       <parameter name="arg_id" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="destroy" symbol="gtk_object_destroy">
-                               <return-type type="void"/>
+                       <method name="get_tab_label" symbol="gtk_notebook_get_tab_label">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get" symbol="gtk_object_get">
-                               <return-type type="void"/>
+                       <method name="get_tab_label_text" symbol="gtk_notebook_get_tab_label_text">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="first_property_name" type="gchar*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_data" symbol="gtk_object_get_data">
-                               <return-type type="gpointer"/>
+                       <method name="get_tab_pos" symbol="gtk_notebook_get_tab_pos">
+                               <return-type type="GtkPositionType"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="get_data_by_id" symbol="gtk_object_get_data_by_id">
-                               <return-type type="gpointer"/>
+                       <method name="get_tab_reorderable" symbol="gtk_notebook_get_tab_reorderable">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="data_id" type="GQuark"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="get_user_data" symbol="gtk_object_get_user_data">
-                               <return-type type="gpointer"/>
+                       <method name="insert_page" symbol="gtk_notebook_insert_page">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gtk_object_new">
-                               <return-type type="GtkObject*"/>
+                       <method name="insert_page_menu" symbol="gtk_notebook_insert_page_menu">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="type" type="GtkType"/>
-                                       <parameter name="first_property_name" type="gchar*"/>
+                                       <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>
+                       <constructor name="new" symbol="gtk_notebook_new">
+                               <return-type type="GtkWidget*"/>
                        </constructor>
-                       <method name="ref" symbol="gtk_object_ref">
-                               <return-type type="GtkObject*"/>
+                       <method name="next_page" symbol="gtk_notebook_next_page">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="remove_data" symbol="gtk_object_remove_data">
+                       <method name="popup_disable" symbol="gtk_notebook_popup_disable">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="remove_data_by_id" symbol="gtk_object_remove_data_by_id">
+                       <method name="popup_enable" symbol="gtk_notebook_popup_enable">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="data_id" type="GQuark"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="remove_no_notify" symbol="gtk_object_remove_no_notify">
-                               <return-type type="void"/>
+                       <method name="prepend_page" symbol="gtk_notebook_prepend_page">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="key" type="gchar*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="remove_no_notify_by_id" symbol="gtk_object_remove_no_notify_by_id">
-                               <return-type type="void"/>
+                       <method name="prepend_page_menu" symbol="gtk_notebook_prepend_page_menu">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="key_id" type="GQuark"/>
+                                       <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="set" symbol="gtk_object_set">
+                       <method name="prev_page" symbol="gtk_notebook_prev_page">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="first_property_name" type="gchar*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
                                </parameters>
                        </method>
-                       <method name="set_data" symbol="gtk_object_set_data">
+                       <method name="query_tab_label_packing" symbol="gtk_notebook_query_tab_label_packing">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="key" type="gchar*"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="expand" type="gboolean*"/>
+                                       <parameter name="fill" type="gboolean*"/>
+                                       <parameter name="pack_type" type="GtkPackType*"/>
                                </parameters>
                        </method>
-                       <method name="set_data_by_id" symbol="gtk_object_set_data_by_id">
+                       <method name="remove_page" symbol="gtk_notebook_remove_page">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="data_id" type="GQuark"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="page_num" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_data_by_id_full" symbol="gtk_object_set_data_by_id_full">
+                       <method name="reorder_child" symbol="gtk_notebook_reorder_child">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="data_id" type="GQuark"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GtkDestroyNotify"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="position" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_data_full" symbol="gtk_object_set_data_full">
+                       <method name="set_current_page" symbol="gtk_notebook_set_current_page">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="key" type="gchar*"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GtkDestroyNotify"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="page_num" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_user_data" symbol="gtk_object_set_user_data">
+                       <method name="set_group" symbol="gtk_notebook_set_group">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="group" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="sink" symbol="gtk_object_sink">
+                       <method name="set_menu_label" symbol="gtk_notebook_set_menu_label">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu_label" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="unref" symbol="gtk_object_unref">
+                       <method name="set_menu_label_text" symbol="gtk_notebook_set_menu_label_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="menu_text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="weakref" symbol="gtk_object_weakref">
+                       <method name="set_scrollable" symbol="gtk_notebook_set_scrollable">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="notify" type="GtkDestroyNotify"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="scrollable" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="weakunref" symbol="gtk_object_weakunref">
+                       <method name="set_show_border" symbol="gtk_notebook_set_show_border">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="notify" type="GtkDestroyNotify"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="show_border" type="gboolean"/>
                                </parameters>
                        </method>
-                       <property name="user-data" type="gpointer" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="destroy" when="CLEANUP">
+                       <method name="set_show_tabs" symbol="gtk_notebook_set_show_tabs">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="show_tabs" type="gboolean"/>
                                </parameters>
-                       </signal>
-                       <vfunc name="get_arg">
+                       </method>
+                       <method name="set_tab_detachable" symbol="gtk_notebook_set_tab_detachable">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="arg" type="GtkArg*"/>
-                                       <parameter name="arg_id" type="guint"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="detachable" type="gboolean"/>
                                </parameters>
-                       </vfunc>
-                       <vfunc name="set_arg">
+                       </method>
+                       <method name="set_tab_label" symbol="gtk_notebook_set_tab_label">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GtkObject*"/>
-                                       <parameter name="arg" type="GtkArg*"/>
-                                       <parameter name="arg_id" type="guint"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_label" type="GtkWidget*"/>
                                </parameters>
-                       </vfunc>
-                       <field name="flags" type="guint32"/>
-               </object>
-               <object name="GtkOldEditable" parent="GtkWidget" type-name="GtkOldEditable" get-type="gtk_old_editable_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkEditable"/>
-                       </implements>
-                       <method name="changed" symbol="gtk_old_editable_changed">
+                       </method>
+                       <method name="set_tab_label_packing" symbol="gtk_notebook_set_tab_label_packing">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="old_editable" type="GtkOldEditable*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="expand" type="gboolean"/>
+                                       <parameter name="fill" type="gboolean"/>
+                                       <parameter name="pack_type" type="GtkPackType"/>
                                </parameters>
                        </method>
-                       <method name="claim_selection" symbol="gtk_old_editable_claim_selection">
+                       <method name="set_tab_label_text" symbol="gtk_notebook_set_tab_label_text">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="old_editable" type="GtkOldEditable*"/>
-                                       <parameter name="claim" type="gboolean"/>
-                                       <parameter name="time_" type="guint32"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="tab_text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <property name="editable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="text-position" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="activate" when="LAST">
+                       <method name="set_tab_pos" symbol="gtk_notebook_set_tab_pos">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="pos" type="GtkPositionType"/>
                                </parameters>
-                       </signal>
-                       <signal name="copy-clipboard" when="LAST">
+                       </method>
+                       <method name="set_tab_reorderable" symbol="gtk_notebook_set_tab_reorderable">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="child" type="GtkWidget*"/>
+                                       <parameter name="reorderable" type="gboolean"/>
                                </parameters>
-                       </signal>
-                       <signal name="cut-clipboard" when="LAST">
+                       </method>
+                       <method name="set_window_creation_hook" symbol="gtk_notebook_set_window_creation_hook">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
+                                       <parameter name="func" type="GtkNotebookWindowCreationFunc"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </parameters>
-                       </signal>
-                       <signal name="kill-char" when="LAST">
-                               <return-type type="void"/>
+                       </method>
+                       <property name="enable-popup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="group" type="gpointer" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="group-id" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="homogeneous" type="gboolean" 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-border" type="guint" readable="0" writable="1" construct="0" construct-only="0"/>
+                       <property name="tab-hborder" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="tab-pos" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="tab-vborder" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="change-current-page" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="direction" type="gint"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="offset" type="gint"/>
                                </parameters>
                        </signal>
-                       <signal name="kill-line" when="LAST">
-                               <return-type type="void"/>
+                       <signal name="create-window" when="LAST">
+                               <return-type type="GtkNotebook*"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="direction" type="gint"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="page" type="GtkWidget*"/>
+                                       <parameter name="x" type="gint"/>
+                                       <parameter name="y" type="gint"/>
                                </parameters>
                        </signal>
-                       <signal name="kill-word" when="LAST">
-                               <return-type type="void"/>
+                       <signal name="focus-tab" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="direction" type="gint"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="type" type="GtkNotebookTab"/>
                                </parameters>
                        </signal>
-                       <signal name="move-cursor" when="LAST">
+                       <signal name="move-focus-out" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="direction" type="GtkDirectionType"/>
                                </parameters>
                        </signal>
-                       <signal name="move-page" when="LAST">
+                       <signal name="page-added" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
+                                       <parameter name="object" type="GtkNotebook*"/>
+                                       <parameter name="p0" type="GtkWidget*"/>
+                                       <parameter name="p1" type="guint"/>
                                </parameters>
                        </signal>
-                       <signal name="move-to-column" when="LAST">
+                       <signal name="page-removed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="row" type="gint"/>
+                                       <parameter name="object" type="GtkNotebook*"/>
+                                       <parameter name="p0" type="GtkWidget*"/>
+                                       <parameter name="p1" type="guint"/>
                                </parameters>
                        </signal>
-                       <signal name="move-to-row" when="LAST">
+                       <signal name="page-reordered" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="row" type="gint"/>
+                                       <parameter name="object" type="GtkNotebook*"/>
+                                       <parameter name="p0" type="GtkWidget*"/>
+                                       <parameter name="p1" type="guint"/>
                                </parameters>
                        </signal>
-                       <signal name="move-word" when="LAST">
-                               <return-type type="void"/>
+                       <signal name="reorder-tab" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="n" type="gint"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="direction" type="GtkDirectionType"/>
+                                       <parameter name="move_to_last" type="gboolean"/>
                                </parameters>
                        </signal>
-                       <signal name="paste-clipboard" when="LAST">
-                               <return-type type="void"/>
+                       <signal name="select-page" when="LAST">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="move_focus" type="gboolean"/>
                                </parameters>
                        </signal>
-                       <signal name="set-editable" when="LAST">
+                       <signal name="switch-page" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="is_editable" type="gboolean"/>
+                                       <parameter name="notebook" type="GtkNotebook*"/>
+                                       <parameter name="page" type="gpointer"/>
+                                       <parameter name="page_num" type="guint"/>
                                </parameters>
                        </signal>
-                       <vfunc name="get_chars">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="start_pos" type="gint"/>
-                                       <parameter name="end_pos" type="gint"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="set_position">
-                               <return-type type="void"/>
+                       <vfunc name="insert_page">
+                               <return-type type="gint"/>
                                <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
+                                       <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>
-                       <vfunc name="set_selection">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="start_pos" type="gint"/>
-                                       <parameter name="end_pos" type="gint"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="update_text">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="editable" type="GtkOldEditable*"/>
-                                       <parameter name="start_pos" type="gint"/>
-                                       <parameter name="end_pos" type="gint"/>
-                               </parameters>
-                       </vfunc>
-                       <field name="current_pos" type="guint"/>
-                       <field name="selection_start_pos" type="guint"/>
-                       <field name="selection_end_pos" type="guint"/>
-                       <field name="has_selection" type="guint"/>
-                       <field name="editable" type="guint"/>
-                       <field name="visible" type="guint"/>
-                       <field name="clipboard_text" type="gchar*"/>
+                       <field name="cur_page" type="GtkNotebookPage*"/>
+                       <field name="children" type="GList*"/>
+                       <field name="first_tab" type="GList*"/>
+                       <field name="focus_tab" type="GList*"/>
+                       <field name="menu" type="GtkWidget*"/>
+                       <field name="event_window" type="GdkWindow*"/>
+                       <field name="timer" type="guint32"/>
+                       <field name="tab_hborder" type="guint16"/>
+                       <field name="tab_vborder" type="guint16"/>
+                       <field name="show_tabs" type="guint"/>
+                       <field name="homogeneous" type="guint"/>
+                       <field name="show_border" type="guint"/>
+                       <field name="tab_pos" type="guint"/>
+                       <field name="scrollable" type="guint"/>
+                       <field name="in_child" type="guint"/>
+                       <field name="click_child" type="guint"/>
+                       <field name="button" type="guint"/>
+                       <field name="need_timer" type="guint"/>
+                       <field name="child_has_focus" type="guint"/>
+                       <field name="have_visible_child" type="guint"/>
+                       <field name="focus_out" type="guint"/>
+                       <field name="has_before_previous" type="guint"/>
+                       <field name="has_before_next" type="guint"/>
+                       <field name="has_after_previous" type="guint"/>
+                       <field name="has_after_next" type="guint"/>
                </object>
-               <object name="GtkOptionMenu" parent="GtkButton" type-name="GtkOptionMenu" get-type="gtk_option_menu_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_history" symbol="gtk_option_menu_get_history">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="option_menu" type="GtkOptionMenu*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_menu" symbol="gtk_option_menu_get_menu">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="option_menu" type="GtkOptionMenu*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_option_menu_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="remove_menu" symbol="gtk_option_menu_remove_menu">
+               <object name="GtkObject" parent="GInitiallyUnowned" type-name="GtkObject" get-type="gtk_object_get_type">
+                       <method name="destroy" symbol="gtk_object_destroy">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="option_menu" type="GtkOptionMenu*"/>
+                                       <parameter name="object" type="GtkObject*"/>
                                </parameters>
                        </method>
-                       <method name="set_history" symbol="gtk_option_menu_set_history">
+                       <property name="user-data" type="gpointer" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="destroy" when="CLEANUP">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="option_menu" type="GtkOptionMenu*"/>
-                                       <parameter name="index_" type="guint"/>
+                                       <parameter name="object" type="GtkObject*"/>
                                </parameters>
-                       </method>
-                       <method name="set_menu" symbol="gtk_option_menu_set_menu">
+                       </signal>
+                       <vfunc name="get_arg">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="option_menu" type="GtkOptionMenu*"/>
-                                       <parameter name="menu" type="GtkWidget*"/>
+                                       <parameter name="object" type="GtkObject*"/>
+                                       <parameter name="arg" type="GtkArg*"/>
+                                       <parameter name="arg_id" type="guint"/>
                                </parameters>
-                       </method>
-                       <property name="menu" type="GtkMenu*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="changed" when="LAST">
+                       </vfunc>
+                       <vfunc name="set_arg">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="option_menu" type="GtkOptionMenu*"/>
+                                       <parameter name="object" type="GtkObject*"/>
+                                       <parameter name="arg" type="GtkArg*"/>
+                                       <parameter name="arg_id" type="guint"/>
                                </parameters>
-                       </signal>
-                       <field name="menu" type="GtkWidget*"/>
-                       <field name="menu_item" type="GtkWidget*"/>
-                       <field name="width" type="guint16"/>
-                       <field name="height" type="guint16"/>
+                       </vfunc>
+                       <field name="flags" type="guint32"/>
                </object>
                <object name="GtkPageSetup" parent="GObject" type-name="GtkPageSetup" get-type="gtk_page_setup_get_type">
                        <method name="copy" symbol="gtk_page_setup_copy">
@@ -16607,15 +12767,6 @@
                                        <parameter name="child" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="compute_position" symbol="gtk_paned_compute_position">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="paned" type="GtkPaned*"/>
-                                       <parameter name="allocation" type="gint"/>
-                                       <parameter name="child1_req" type="gint"/>
-                                       <parameter name="child2_req" type="gint"/>
-                               </parameters>
-                       </method>
                        <method name="get_child1" symbol="gtk_paned_get_child1">
                                <return-type type="GtkWidget*"/>
                                <parameters>
@@ -16726,46 +12877,6 @@
                        <field name="drag_pos" type="gint"/>
                        <field name="original_position" type="gint"/>
                </object>
-               <object name="GtkPixmap" parent="GtkMisc" type-name="GtkPixmap" get-type="gtk_pixmap_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get" symbol="gtk_pixmap_get">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pixmap" type="GtkPixmap*"/>
-                                       <parameter name="val" type="GdkPixmap**"/>
-                                       <parameter name="mask" type="GdkBitmap**"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_pixmap_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="pixmap" type="GdkPixmap*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set" symbol="gtk_pixmap_set">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pixmap" type="GtkPixmap*"/>
-                                       <parameter name="val" type="GdkPixmap*"/>
-                                       <parameter name="mask" type="GdkBitmap*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_build_insensitive" symbol="gtk_pixmap_set_build_insensitive">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pixmap" type="GtkPixmap*"/>
-                                       <parameter name="build" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <field name="pixmap" type="GdkPixmap*"/>
-                       <field name="mask" type="GdkBitmap*"/>
-                       <field name="pixmap_insensitive" type="GdkPixmap*"/>
-                       <field name="build_insensitive" type="guint"/>
-               </object>
                <object name="GtkPlug" parent="GtkWindow" type-name="GtkPlug" get-type="gtk_plug_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
@@ -16796,136 +12907,27 @@
                                <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*"/>
-                               <parameters>
-                                       <parameter name="display" type="GdkDisplay*"/>
-                                       <parameter name="socket_id" type="GdkNativeWindow"/>
-                               </parameters>
-                       </constructor>
-                       <property name="embedded" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <signal name="embedded" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="plug" type="GtkPlug*"/>
-                               </parameters>
-                       </signal>
-                       <field name="socket_window" type="GdkWindow*"/>
-                       <field name="modality_window" type="GtkWidget*"/>
-                       <field name="modality_group" type="GtkWindowGroup*"/>
-                       <field name="grabbed_keys" type="GHashTable*"/>
-                       <field name="same_app" type="guint"/>
-               </object>
-               <object name="GtkPreview" parent="GtkWidget" type-name="GtkPreview" get-type="gtk_preview_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="draw_row" symbol="gtk_preview_draw_row">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="preview" type="GtkPreview*"/>
-                                       <parameter name="data" type="guchar*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="w" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="get_cmap" symbol="gtk_preview_get_cmap">
-                               <return-type type="GdkColormap*"/>
-                       </method>
-                       <method name="get_info" symbol="gtk_preview_get_info">
-                               <return-type type="GtkPreviewInfo*"/>
-                       </method>
-                       <method name="get_visual" symbol="gtk_preview_get_visual">
-                               <return-type type="GdkVisual*"/>
-                       </method>
-                       <constructor name="new" symbol="gtk_preview_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="type" type="GtkPreviewType"/>
-                               </parameters>
-                       </constructor>
-                       <method name="put" symbol="gtk_preview_put">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="preview" type="GtkPreview*"/>
-                                       <parameter name="window" type="GdkWindow*"/>
-                                       <parameter name="gc" type="GdkGC*"/>
-                                       <parameter name="srcx" type="gint"/>
-                                       <parameter name="srcy" type="gint"/>
-                                       <parameter name="destx" type="gint"/>
-                                       <parameter name="desty" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="reset" symbol="gtk_preview_reset">
-                               <return-type type="void"/>
-                       </method>
-                       <method name="set_color_cube" symbol="gtk_preview_set_color_cube">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="nred_shades" type="guint"/>
-                                       <parameter name="ngreen_shades" type="guint"/>
-                                       <parameter name="nblue_shades" type="guint"/>
-                                       <parameter name="ngray_shades" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_dither" symbol="gtk_preview_set_dither">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="preview" type="GtkPreview*"/>
-                                       <parameter name="dither" type="GdkRgbDither"/>
-                               </parameters>
-                       </method>
-                       <method name="set_expand" symbol="gtk_preview_set_expand">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="preview" type="GtkPreview*"/>
-                                       <parameter name="expand" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_gamma" symbol="gtk_preview_set_gamma">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gamma_" type="double"/>
-                               </parameters>
-                       </method>
-                       <method name="set_install_cmap" symbol="gtk_preview_set_install_cmap">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="install_cmap" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_reserved" symbol="gtk_preview_set_reserved">
-                               <return-type type="void"/>
+                               </parameters>
+                       </constructor>
+                       <constructor name="new_for_display" symbol="gtk_plug_new_for_display">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="nreserved" type="gint"/>
+                                       <parameter name="display" type="GdkDisplay*"/>
+                                       <parameter name="socket_id" type="GdkNativeWindow"/>
                                </parameters>
-                       </method>
-                       <method name="size" symbol="gtk_preview_size">
+                       </constructor>
+                       <property name="embedded" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <signal name="embedded" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="preview" type="GtkPreview*"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
+                                       <parameter name="plug" type="GtkPlug*"/>
                                </parameters>
-                       </method>
-                       <method name="uninit" symbol="gtk_preview_uninit">
-                               <return-type type="void"/>
-                       </method>
-                       <property name="expand" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <field name="buffer" type="guchar*"/>
-                       <field name="buffer_width" type="guint16"/>
-                       <field name="buffer_height" type="guint16"/>
-                       <field name="bpp" type="guint16"/>
-                       <field name="rowstride" type="guint16"/>
-                       <field name="dither" type="GdkRgbDither"/>
-                       <field name="type" type="guint"/>
-                       <field name="expand" type="guint"/>
+                       </signal>
+                       <field name="socket_window" type="GdkWindow*"/>
+                       <field name="modality_window" type="GtkWidget*"/>
+                       <field name="modality_group" type="GtkWindowGroup*"/>
+                       <field name="grabbed_keys" type="GHashTable*"/>
+                       <field name="same_app" type="guint"/>
                </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">
@@ -17672,133 +13674,6 @@
                                </parameters>
                        </method>
                </object>
-               <object name="GtkProgress" parent="GtkWidget" type-name="GtkProgress" get-type="gtk_progress_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="configure" symbol="gtk_progress_configure">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                                       <parameter name="value" type="gdouble"/>
-                                       <parameter name="hmin" type="gdouble"/>
-                                       <parameter name="max" type="gdouble"/>
-                               </parameters>
-                       </method>
-                       <method name="get_current_percentage" symbol="gtk_progress_get_current_percentage">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_current_text" symbol="gtk_progress_get_current_text">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_percentage_from_value" symbol="gtk_progress_get_percentage_from_value">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                                       <parameter name="value" type="gdouble"/>
-                               </parameters>
-                       </method>
-                       <method name="get_text_from_value" symbol="gtk_progress_get_text_from_value">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                                       <parameter name="value" type="gdouble"/>
-                               </parameters>
-                       </method>
-                       <method name="get_value" symbol="gtk_progress_get_value">
-                               <return-type type="gdouble"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_activity_mode" symbol="gtk_progress_set_activity_mode">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                                       <parameter name="activity_mode" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_adjustment" symbol="gtk_progress_set_adjustment">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_format_string" symbol="gtk_progress_set_format_string">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                                       <parameter name="format" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_percentage" symbol="gtk_progress_set_percentage">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                                       <parameter name="percentage" type="gdouble"/>
-                               </parameters>
-                       </method>
-                       <method name="set_show_text" symbol="gtk_progress_set_show_text">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                                       <parameter name="show_text" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_text_alignment" symbol="gtk_progress_set_text_alignment">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                                       <parameter name="x_align" type="gfloat"/>
-                                       <parameter name="y_align" type="gfloat"/>
-                               </parameters>
-                       </method>
-                       <method name="set_value" symbol="gtk_progress_set_value">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                                       <parameter name="value" type="gdouble"/>
-                               </parameters>
-                       </method>
-                       <property name="activity-mode" type="gboolean" 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-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"/>
-                       <vfunc name="act_mode_enter">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="paint">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="update">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="progress" type="GtkProgress*"/>
-                               </parameters>
-                       </vfunc>
-                       <field name="adjustment" type="GtkAdjustment*"/>
-                       <field name="offscreen_pixmap" type="GdkPixmap*"/>
-                       <field name="format" type="gchar*"/>
-                       <field name="x_align" type="gfloat"/>
-                       <field name="y_align" type="gfloat"/>
-                       <field name="show_text" type="guint"/>
-                       <field name="activity_mode" type="guint"/>
-                       <field name="use_text_format" type="guint"/>
-               </object>
                <object name="GtkProgressBar" parent="GtkProgress" type-name="GtkProgressBar" get-type="gtk_progress_bar_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
@@ -17837,46 +13712,12 @@
                        <constructor name="new" symbol="gtk_progress_bar_new">
                                <return-type type="GtkWidget*"/>
                        </constructor>
-                       <constructor name="new_with_adjustment" symbol="gtk_progress_bar_new_with_adjustment">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="adjustment" type="GtkAdjustment*"/>
-                               </parameters>
-                       </constructor>
                        <method name="pulse" symbol="gtk_progress_bar_pulse">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="pbar" type="GtkProgressBar*"/>
                                </parameters>
                        </method>
-                       <method name="set_activity_blocks" symbol="gtk_progress_bar_set_activity_blocks">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
-                                       <parameter name="blocks" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_activity_step" symbol="gtk_progress_bar_set_activity_step">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
-                                       <parameter name="step" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_bar_style" symbol="gtk_progress_bar_set_bar_style">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
-                                       <parameter name="style" type="GtkProgressBarStyle"/>
-                               </parameters>
-                       </method>
-                       <method name="set_discrete_blocks" symbol="gtk_progress_bar_set_discrete_blocks">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
-                                       <parameter name="blocks" type="guint"/>
-                               </parameters>
-                       </method>
                        <method name="set_ellipsize" symbol="gtk_progress_bar_set_ellipsize">
                                <return-type type="void"/>
                                <parameters>
@@ -17912,13 +13753,6 @@
                                        <parameter name="text" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="update" symbol="gtk_progress_bar_update">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pbar" type="GtkProgressBar*"/>
-                                       <parameter name="percentage" type="gdouble"/>
-                               </parameters>
-                       </method>
                        <property name="activity-blocks" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="activity-step" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="adjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -18388,18 +14222,6 @@
                        <constructor name="new" symbol="gtk_rc_style_new">
                                <return-type type="GtkRcStyle*"/>
                        </constructor>
-                       <method name="ref" symbol="gtk_rc_style_ref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="rc_style" type="GtkRcStyle*"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gtk_rc_style_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="rc_style" type="GtkRcStyle*"/>
-                               </parameters>
-                       </method>
                        <vfunc name="create_rc_style">
                                <return-type type="GtkRcStyle*"/>
                                <parameters>
@@ -18667,12 +14489,6 @@
                        <method name="get_default" symbol="gtk_recent_manager_get_default">
                                <return-type type="GtkRecentManager*"/>
                        </method>
-                       <method name="get_for_screen" symbol="gtk_recent_manager_get_for_screen">
-                               <return-type type="GtkRecentManager*"/>
-                               <parameters>
-                                       <parameter name="screen" type="GdkScreen*"/>
-                               </parameters>
-                       </method>
                        <method name="get_items" symbol="gtk_recent_manager_get_items">
                                <return-type type="GList*"/>
                                <parameters>
@@ -18734,13 +14550,6 @@
                                        <parameter name="limit" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="set_screen" symbol="gtk_recent_manager_set_screen">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="manager" type="GtkRecentManager*"/>
-                                       <parameter name="screen" type="GdkScreen*"/>
-                               </parameters>
-                       </method>
                        <property name="filename" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
                        <property name="limit" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="size" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
@@ -19364,13 +15173,6 @@
                        <constructor name="new" symbol="gtk_socket_new">
                                <return-type type="GtkWidget*"/>
                        </constructor>
-                       <method name="steal" symbol="gtk_socket_steal">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="socket_" type="GtkSocket*"/>
-                                       <parameter name="wid" type="GdkNativeWindow"/>
-                               </parameters>
-                       </method>
                        <signal name="plug-added" when="LAST">
                                <return-type type="void"/>
                                <parameters>
@@ -19931,12 +15733,6 @@
                                        <parameter name="style" type="GtkStyle*"/>
                                </parameters>
                        </method>
-                       <method name="get_font" symbol="gtk_style_get_font">
-                               <return-type type="GdkFont*"/>
-                               <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                               </parameters>
-                       </method>
                        <method name="lookup_color" symbol="gtk_style_lookup_color">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -19955,12 +15751,6 @@
                        <constructor name="new" symbol="gtk_style_new">
                                <return-type type="GtkStyle*"/>
                        </constructor>
-                       <method name="ref" symbol="gtk_style_ref">
-                               <return-type type="GtkStyle*"/>
-                               <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                               </parameters>
-                       </method>
                        <method name="render_icon" symbol="gtk_style_render_icon">
                                <return-type type="GdkPixbuf*"/>
                                <parameters>
@@ -19981,19 +15771,6 @@
                                        <parameter name="state_type" type="GtkStateType"/>
                                </parameters>
                        </method>
-                       <method name="set_font" symbol="gtk_style_set_font">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                                       <parameter name="font" type="GdkFont*"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="gtk_style_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="style" type="GtkStyle*"/>
-                               </parameters>
-                       </method>
                        <signal name="realize" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
@@ -22061,113 +17838,35 @@
                        <field name="cursor_visible" type="guint"/>
                        <field name="need_im_reset" type="guint"/>
                        <field name="accepts_tab" type="guint"/>
-                       <field name="width_changed" type="guint"/>
-                       <field name="onscreen_validated" type="guint"/>
-                       <field name="mouse_cursor_obscured" type="guint"/>
-                       <field name="text_window" type="GtkTextWindow*"/>
-                       <field name="left_window" type="GtkTextWindow*"/>
-                       <field name="right_window" type="GtkTextWindow*"/>
-                       <field name="top_window" type="GtkTextWindow*"/>
-                       <field name="bottom_window" type="GtkTextWindow*"/>
-                       <field name="hadjustment" type="GtkAdjustment*"/>
-                       <field name="vadjustment" type="GtkAdjustment*"/>
-                       <field name="xoffset" type="gint"/>
-                       <field name="yoffset" type="gint"/>
-                       <field name="width" type="gint"/>
-                       <field name="height" type="gint"/>
-                       <field name="virtual_cursor_x" type="gint"/>
-                       <field name="virtual_cursor_y" type="gint"/>
-                       <field name="first_para_mark" type="GtkTextMark*"/>
-                       <field name="first_para_pixels" type="gint"/>
-                       <field name="dnd_mark" type="GtkTextMark*"/>
-                       <field name="blink_timeout" type="guint"/>
-                       <field name="first_validate_idle" type="guint"/>
-                       <field name="incremental_validate_idle" type="guint"/>
-                       <field name="im_context" type="GtkIMContext*"/>
-                       <field name="popup_menu" type="GtkWidget*"/>
-                       <field name="drag_start_x" type="gint"/>
-                       <field name="drag_start_y" type="gint"/>
-                       <field name="children" type="GSList*"/>
-                       <field name="pending_scroll" type="GtkTextPendingScroll*"/>
-                       <field name="pending_place_cursor_button" type="gint"/>
-               </object>
-               <object name="GtkTipsQuery" parent="GtkLabel" type-name="GtkTipsQuery" get-type="gtk_tips_query_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <constructor name="new" symbol="gtk_tips_query_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="set_caller" symbol="gtk_tips_query_set_caller">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tips_query" type="GtkTipsQuery*"/>
-                                       <parameter name="caller" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_labels" symbol="gtk_tips_query_set_labels">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tips_query" type="GtkTipsQuery*"/>
-                                       <parameter name="label_inactive" type="gchar*"/>
-                                       <parameter name="label_no_tip" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="start_query" symbol="gtk_tips_query_start_query">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tips_query" type="GtkTipsQuery*"/>
-                               </parameters>
-                       </method>
-                       <method name="stop_query" symbol="gtk_tips_query_stop_query">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tips_query" type="GtkTipsQuery*"/>
-                               </parameters>
-                       </method>
-                       <property name="caller" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="emit-always" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="label-inactive" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="label-no-tip" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="start-query" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tips_query" type="GtkTipsQuery*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="stop-query" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tips_query" type="GtkTipsQuery*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="widget-entered" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tips_query" type="GtkTipsQuery*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="tip_text" type="char*"/>
-                                       <parameter name="tip_private" type="char*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="widget-selected" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="tips_query" type="GtkTipsQuery*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="tip_text" type="char*"/>
-                                       <parameter name="tip_private" type="char*"/>
-                                       <parameter name="event" type="GdkEvent*"/>
-                               </parameters>
-                       </signal>
-                       <field name="emit_always" type="guint"/>
-                       <field name="in_query" type="guint"/>
-                       <field name="label_inactive" type="gchar*"/>
-                       <field name="label_no_tip" type="gchar*"/>
-                       <field name="caller" type="GtkWidget*"/>
-                       <field name="last_crossed" type="GtkWidget*"/>
-                       <field name="query_cursor" type="GdkCursor*"/>
+                       <field name="width_changed" type="guint"/>
+                       <field name="onscreen_validated" type="guint"/>
+                       <field name="mouse_cursor_obscured" type="guint"/>
+                       <field name="text_window" type="GtkTextWindow*"/>
+                       <field name="left_window" type="GtkTextWindow*"/>
+                       <field name="right_window" type="GtkTextWindow*"/>
+                       <field name="top_window" type="GtkTextWindow*"/>
+                       <field name="bottom_window" type="GtkTextWindow*"/>
+                       <field name="hadjustment" type="GtkAdjustment*"/>
+                       <field name="vadjustment" type="GtkAdjustment*"/>
+                       <field name="xoffset" type="gint"/>
+                       <field name="yoffset" type="gint"/>
+                       <field name="width" type="gint"/>
+                       <field name="height" type="gint"/>
+                       <field name="virtual_cursor_x" type="gint"/>
+                       <field name="virtual_cursor_y" type="gint"/>
+                       <field name="first_para_mark" type="GtkTextMark*"/>
+                       <field name="first_para_pixels" type="gint"/>
+                       <field name="dnd_mark" type="GtkTextMark*"/>
+                       <field name="blink_timeout" type="guint"/>
+                       <field name="first_validate_idle" type="guint"/>
+                       <field name="incremental_validate_idle" type="guint"/>
+                       <field name="im_context" type="GtkIMContext*"/>
+                       <field name="popup_menu" type="GtkWidget*"/>
+                       <field name="drag_start_x" type="gint"/>
+                       <field name="drag_start_y" type="gint"/>
+                       <field name="children" type="GSList*"/>
+                       <field name="pending_scroll" type="GtkTextPendingScroll*"/>
+                       <field name="pending_place_cursor_button" type="gint"/>
                </object>
                <object name="GtkToggleAction" parent="GtkAction" type-name="GtkToggleAction" get-type="gtk_toggle_action_get_type">
                        <implements>
@@ -22561,15 +18260,6 @@
                                        <parameter name="menu_item" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="set_tooltip" symbol="gtk_tool_item_set_tooltip">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tool_item" type="GtkToolItem*"/>
-                                       <parameter name="tooltips" type="GtkTooltips*"/>
-                                       <parameter name="tip_text" type="gchar*"/>
-                                       <parameter name="tip_private" type="gchar*"/>
-                               </parameters>
-                       </method>
                        <method name="set_tooltip_markup" symbol="gtk_tool_item_set_tooltip_markup">
                                <return-type type="void"/>
                                <parameters>
@@ -22617,10 +18307,10 @@
                        <signal name="set-tooltip" when="LAST">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="tool_item" type="GtkToolItem*"/>
-                                       <parameter name="tooltips" type="GtkTooltips*"/>
-                                       <parameter name="tip_text" type="char*"/>
-                                       <parameter name="tip_private" type="char*"/>
+                                       <parameter name="object" type="GtkToolItem*"/>
+                                       <parameter name="p0" type="GtkTooltips*"/>
+                                       <parameter name="p1" type="char*"/>
+                                       <parameter name="p2" type="char*"/>
                                </parameters>
                        </signal>
                        <signal name="toolbar-reconfigured" when="LAST">
@@ -22635,47 +18325,6 @@
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
                        </implements>
-                       <method name="append_element" symbol="gtk_toolbar_append_element">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="type" type="GtkToolbarChildType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="text" type="char*"/>
-                                       <parameter name="tooltip_text" type="char*"/>
-                                       <parameter name="tooltip_private_text" type="char*"/>
-                                       <parameter name="icon" type="GtkWidget*"/>
-                                       <parameter name="callback" type="GtkSignalFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="append_item" symbol="gtk_toolbar_append_item">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="text" type="char*"/>
-                                       <parameter name="tooltip_text" type="char*"/>
-                                       <parameter name="tooltip_private_text" type="char*"/>
-                                       <parameter name="icon" type="GtkWidget*"/>
-                                       <parameter name="callback" type="GtkSignalFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="append_space" symbol="gtk_toolbar_append_space">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                               </parameters>
-                       </method>
-                       <method name="append_widget" symbol="gtk_toolbar_append_widget">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="tooltip_text" type="char*"/>
-                                       <parameter name="tooltip_private_text" type="char*"/>
-                               </parameters>
-                       </method>
                        <method name="get_drop_index" symbol="gtk_toolbar_get_drop_index">
                                <return-type type="gint"/>
                                <parameters>
@@ -22748,114 +18397,9 @@
                                        <parameter name="pos" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="insert_element" symbol="gtk_toolbar_insert_element">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="type" type="GtkToolbarChildType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="text" type="char*"/>
-                                       <parameter name="tooltip_text" type="char*"/>
-                                       <parameter name="tooltip_private_text" type="char*"/>
-                                       <parameter name="icon" type="GtkWidget*"/>
-                                       <parameter name="callback" type="GtkSignalFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                                       <parameter name="position" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="insert_item" symbol="gtk_toolbar_insert_item">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="text" type="char*"/>
-                                       <parameter name="tooltip_text" type="char*"/>
-                                       <parameter name="tooltip_private_text" type="char*"/>
-                                       <parameter name="icon" type="GtkWidget*"/>
-                                       <parameter name="callback" type="GtkSignalFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                                       <parameter name="position" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="insert_space" symbol="gtk_toolbar_insert_space">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="position" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="insert_stock" symbol="gtk_toolbar_insert_stock">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="tooltip_text" type="char*"/>
-                                       <parameter name="tooltip_private_text" type="char*"/>
-                                       <parameter name="callback" type="GtkSignalFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                                       <parameter name="position" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="insert_widget" symbol="gtk_toolbar_insert_widget">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="tooltip_text" type="char*"/>
-                                       <parameter name="tooltip_private_text" type="char*"/>
-                                       <parameter name="position" type="gint"/>
-                               </parameters>
-                       </method>
                        <constructor name="new" symbol="gtk_toolbar_new">
                                <return-type type="GtkWidget*"/>
                        </constructor>
-                       <method name="prepend_element" symbol="gtk_toolbar_prepend_element">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="type" type="GtkToolbarChildType"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="text" type="char*"/>
-                                       <parameter name="tooltip_text" type="char*"/>
-                                       <parameter name="tooltip_private_text" type="char*"/>
-                                       <parameter name="icon" type="GtkWidget*"/>
-                                       <parameter name="callback" type="GtkSignalFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="prepend_item" symbol="gtk_toolbar_prepend_item">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="text" type="char*"/>
-                                       <parameter name="tooltip_text" type="char*"/>
-                                       <parameter name="tooltip_private_text" type="char*"/>
-                                       <parameter name="icon" type="GtkWidget*"/>
-                                       <parameter name="callback" type="GtkSignalFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="prepend_space" symbol="gtk_toolbar_prepend_space">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                               </parameters>
-                       </method>
-                       <method name="prepend_widget" symbol="gtk_toolbar_prepend_widget">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="tooltip_text" type="char*"/>
-                                       <parameter name="tooltip_private_text" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="remove_space" symbol="gtk_toolbar_remove_space">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="toolbar" type="GtkToolbar*"/>
-                                       <parameter name="position" type="gint"/>
-                               </parameters>
-                       </method>
                        <method name="set_drop_highlight_item" symbol="gtk_toolbar_set_drop_highlight_item">
                                <return-type type="void"/>
                                <parameters>
@@ -22952,7 +18496,6 @@
                        <field name="orientation" type="GtkOrientation"/>
                        <field name="style" type="GtkToolbarStyle"/>
                        <field name="icon_size" type="GtkIconSize"/>
-                       <field name="tooltips" type="GtkTooltips*"/>
                        <field name="button_maxw" type="gint"/>
                        <field name="button_maxh" type="gint"/>
                        <field name="style_set" type="guint"/>
@@ -23009,63 +18552,6 @@
                                </parameters>
                        </method>
                </object>
-               <object name="GtkTooltips" parent="GtkObject" type-name="GtkTooltips" get-type="gtk_tooltips_get_type">
-                       <method name="disable" symbol="gtk_tooltips_disable">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tooltips" type="GtkTooltips*"/>
-                               </parameters>
-                       </method>
-                       <method name="enable" symbol="gtk_tooltips_enable">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tooltips" type="GtkTooltips*"/>
-                               </parameters>
-                       </method>
-                       <method name="force_window" symbol="gtk_tooltips_force_window">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tooltips" type="GtkTooltips*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_info_from_tip_window" symbol="gtk_tooltips_get_info_from_tip_window">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="tip_window" type="GtkWindow*"/>
-                                       <parameter name="tooltips" type="GtkTooltips**"/>
-                                       <parameter name="current_widget" type="GtkWidget**"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_tooltips_new">
-                               <return-type type="GtkTooltips*"/>
-                       </constructor>
-                       <method name="set_delay" symbol="gtk_tooltips_set_delay">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tooltips" type="GtkTooltips*"/>
-                                       <parameter name="delay" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_tip" symbol="gtk_tooltips_set_tip">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tooltips" type="GtkTooltips*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="tip_text" type="gchar*"/>
-                                       <parameter name="tip_private" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <field name="tip_window" type="GtkWidget*"/>
-                       <field name="tip_label" type="GtkWidget*"/>
-                       <field name="active_tips_data" type="GtkTooltipsData*"/>
-                       <field name="tips_data_list" type="GList*"/>
-                       <field name="delay" type="guint"/>
-                       <field name="enabled" type="guint"/>
-                       <field name="have_grab" type="guint"/>
-                       <field name="use_sticky_delay" type="guint"/>
-                       <field name="timer_tag" type="gint"/>
-                       <field name="last_popdown" type="GTimeVal"/>
-               </object>
                <object name="GtkTreeModelFilter" parent="GObject" type-name="GtkTreeModelFilter" get-type="gtk_tree_model_filter_get_type">
                        <implements>
                                <interface name="GtkTreeModel"/>
@@ -24309,16 +19795,6 @@
                                        <parameter name="adjustment" type="GtkAdjustment*"/>
                                </parameters>
                        </method>
-                       <method name="tree_to_widget_coords" symbol="gtk_tree_view_tree_to_widget_coords">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tree_view" type="GtkTreeView*"/>
-                                       <parameter name="tx" type="gint"/>
-                                       <parameter name="ty" type="gint"/>
-                                       <parameter name="wx" type="gint*"/>
-                                       <parameter name="wy" type="gint*"/>
-                               </parameters>
-                       </method>
                        <method name="unset_rows_drag_dest" symbol="gtk_tree_view_unset_rows_drag_dest">
                                <return-type type="void"/>
                                <parameters>
@@ -24331,16 +19807,6 @@
                                        <parameter name="tree_view" type="GtkTreeView*"/>
                                </parameters>
                        </method>
-                       <method name="widget_to_tree_coords" symbol="gtk_tree_view_widget_to_tree_coords">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="tree_view" type="GtkTreeView*"/>
-                                       <parameter name="wx" type="gint"/>
-                                       <parameter name="wy" type="gint"/>
-                                       <parameter name="tx" type="gint*"/>
-                                       <parameter name="ty" type="gint*"/>
-                               </parameters>
-                       </method>
                        <property name="enable-grid-lines" type="GtkTreeViewGridLines" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="enable-search" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="enable-tree-lines" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -25084,27 +20550,9 @@
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
                        </implements>
-                       <method name="get_layout_default" symbol="gtk_vbutton_box_get_layout_default">
-                               <return-type type="GtkButtonBoxStyle"/>
-                       </method>
-                       <method name="get_spacing_default" symbol="gtk_vbutton_box_get_spacing_default">
-                               <return-type type="gint"/>
-                       </method>
                        <constructor name="new" symbol="gtk_vbutton_box_new">
                                <return-type type="GtkWidget*"/>
                        </constructor>
-                       <method name="set_layout_default" symbol="gtk_vbutton_box_set_layout_default">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="layout" type="GtkButtonBoxStyle"/>
-                               </parameters>
-                       </method>
-                       <method name="set_spacing_default" symbol="gtk_vbutton_box_set_spacing_default">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="spacing" type="gint"/>
-                               </parameters>
-                       </method>
                </object>
                <object name="GtkVPaned" parent="GtkPaned" type-name="GtkVPaned" get-type="gtk_vpaned_get_type">
                        <implements>
@@ -25363,13 +20811,6 @@
                                        <parameter name="widget_pointer" type="GtkWidget**"/>
                                </parameters>
                        </method>
-                       <method name="draw" symbol="gtk_widget_draw">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="area" type="GdkRectangle*"/>
-                               </parameters>
-                       </method>
                        <method name="ensure_style" symbol="gtk_widget_ensure_style">
                                <return-type type="void"/>
                                <parameters>
@@ -25783,22 +21224,6 @@
                        <method name="push_composite_child" symbol="gtk_widget_push_composite_child">
                                <return-type type="void"/>
                        </method>
-                       <method name="queue_clear" symbol="gtk_widget_queue_clear">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <method name="queue_clear_area" symbol="gtk_widget_queue_clear_area">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
-                               </parameters>
-                       </method>
                        <method name="queue_draw" symbol="gtk_widget_queue_draw">
                                <return-type type="void"/>
                                <parameters>
@@ -25833,12 +21258,6 @@
                                        <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="ref" symbol="gtk_widget_ref">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
                        <method name="region_intersect" symbol="gtk_widget_region_intersect">
                                <return-type type="GdkRegion*"/>
                                <parameters>
@@ -25897,13 +21316,6 @@
                                        <parameter name="event" type="GdkEvent*"/>
                                </parameters>
                        </method>
-                       <method name="set" symbol="gtk_widget_set">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="first_property_name" type="gchar*"/>
-                               </parameters>
-                       </method>
                        <method name="set_accel_path" symbol="gtk_widget_set_accel_path">
                                <return-type type="void"/>
                                <parameters>
@@ -26080,22 +21492,6 @@
                                        <parameter name="custom_window" type="GtkWindow*"/>
                                </parameters>
                        </method>
-                       <method name="set_uposition" symbol="gtk_widget_set_uposition">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="x" type="gint"/>
-                                       <parameter name="y" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_usize" symbol="gtk_widget_set_usize">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
-                               </parameters>
-                       </method>
                        <method name="shape_combine_mask" symbol="gtk_widget_shape_combine_mask">
                                <return-type type="void"/>
                                <parameters>
@@ -26201,12 +21597,6 @@
                                        <parameter name="widget" type="GtkWidget*"/>
                                </parameters>
                        </method>
-                       <method name="unref" symbol="gtk_widget_unref">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                               </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"/>
@@ -27301,15 +22691,6 @@
                                        <parameter name="opacity" type="gdouble"/>
                                </parameters>
                        </method>
-                       <method name="set_policy" symbol="gtk_window_set_policy">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="window" type="GtkWindow*"/>
-                                       <parameter name="allow_shrink" type="gint"/>
-                                       <parameter name="allow_grow" type="gint"/>
-                                       <parameter name="auto_shrink" type="gint"/>
-                               </parameters>
-                       </method>
                        <method name="set_position" symbol="gtk_window_set_position">
                                <return-type type="void"/>
                                <parameters>
@@ -28560,12 +23941,6 @@
                                        <parameter name="chooser" type="GtkRecentChooser*"/>
                                </parameters>
                        </method>
-                       <method name="get_show_numbers" symbol="gtk_recent_chooser_get_show_numbers">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="chooser" type="GtkRecentChooser*"/>
-                               </parameters>
-                       </method>
                        <method name="get_show_private" symbol="gtk_recent_chooser_get_show_private">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -28668,13 +24043,6 @@
                                        <parameter name="show_not_found" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_show_numbers" symbol="gtk_recent_chooser_set_show_numbers">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="chooser" type="GtkRecentChooser*"/>
-                                       <parameter name="show_numbers" type="gboolean"/>
-                               </parameters>
-                       </method>
                        <method name="set_show_private" symbol="gtk_recent_chooser_set_show_private">
                                <return-type type="void"/>
                                <parameters>
@@ -29340,13 +24708,13 @@
                        </vfunc>
                </interface>
                <constant name="GTK_ARG_READWRITE" type="int" value="0"/>
-               <constant name="GTK_BINARY_AGE" type="int" value="1201"/>
+               <constant name="GTK_BINARY_AGE" type="int" value="1203"/>
                <constant name="GTK_BUTTONBOX_DEFAULT" type="int" value="-1"/>
                <constant name="GTK_INPUT_ERROR" type="int" value="-1"/>
-               <constant name="GTK_INTERFACE_AGE" type="int" value="1"/>
+               <constant name="GTK_INTERFACE_AGE" type="int" value="3"/>
                <constant name="GTK_MAJOR_VERSION" type="int" value="2"/>
                <constant name="GTK_MAX_COMPOSE_LEN" type="int" value="7"/>
-               <constant name="GTK_MICRO_VERSION" type="int" value="1"/>
+               <constant name="GTK_MICRO_VERSION" type="int" value="3"/>
                <constant name="GTK_MINOR_VERSION" type="int" value="12"/>
                <constant name="GTK_PAPER_NAME_A3" type="char*" value="iso_a3"/>
                <constant name="GTK_PAPER_NAME_A4" type="char*" value="iso_a4"/>
@@ -29488,9 +24856,5 @@
                <constant name="GTK_STOCK_ZOOM_OUT" type="char*" value="gtk-zoom-out"/>
                <constant name="GTK_TEXT_VIEW_PRIORITY_VALIDATE" type="int" value="5"/>
                <constant name="GTK_TYPE_FUNDAMENTAL_LAST" type="int" value="-1"/>
-               <union name="GtkDitherInfo">
-                       <field name="s" type="gushort[]"/>
-                       <field name="c" type="guchar[]"/>
-               </union>
        </namespace>
 </api>

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 74c0477..1410e13 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -118,7 +118,7 @@ GtkToggleActionEntry is_value_type="1"
 GtkToggleButton::toggled has_emitter="1"
 GtkToolbar.GtkTooltips hidden="1"
 GtkToolbar.gpointer hidden="1"
-GtkToolItem::set_tooltip has_emitter="1"
+GtkToolItem::set_tooltip hidden="1"
 GtkTreeIter is_value_type="1"
 gtk_tree_model_get ellipsis="1" sentinel="-1"
 gtk_tree_model_get_path transfer_ownership="1"

diff --git a/vapi/packages/pango/pango.gi b/vapi/packages/pango/pango.gi
index f7b5836..4f1853c 100644 (file)
--- a/vapi/packages/pango/pango.gi
+++ b/vapi/packages/pango/pango.gi
@@ -161,13 +161,6 @@
                                <parameter name="attrs_len" type="int"/>
                        </parameters>
                </function>
-               <function name="get_mirror_char" symbol="pango_get_mirror_char">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="ch" type="gunichar"/>
-                               <parameter name="mirrored_ch" type="gunichar*"/>
-                       </parameters>
-               </function>
                <function name="gravity_get_for_matrix" symbol="pango_gravity_get_for_matrix">
                        <return-type type="PangoGravity"/>
                        <parameters>
@@ -2699,8 +2692,8 @@
                <constant name="PANGO_UNKNOWN_GLYPH_HEIGHT" type="int" value="14"/>
                <constant name="PANGO_UNKNOWN_GLYPH_WIDTH" type="int" value="10"/>
                <constant name="PANGO_VERSION_MAJOR" type="int" value="1"/>
-               <constant name="PANGO_VERSION_MICRO" type="int" value="0"/>
+               <constant name="PANGO_VERSION_MICRO" type="int" value="1"/>
                <constant name="PANGO_VERSION_MINOR" type="int" value="19"/>
-               <constant name="PANGO_VERSION_STRING" type="char*" value="1.19.0"/>
+               <constant name="PANGO_VERSION_STRING" type="char*" value="1.19.1"/>
        </namespace>
 </api>

diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index ec557b9..2a13c99 100644 (file)
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -267,7 +267,7 @@ namespace Pango {
                public weak Pango.AttrIterator copy ();
                public weak Pango.Attribute get (Pango.AttrType type);
                public weak GLib.SList get_attrs ();
-               public void get_font (Pango.FontDescription desc, out Pango.Language language, GLib.SList extra_attrs);
+               public void get_font (Pango.FontDescription desc, out weak Pango.Language language, GLib.SList extra_attrs);
                public bool next ();
                public void range (int start, int end);
        }
@@ -360,7 +360,7 @@ namespace Pango {
        }
        [CCode (cheader_filename = "pango/pango.h")]
        public class ScriptIter {
-               public void get_range (out string start, out string end, Pango.Script script);
+               public void get_range (out weak string start, out weak string end, Pango.Script script);
                public ScriptIter (string text, int length);
                public bool next ();
        }
@@ -734,7 +734,6 @@ namespace Pango {
        public static void find_paragraph_boundary (string text, int length, int paragraph_delimiter_index, int next_paragraph_start);
        [NoArrayLength]
        public static void get_log_attrs (string text, int length, int level, Pango.Language language, Pango.LogAttr[] log_attrs, int attrs_len);
-       public static bool get_mirror_char (unichar ch, unichar mirrored_ch);
        public static Pango.Gravity gravity_get_for_matrix (out Pango.Matrix matrix);
        public static Pango.Gravity gravity_get_for_script (Pango.Script script, Pango.Gravity base_gravity, Pango.GravityHint hint);
        public static double gravity_to_rotation (Pango.Gravity gravity);
@@ -742,8 +741,8 @@ namespace Pango {
        public static weak GLib.List itemize (Pango.Context context, string text, int start_index, int length, Pango.AttrList attrs, Pango.AttrIterator cached_iter);
        public static weak GLib.List itemize_with_base_dir (Pango.Context context, Pango.Direction base_dir, string text, int start_index, int length, Pango.AttrList attrs, Pango.AttrIterator cached_iter);
        public static uchar log2vis_get_embedding_levels (string text, int length, Pango.Direction pbase_dir);
-       public static bool parse_enum (GLib.Type type, string str, int value, bool warn, out string possible_values);
-       public static bool parse_markup (string markup_text, int length, unichar accel_marker, out Pango.AttrList attr_list, out string text, unichar accel_char) throws GLib.Error;
+       public static bool parse_enum (GLib.Type type, string str, int value, bool warn, out weak string possible_values);
+       public static bool parse_markup (string markup_text, int length, unichar accel_marker, out weak Pango.AttrList attr_list, out weak string text, unichar accel_char) throws GLib.Error;
        public static bool parse_stretch (string str, Pango.Stretch stretch, bool warn);
        public static bool parse_style (string str, Pango.Style style, bool warn);
        public static bool parse_variant (string str, Pango.Variant variant, bool warn);
@@ -751,13 +750,13 @@ namespace Pango {
        public static void quantize_line_geometry (int thickness, int position);
        public static int read_line (GLib.FileStream stream, GLib.String str);
        public static weak GLib.List reorder_items (GLib.List logical_items);
-       public static bool scan_int (out string pos, int @out);
-       public static bool scan_string (out string pos, GLib.String @out);
-       public static bool scan_word (out string pos, GLib.String @out);
+       public static bool scan_int (out weak string pos, int @out);
+       public static bool scan_string (out weak string pos, GLib.String @out);
+       public static bool scan_word (out weak string pos, GLib.String @out);
        public static Pango.Script script_for_unichar (unichar ch);
        public static weak Pango.Language script_get_sample_language (Pango.Script script);
        public static void shape (string text, int length, Pango.Analysis analysis, Pango.GlyphString glyphs);
-       public static bool skip_space (out string pos);
+       public static bool skip_space (out weak string pos);
        public static weak string split_file_list (string str);
        public static weak string trim_string (string str);
        public static Pango.Direction unichar_direction (unichar ch);