use yyleng instead of strlen don't write unnecessary attributes to reduce

2007-04-06  Jürg Billeter  <j@bitron.ch>

	* vala/scanner.l: use yyleng instead of strlen
	* vala/valainterfacewriter.vala: don't write unnecessary attributes to
	  reduce parse time
	* vapi/atk.vala, vapi/gdk-2.0.vala, vapi/gtk+-2.0.vala, vapi/pango.vala:
	  remove unnecessary attributes to reduce parse time

svn path=/trunk/; revision=282

diff --git a/vala/ChangeLog b/vala/ChangeLog
index a42ceab..4fa2559 100644 (file)
--- a/vala/ChangeLog
+++ b/vala/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-06  Jürg Billeter  <j@bitron.ch>
+
+       * vala/scanner.l: use yyleng instead of strlen
+       * vala/valainterfacewriter.vala: don't write unnecessary attributes to
+         reduce parse time
+       * vapi/atk.vala, vapi/gdk-2.0.vala, vapi/gtk+-2.0.vala, vapi/pango.vala:
+         remove unnecessary attributes to reduce parse time
+
 2007-04-05  Jürg Billeter  <j@bitron.ch>
 
        * vala/valacodegenerator.vala, vala/valaforstatement.vala: support

diff --git a/vala/vala/scanner.l b/vala/vala/scanner.l
index ab73ec7..c510973 100644 (file)
--- a/vala/vala/scanner.l
+++ b/vala/vala/scanner.l
@@ -1,6 +1,6 @@
 /* scanner.l
  *
- * Copyright (C) 2006  Jürg Billeter, Raffaele Sandrini
+ * Copyright (C) 2006-2007  Jürg Billeter, Raffaele Sandrini
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
 
 #define YY_DECL int yylex (YYSTYPE *yylval_param, YYLTYPE *yylloc_param, ValaParser *parser)
 
-#define uploc  { yylloc->first_column = yylloc->last_column + 1; yylloc->last_column += strlen (yytext); }
+#define uploc  { yylloc->first_column = yylloc->last_column + 1; yylloc->last_column += yyleng; }
 
 static gboolean file_comment = FALSE;
 %}
@@ -64,7 +64,7 @@ literal                               ({integer_literal}|{real_literal}|{character_literal}|{string_literal
 %%
 
 "/*"                           { uploc; file_comment = (yylineno == 1); BEGIN (IN_COMMENT); }
-<IN_COMMENT>"*/"               { uploc; BEGIN (INITIAL); yytext[strlen (yytext) - 2] = '\0'; vala_parser_push_comment (parser, yytext, file_comment); }
+<IN_COMMENT>"*/"               { uploc; BEGIN (INITIAL); yytext[yyleng - 2] = '\0'; vala_parser_push_comment (parser, yytext, file_comment); }
 <IN_COMMENT>[^*\n]+            { uploc; yymore (); }
 <IN_COMMENT>"*"                        { uploc; yymore (); }
 <IN_COMMENT>\n                 { yylloc->first_line = yylloc->last_line = yylineno; yylloc->first_column = 1; yylloc->last_column = 0; yymore (); }

diff --git a/vala/vala/valainterfacewriter.vala b/vala/vala/valainterfacewriter.vala
index 72b68cc..4204ab9 100644 (file)
--- a/vala/vala/valainterfacewriter.vala
+++ b/vala/vala/valainterfacewriter.vala
@@ -374,8 +374,17 @@ public class Vala.InterfaceWriter : CodeVisitor {
                }
                
                if (m.no_array_length) {
-                       write_indent ();
-                       write_string ("[NoArrayLength]");
+                       bool array_found = (m.return_type != null && m.return_type.data_type is Array);
+                       foreach (FormalParameter param in m.get_parameters ()) {
+                               if (param.type_reference != null && param.type_reference.data_type is Array) {
+                                       array_found = true;
+                                       break;
+                               }
+                       }
+                       if (array_found) {
+                               write_indent ();
+                               write_string ("[NoArrayLength]");
+                       }
                }
                if (m.instance_last) {
                        write_indent ();
@@ -385,8 +394,10 @@ public class Vala.InterfaceWriter : CodeVisitor {
                        write_indent ();
                        write_string ("[InstanceByReference]");
                }
-               write_indent ();
-               write_string ("[CCode (cname = \"%s\")]".printf (m.get_cname ()));
+               if (m.get_cname () != m.get_default_cname ()) {
+                       write_indent ();
+                       write_string ("[CCode (cname = \"%s\")]".printf (m.get_cname ()));
+               }
                
                write_indent ();
                write_string ("public");

diff --git a/vala/vapi/atk.vala b/vala/vapi/atk.vala
index 94545fc..7f28b73 100644 (file)
--- a/vala/vapi/atk.vala
+++ b/vala/vapi/atk.vala
@@ -232,44 +232,20 @@ namespace Atk {
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class GObjectAccessible : Atk.Object {
-               [NoArrayLength]
-               [CCode (cname = "atk_gobject_accessible_for_object")]
                public static weak Atk.Object for_object (GLib.Object obj);
-               [NoArrayLength]
-               [CCode (cname = "atk_gobject_accessible_get_object")]
                public weak GLib.Object get_object ();
-               [NoArrayLength]
-               [CCode (cname = "atk_gobject_accessible_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class Hyperlink : GLib.Object, Atk.Action {
-               [NoArrayLength]
-               [CCode (cname = "atk_hyperlink_get_end_index")]
                public virtual int get_end_index ();
-               [NoArrayLength]
-               [CCode (cname = "atk_hyperlink_get_n_anchors")]
                public virtual int get_n_anchors ();
-               [NoArrayLength]
-               [CCode (cname = "atk_hyperlink_get_object")]
                public virtual weak Atk.Object get_object (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_hyperlink_get_start_index")]
                public virtual int get_start_index ();
-               [NoArrayLength]
-               [CCode (cname = "atk_hyperlink_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_hyperlink_get_uri")]
                public virtual weak string get_uri (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_hyperlink_is_inline")]
                public bool is_inline ();
-               [NoArrayLength]
-               [CCode (cname = "atk_hyperlink_is_selected_link")]
                public virtual bool is_selected_link ();
-               [NoArrayLength]
-               [CCode (cname = "atk_hyperlink_is_valid")]
                public virtual bool is_valid ();
                [NoAccessorMethod]
                public weak bool selected_link { get; }
@@ -281,107 +257,45 @@ namespace Atk {
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class Misc : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "atk_misc_get_instance")]
                public static weak Atk.Misc get_instance ();
-               [NoArrayLength]
-               [CCode (cname = "atk_misc_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_misc_threads_enter")]
                public virtual void threads_enter ();
-               [NoArrayLength]
-               [CCode (cname = "atk_misc_threads_leave")]
                public virtual void threads_leave ();
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class NoOpObject : Atk.Object, Atk.Component, Atk.Action, Atk.EditableText, Atk.Image, Atk.Selection, Atk.Table, Atk.Text, Atk.Hypertext, Atk.Value, Atk.Document {
-               [NoArrayLength]
-               [CCode (cname = "atk_no_op_object_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_no_op_object_new")]
                public NoOpObject (GLib.Object obj);
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class NoOpObjectFactory : Atk.ObjectFactory {
-               [NoArrayLength]
-               [CCode (cname = "atk_no_op_object_factory_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_no_op_object_factory_new")]
                public NoOpObjectFactory ();
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class Object : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "atk_object_add_relationship")]
                public bool add_relationship (Atk.RelationType relationship, Atk.Object target);
-               [NoArrayLength]
-               [CCode (cname = "atk_object_connect_property_change_handler")]
                public virtual uint connect_property_change_handler (Atk.PropertyChangeHandler handler);
-               [NoArrayLength]
-               [CCode (cname = "atk_object_get_attributes")]
                public virtual weak GLib.SList get_attributes ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_get_description")]
                public virtual weak string get_description ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_get_index_in_parent")]
                public virtual int get_index_in_parent ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_get_layer")]
                public virtual Atk.Layer get_layer ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_get_mdi_zorder")]
                public virtual int get_mdi_zorder ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_get_n_accessible_children")]
                public int get_n_accessible_children ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_get_name")]
                public virtual weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_get_parent")]
                public virtual weak Atk.Object get_parent ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_get_role")]
                public virtual Atk.Role get_role ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_initialize")]
                public virtual void initialize (pointer data);
-               [NoArrayLength]
-               [CCode (cname = "atk_object_notify_state_change")]
                public void notify_state_change (Atk.State state, bool value);
-               [NoArrayLength]
-               [CCode (cname = "atk_object_ref_accessible_child")]
                public weak Atk.Object ref_accessible_child (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_object_ref_relation_set")]
                public virtual weak Atk.RelationSet ref_relation_set ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_ref_state_set")]
                public virtual weak Atk.StateSet ref_state_set ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_remove_property_change_handler")]
                public virtual void remove_property_change_handler (uint handler_id);
-               [NoArrayLength]
-               [CCode (cname = "atk_object_remove_relationship")]
                public bool remove_relationship (Atk.RelationType relationship, Atk.Object target);
-               [NoArrayLength]
-               [CCode (cname = "atk_object_set_description")]
                public virtual void set_description (string description);
-               [NoArrayLength]
-               [CCode (cname = "atk_object_set_name")]
                public virtual void set_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "atk_object_set_parent")]
                public virtual void set_parent (Atk.Object parent);
-               [NoArrayLength]
-               [CCode (cname = "atk_object_set_role")]
                public virtual void set_role (Atk.Role role);
                [NoAccessorMethod]
                public weak string atk_object_name_property_name { get; set; }
@@ -422,59 +336,28 @@ namespace Atk {
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class ObjectFactory : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "atk_object_factory_create_accessible")]
                public virtual weak Atk.Object create_accessible (GLib.Object obj);
-               [NoArrayLength]
-               [CCode (cname = "atk_object_factory_get_accessible_type")]
                public virtual GLib.Type get_accessible_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_factory_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_object_factory_invalidate")]
                public virtual void invalidate ();
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class Registry : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "atk_registry_get_factory")]
                public weak Atk.ObjectFactory get_factory (GLib.Type type);
-               [NoArrayLength]
-               [CCode (cname = "atk_registry_get_factory_type")]
                public GLib.Type get_factory_type (GLib.Type type);
-               [NoArrayLength]
-               [CCode (cname = "atk_registry_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_registry_set_factory_type")]
                public void set_factory_type (GLib.Type type, GLib.Type factory_type);
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class Relation : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_add_target")]
                public void add_target (Atk.Object target);
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_get_relation_type")]
                public Atk.RelationType get_relation_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_get_target")]
                public weak GLib.PtrArray get_target ();
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_get_type")]
                public static GLib.Type get_type ();
                [NoArrayLength]
-               [CCode (cname = "atk_relation_new")]
                public Relation (Atk.Object[] targets, int n_targets, Atk.RelationType relationship);
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_type_for_name")]
                public static Atk.RelationType type_for_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_type_get_name")]
                public static weak string type_get_name (Atk.RelationType type);
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_type_register")]
                public static Atk.RelationType type_register (string name);
                [NoAccessorMethod]
                public weak Atk.RelationType relation_type { get; set; }
@@ -483,390 +366,158 @@ namespace Atk {
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class RelationSet : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_set_add")]
                public void add (Atk.Relation relation);
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_set_add_relation_by_type")]
                public void add_relation_by_type (Atk.RelationType relationship, Atk.Object target);
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_set_contains")]
                public bool contains (Atk.RelationType relationship);
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_set_get_n_relations")]
                public int get_n_relations ();
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_set_get_relation")]
                public weak Atk.Relation get_relation (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_set_get_relation_by_type")]
                public weak Atk.Relation get_relation_by_type (Atk.RelationType relationship);
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_set_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_set_new")]
                public RelationSet ();
-               [NoArrayLength]
-               [CCode (cname = "atk_relation_set_remove")]
                public void remove (Atk.Relation relation);
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class StateSet : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "atk_state_set_add_state")]
                public bool add_state (Atk.StateType type);
                [NoArrayLength]
-               [CCode (cname = "atk_state_set_add_states")]
                public void add_states (Atk.StateType[] types, int n_types);
-               [NoArrayLength]
-               [CCode (cname = "atk_state_set_and_sets")]
                public weak Atk.StateSet and_sets (Atk.StateSet compare_set);
-               [NoArrayLength]
-               [CCode (cname = "atk_state_set_clear_states")]
                public void clear_states ();
-               [NoArrayLength]
-               [CCode (cname = "atk_state_set_contains_state")]
                public bool contains_state (Atk.StateType type);
                [NoArrayLength]
-               [CCode (cname = "atk_state_set_contains_states")]
                public bool contains_states (Atk.StateType[] types, int n_types);
-               [NoArrayLength]
-               [CCode (cname = "atk_state_set_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_state_set_is_empty")]
                public bool is_empty ();
-               [NoArrayLength]
-               [CCode (cname = "atk_state_set_new")]
                public StateSet ();
-               [NoArrayLength]
-               [CCode (cname = "atk_state_set_or_sets")]
                public weak Atk.StateSet or_sets (Atk.StateSet compare_set);
-               [NoArrayLength]
-               [CCode (cname = "atk_state_set_remove_state")]
                public bool remove_state (Atk.StateType type);
-               [NoArrayLength]
-               [CCode (cname = "atk_state_set_xor_sets")]
                public weak Atk.StateSet xor_sets (Atk.StateSet compare_set);
        }
        [CCode (cheader_filename = "atk/atk.h")]
        public class Util : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "atk_util_get_type")]
                public static GLib.Type get_type ();
        }
        public interface Action {
-               [NoArrayLength]
-               [CCode (cname = "atk_action_do_action")]
                public virtual bool do_action (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_action_get_description")]
                public virtual weak string get_description (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_action_get_keybinding")]
                public virtual weak string get_keybinding (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_action_get_localized_name")]
                public virtual weak string get_localized_name (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_action_get_n_actions")]
                public virtual int get_n_actions ();
-               [NoArrayLength]
-               [CCode (cname = "atk_action_get_name")]
                public virtual weak string get_name (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_action_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_action_set_description")]
                public virtual bool set_description (int i, string desc);
        }
        public interface Component {
-               [NoArrayLength]
-               [CCode (cname = "atk_component_add_focus_handler")]
                public virtual uint add_focus_handler (Atk.FocusHandler handler);
-               [NoArrayLength]
-               [CCode (cname = "atk_component_contains")]
                public virtual bool contains (int x, int y, Atk.CoordType coord_type);
-               [NoArrayLength]
-               [CCode (cname = "atk_component_get_alpha")]
                public virtual double get_alpha ();
-               [NoArrayLength]
-               [CCode (cname = "atk_component_get_extents")]
                public virtual void get_extents (int x, int y, int width, int height, Atk.CoordType coord_type);
-               [NoArrayLength]
-               [CCode (cname = "atk_component_get_layer")]
                public virtual Atk.Layer get_layer ();
-               [NoArrayLength]
-               [CCode (cname = "atk_component_get_mdi_zorder")]
                public virtual int get_mdi_zorder ();
-               [NoArrayLength]
-               [CCode (cname = "atk_component_get_position")]
                public virtual void get_position (int x, int y, Atk.CoordType coord_type);
-               [NoArrayLength]
-               [CCode (cname = "atk_component_get_size")]
                public virtual void get_size (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "atk_component_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_component_grab_focus")]
                public virtual bool grab_focus ();
-               [NoArrayLength]
-               [CCode (cname = "atk_component_ref_accessible_at_point")]
                public virtual weak Atk.Object ref_accessible_at_point (int x, int y, Atk.CoordType coord_type);
-               [NoArrayLength]
-               [CCode (cname = "atk_component_remove_focus_handler")]
                public virtual void remove_focus_handler (uint handler_id);
-               [NoArrayLength]
-               [CCode (cname = "atk_component_set_extents")]
                public virtual bool set_extents (int x, int y, int width, int height, Atk.CoordType coord_type);
-               [NoArrayLength]
-               [CCode (cname = "atk_component_set_position")]
                public virtual bool set_position (int x, int y, Atk.CoordType coord_type);
-               [NoArrayLength]
-               [CCode (cname = "atk_component_set_size")]
                public virtual bool set_size (int width, int height);
                public signal void bounds_changed (ref Atk.Rectangle bounds);
        }
        public interface Document {
-               [NoArrayLength]
-               [CCode (cname = "atk_document_get_attribute_value")]
                public weak string get_attribute_value (string attribute_name);
-               [NoArrayLength]
-               [CCode (cname = "atk_document_get_attributes")]
                public weak GLib.SList get_attributes ();
-               [NoArrayLength]
-               [CCode (cname = "atk_document_get_document")]
                public virtual pointer get_document ();
-               [NoArrayLength]
-               [CCode (cname = "atk_document_get_document_type")]
                public virtual weak string get_document_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_document_get_locale")]
                public weak string get_locale ();
-               [NoArrayLength]
-               [CCode (cname = "atk_document_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_document_set_attribute_value")]
                public bool set_attribute_value (string attribute_name, string attribute_value);
                public signal void load_complete ();
                public signal void reload ();
                public signal void load_stopped ();
        }
        public interface EditableText {
-               [NoArrayLength]
-               [CCode (cname = "atk_editable_text_copy_text")]
                public virtual void copy_text (int start_pos, int end_pos);
-               [NoArrayLength]
-               [CCode (cname = "atk_editable_text_cut_text")]
                public virtual void cut_text (int start_pos, int end_pos);
-               [NoArrayLength]
-               [CCode (cname = "atk_editable_text_delete_text")]
                public virtual void delete_text (int start_pos, int end_pos);
-               [NoArrayLength]
-               [CCode (cname = "atk_editable_text_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_editable_text_insert_text")]
                public virtual void insert_text (string string, int length, int position);
-               [NoArrayLength]
-               [CCode (cname = "atk_editable_text_paste_text")]
                public virtual void paste_text (int position);
-               [NoArrayLength]
-               [CCode (cname = "atk_editable_text_set_run_attributes")]
                public virtual bool set_run_attributes (GLib.SList attrib_set, int start_offset, int end_offset);
-               [NoArrayLength]
-               [CCode (cname = "atk_editable_text_set_text_contents")]
                public virtual void set_text_contents (string string);
        }
        public interface HyperlinkImpl {
-               [NoArrayLength]
-               [CCode (cname = "atk_hyperlink_impl_get_hyperlink")]
                public virtual weak Atk.Hyperlink get_hyperlink ();
-               [NoArrayLength]
-               [CCode (cname = "atk_hyperlink_impl_get_type")]
                public static GLib.Type get_type ();
        }
        public interface Hypertext {
-               [NoArrayLength]
-               [CCode (cname = "atk_hypertext_get_link")]
                public virtual weak Atk.Hyperlink get_link (int link_index);
-               [NoArrayLength]
-               [CCode (cname = "atk_hypertext_get_link_index")]
                public virtual int get_link_index (int char_index);
-               [NoArrayLength]
-               [CCode (cname = "atk_hypertext_get_n_links")]
                public virtual int get_n_links ();
-               [NoArrayLength]
-               [CCode (cname = "atk_hypertext_get_type")]
                public static GLib.Type get_type ();
                public signal void link_selected (int link_index);
        }
        public interface Image {
-               [NoArrayLength]
-               [CCode (cname = "atk_image_get_image_description")]
                public virtual weak string get_image_description ();
-               [NoArrayLength]
-               [CCode (cname = "atk_image_get_image_locale")]
                public virtual weak string get_image_locale ();
-               [NoArrayLength]
-               [CCode (cname = "atk_image_get_image_position")]
                public virtual void get_image_position (int x, int y, Atk.CoordType coord_type);
-               [NoArrayLength]
-               [CCode (cname = "atk_image_get_image_size")]
                public virtual void get_image_size (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "atk_image_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_image_set_image_description")]
                public virtual bool set_image_description (string description);
        }
        public interface Implementor {
-               [NoArrayLength]
-               [CCode (cname = "atk_implementor_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_implementor_ref_accessible")]
                public virtual weak Atk.Object ref_accessible ();
        }
        public interface Selection {
-               [NoArrayLength]
-               [CCode (cname = "atk_selection_add_selection")]
                public virtual bool add_selection (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_selection_clear_selection")]
                public virtual bool clear_selection ();
-               [NoArrayLength]
-               [CCode (cname = "atk_selection_get_selection_count")]
                public virtual int get_selection_count ();
-               [NoArrayLength]
-               [CCode (cname = "atk_selection_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_selection_is_child_selected")]
                public virtual bool is_child_selected (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_selection_ref_selection")]
                public virtual weak Atk.Object ref_selection (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_selection_remove_selection")]
                public virtual bool remove_selection (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_selection_select_all_selection")]
                public virtual bool select_all_selection ();
                public signal void selection_changed ();
        }
        public interface StreamableContent {
-               [NoArrayLength]
-               [CCode (cname = "atk_streamable_content_get_mime_type")]
                public virtual weak string get_mime_type (int i);
-               [NoArrayLength]
-               [CCode (cname = "atk_streamable_content_get_n_mime_types")]
                public virtual int get_n_mime_types ();
-               [NoArrayLength]
-               [CCode (cname = "atk_streamable_content_get_stream")]
                public virtual weak GLib.IOChannel get_stream (string mime_type);
-               [NoArrayLength]
-               [CCode (cname = "atk_streamable_content_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_streamable_content_get_uri")]
                public virtual weak string get_uri (string mime_type);
        }
        public interface Table {
-               [NoArrayLength]
-               [CCode (cname = "atk_table_add_column_selection")]
                public virtual bool add_column_selection (int column);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_add_row_selection")]
                public virtual bool add_row_selection (int row);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_caption")]
                public virtual weak Atk.Object get_caption ();
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_column_at_index")]
                public virtual int get_column_at_index (int index_);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_column_description")]
                public virtual weak string get_column_description (int column);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_column_extent_at")]
                public virtual int get_column_extent_at (int row, int column);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_column_header")]
                public virtual weak Atk.Object get_column_header (int column);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_index_at")]
                public virtual int get_index_at (int row, int column);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_n_columns")]
                public virtual int get_n_columns ();
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_n_rows")]
                public virtual int get_n_rows ();
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_row_at_index")]
                public virtual int get_row_at_index (int index_);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_row_description")]
                public virtual weak string get_row_description (int row);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_row_extent_at")]
                public virtual int get_row_extent_at (int row, int column);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_row_header")]
                public virtual weak Atk.Object get_row_header (int row);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_selected_columns")]
                public virtual int get_selected_columns (int selected);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_selected_rows")]
                public virtual int get_selected_rows (int selected);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_summary")]
                public virtual weak Atk.Object get_summary ();
-               [NoArrayLength]
-               [CCode (cname = "atk_table_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_table_is_column_selected")]
                public virtual bool is_column_selected (int column);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_is_row_selected")]
                public virtual bool is_row_selected (int row);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_is_selected")]
                public virtual bool is_selected (int row, int column);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_ref_at")]
                public virtual weak Atk.Object ref_at (int row, int column);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_remove_column_selection")]
                public virtual bool remove_column_selection (int column);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_remove_row_selection")]
                public virtual bool remove_row_selection (int row);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_set_caption")]
                public virtual void set_caption (Atk.Object caption);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_set_column_description")]
                public virtual void set_column_description (int column, string description);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_set_column_header")]
                public virtual void set_column_header (int column, Atk.Object header);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_set_row_description")]
                public virtual void set_row_description (int row, string description);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_set_row_header")]
                public virtual void set_row_header (int row, Atk.Object header);
-               [NoArrayLength]
-               [CCode (cname = "atk_table_set_summary")]
                public virtual void set_summary (Atk.Object accessible);
                public signal void row_inserted (int row, int num_inserted);
                public signal void column_inserted (int column, int num_inserted);
@@ -877,80 +528,30 @@ namespace Atk {
                public signal void model_changed ();
        }
        public interface Text {
-               [NoArrayLength]
-               [CCode (cname = "atk_text_add_selection")]
                public virtual bool add_selection (int start_offset, int end_offset);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_attribute_for_name")]
                public static Atk.TextAttribute attribute_for_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_attribute_get_name")]
                public static weak string attribute_get_name (Atk.TextAttribute attr);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_attribute_get_value")]
                public static weak string attribute_get_value (Atk.TextAttribute attr, int index_);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_attribute_register")]
                public static Atk.TextAttribute attribute_register (string name);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_free_ranges")]
                public static void free_ranges (Atk.TextRange ranges);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_bounded_ranges")]
                public virtual weak Atk.TextRange get_bounded_ranges (Atk.TextRectangle rect, Atk.CoordType coord_type, Atk.TextClipType x_clip_type, Atk.TextClipType y_clip_type);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_caret_offset")]
                public virtual int get_caret_offset ();
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_character_at_offset")]
                public virtual unichar get_character_at_offset (int offset);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_character_count")]
                public virtual int get_character_count ();
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_character_extents")]
                public virtual void get_character_extents (int offset, int x, int y, int width, int height, Atk.CoordType coords);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_default_attributes")]
                public virtual weak GLib.SList get_default_attributes ();
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_n_selections")]
                public virtual int get_n_selections ();
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_offset_at_point")]
                public virtual int get_offset_at_point (int x, int y, Atk.CoordType coords);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_range_extents")]
                public virtual void get_range_extents (int start_offset, int end_offset, Atk.CoordType coord_type, Atk.TextRectangle rect);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_run_attributes")]
                public virtual weak GLib.SList get_run_attributes (int offset, int start_offset, int end_offset);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_selection")]
                public virtual weak string get_selection (int selection_num, int start_offset, int end_offset);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_text")]
                public virtual weak string get_text (int start_offset, int end_offset);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_text_after_offset")]
                public virtual weak string get_text_after_offset (int offset, Atk.TextBoundary boundary_type, int start_offset, int end_offset);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_text_at_offset")]
                public virtual weak string get_text_at_offset (int offset, Atk.TextBoundary boundary_type, int start_offset, int end_offset);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_text_before_offset")]
                public virtual weak string get_text_before_offset (int offset, Atk.TextBoundary boundary_type, int start_offset, int end_offset);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_text_remove_selection")]
                public virtual bool remove_selection (int selection_num);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_set_caret_offset")]
                public virtual bool set_caret_offset (int offset);
-               [NoArrayLength]
-               [CCode (cname = "atk_text_set_selection")]
                public virtual bool set_selection (int selection_num, int start_offset, int end_offset);
                public signal void text_changed (int position, int length);
                public signal void text_caret_moved (int location);
@@ -958,31 +559,17 @@ namespace Atk {
                public signal void text_attributes_changed ();
        }
        public interface Value {
-               [NoArrayLength]
-               [CCode (cname = "atk_value_get_current_value")]
                public virtual void get_current_value (GLib.Value value);
-               [NoArrayLength]
-               [CCode (cname = "atk_value_get_maximum_value")]
                public virtual void get_maximum_value (GLib.Value value);
-               [NoArrayLength]
-               [CCode (cname = "atk_value_get_minimum_increment")]
                public virtual void get_minimum_increment (GLib.Value value);
-               [NoArrayLength]
-               [CCode (cname = "atk_value_get_minimum_value")]
                public virtual void get_minimum_value (GLib.Value value);
-               [NoArrayLength]
-               [CCode (cname = "atk_value_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "atk_value_set_current_value")]
                public virtual bool set_current_value (GLib.Value value);
        }
        [ReferenceType]
        public struct Attribute {
                public weak string name;
                public weak string value;
-               [NoArrayLength]
-               [CCode (cname = "atk_attribute_set_free")]
                public static void set_free (GLib.SList attrib_set);
        }
        [ReferenceType]
@@ -1006,8 +593,6 @@ namespace Atk {
                public int y;
                public int width;
                public int height;
-               [NoArrayLength]
-               [CCode (cname = "atk_rectangle_get_type")]
                public static GLib.Type get_type ();
        }
        [ReferenceType]
@@ -1026,23 +611,13 @@ namespace Atk {
        }
        [ReferenceType]
        public struct Focus {
-               [NoArrayLength]
-               [CCode (cname = "atk_focus_tracker_init")]
                public static void tracker_init (Atk.EventListenerInit init);
-               [NoArrayLength]
-               [CCode (cname = "atk_focus_tracker_notify")]
                public static void tracker_notify (Atk.Object object);
        }
        [ReferenceType]
        public struct State {
-               [NoArrayLength]
-               [CCode (cname = "atk_state_type_for_name")]
                public static Atk.StateType type_for_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "atk_state_type_get_name")]
                public static weak string type_get_name (Atk.StateType type);
-               [NoArrayLength]
-               [CCode (cname = "atk_state_type_register")]
                public static Atk.StateType type_register (string name);
        }
        public callback void EventListener (Atk.Object obj);
@@ -1051,49 +626,19 @@ namespace Atk {
        public callback bool Function (pointer data);
        public callback int KeySnoopFunc (Atk.KeyEventStruct event, pointer func_data);
        public callback void PropertyChangeHandler (Atk.Object arg1, Atk.PropertyValues arg2);
-       [NoArrayLength]
-       [CCode (cname = "atk_add_focus_tracker")]
        public static uint add_focus_tracker (Atk.EventListener focus_tracker);
-       [NoArrayLength]
-       [CCode (cname = "atk_add_global_event_listener")]
        public static uint add_global_event_listener (GLib.SignalEmissionHook listener, string event_type);
-       [NoArrayLength]
-       [CCode (cname = "atk_add_key_event_listener")]
        public static uint add_key_event_listener (Atk.KeySnoopFunc listener, pointer data);
-       [NoArrayLength]
-       [CCode (cname = "atk_get_default_registry")]
        public static weak Atk.Registry get_default_registry ();
-       [NoArrayLength]
-       [CCode (cname = "atk_get_focus_object")]
        public static weak Atk.Object get_focus_object ();
-       [NoArrayLength]
-       [CCode (cname = "atk_get_root")]
        public static weak Atk.Object get_root ();
-       [NoArrayLength]
-       [CCode (cname = "atk_get_toolkit_name")]
        public static weak string get_toolkit_name ();
-       [NoArrayLength]
-       [CCode (cname = "atk_get_toolkit_version")]
        public static weak string get_toolkit_version ();
-       [NoArrayLength]
-       [CCode (cname = "atk_remove_focus_tracker")]
        public static void remove_focus_tracker (uint tracker_id);
-       [NoArrayLength]
-       [CCode (cname = "atk_remove_global_event_listener")]
        public static void remove_global_event_listener (uint listener_id);
-       [NoArrayLength]
-       [CCode (cname = "atk_remove_key_event_listener")]
        public static void remove_key_event_listener (uint listener_id);
-       [NoArrayLength]
-       [CCode (cname = "atk_role_for_name")]
        public static Atk.Role role_for_name (string name);
-       [NoArrayLength]
-       [CCode (cname = "atk_role_get_localized_name")]
        public static weak string role_get_localized_name (Atk.Role role);
-       [NoArrayLength]
-       [CCode (cname = "atk_role_get_name")]
        public static weak string role_get_name (Atk.Role role);
-       [NoArrayLength]
-       [CCode (cname = "atk_role_register")]
        public static Atk.Role role_register (string name);
 }

diff --git a/vala/vapi/gdk-2.0.vala b/vala/vapi/gdk-2.0.vala
index 2bc0670..d1af4ea 100644 (file)
--- a/vala/vapi/gdk-2.0.vala
+++ b/vala/vapi/gdk-2.0.vala
@@ -580,201 +580,80 @@ namespace Gdk {
        public class Colormap : GLib.Object {
                public int size;
                public Gdk.Color colors;
-               [NoArrayLength]
-               [CCode (cname = "gdk_colormap_alloc_color")]
                public bool alloc_color (ref Gdk.Color color, bool writeable, bool best_match);
-               [NoArrayLength]
-               [CCode (cname = "gdk_colormap_alloc_colors")]
                public int alloc_colors (ref Gdk.Color colors, int ncolors, bool writeable, bool best_match, bool success);
-               [NoArrayLength]
-               [CCode (cname = "gdk_colormap_free_colors")]
                public void free_colors (ref Gdk.Color colors, int ncolors);
-               [NoArrayLength]
-               [CCode (cname = "gdk_colormap_get_screen")]
                public weak Gdk.Screen get_screen ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_colormap_get_system")]
                public static weak Gdk.Colormap get_system ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_colormap_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_colormap_get_visual")]
                public weak Gdk.Visual get_visual ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_colormap_new")]
                public Colormap (Gdk.Visual visual, bool allocate);
-               [NoArrayLength]
-               [CCode (cname = "gdk_colormap_query_color")]
                public void query_color (ulong pixel, ref Gdk.Color result);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Device : GLib.Object {
                [NoArrayLength]
-               [CCode (cname = "gdk_device_free_history")]
                public static void free_history (Gdk.TimeCoord[] events, int n_events);
-               [NoArrayLength]
-               [CCode (cname = "gdk_device_get_axis")]
                public bool get_axis (double axes, Gdk.AxisUse use, double value);
-               [NoArrayLength]
-               [CCode (cname = "gdk_device_get_core_pointer")]
                public static weak Gdk.Device get_core_pointer ();
                [NoArrayLength]
-               [CCode (cname = "gdk_device_get_history")]
                public bool get_history (Gdk.Window window, uint start, uint stop, Gdk.TimeCoord[] events, int n_events);
-               [NoArrayLength]
-               [CCode (cname = "gdk_device_get_state")]
                public void get_state (Gdk.Window window, double axes, Gdk.ModifierType mask);
-               [NoArrayLength]
-               [CCode (cname = "gdk_device_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_device_set_axis_use")]
                public void set_axis_use (uint index_, Gdk.AxisUse use);
-               [NoArrayLength]
-               [CCode (cname = "gdk_device_set_key")]
                public void set_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
-               [NoArrayLength]
-               [CCode (cname = "gdk_device_set_mode")]
                public bool set_mode (Gdk.InputMode mode);
-               [NoArrayLength]
-               [CCode (cname = "gdk_device_set_source")]
                public void set_source (Gdk.InputSource source);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Display : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_add_client_message_filter")]
                public void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_beep")]
                public void beep ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_close")]
                public void close ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_flush")]
                public void flush ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_core_pointer")]
                public weak Gdk.Device get_core_pointer ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_default")]
                public static weak Gdk.Display get_default ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_default_cursor_size")]
                public uint get_default_cursor_size ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_default_group")]
                public weak Gdk.Window get_default_group ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_default_screen")]
                public virtual weak Gdk.Screen get_default_screen ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_event")]
                public weak Gdk.Event get_event ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_maximal_cursor_size")]
                public void get_maximal_cursor_size (uint width, uint height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_n_screens")]
                public virtual int get_n_screens ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_pointer")]
                public void get_pointer (Gdk.Screen screen, int x, int y, Gdk.ModifierType mask);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_screen")]
                public virtual weak Gdk.Screen get_screen (int screen_num);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_get_window_at_pointer")]
                public weak Gdk.Window get_window_at_pointer (int win_x, int win_y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_keyboard_ungrab")]
                public void keyboard_ungrab (uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_list_devices")]
                public weak GLib.List list_devices ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_open")]
                public static weak Gdk.Display open (string display_name);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_open_default_libgtk_only")]
                public static weak Gdk.Display open_default_libgtk_only ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_peek_event")]
                public weak Gdk.Event peek_event ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_pointer_is_grabbed")]
                public bool pointer_is_grabbed ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_pointer_ungrab")]
                public void pointer_ungrab (uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_put_event")]
                public void put_event (Gdk.Event event);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_request_selection_notification")]
                public bool request_selection_notification (Gdk.Atom selection);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_set_double_click_distance")]
                public void set_double_click_distance (uint distance);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_set_double_click_time")]
                public void set_double_click_time (uint msec);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_set_pointer_hooks")]
                public weak Gdk.DisplayPointerHooks set_pointer_hooks (Gdk.DisplayPointerHooks new_hooks);
                [NoArrayLength]
-               [CCode (cname = "gdk_display_store_clipboard")]
                public void store_clipboard (Gdk.Window clipboard_window, uint time_, Gdk.Atom[] targets, int n_targets);
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_supports_clipboard_persistence")]
                public bool supports_clipboard_persistence ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_supports_cursor_alpha")]
                public bool supports_cursor_alpha ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_supports_cursor_color")]
                public bool supports_cursor_color ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_supports_input_shapes")]
                public bool supports_input_shapes ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_supports_selection_notification")]
                public bool supports_selection_notification ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_supports_shapes")]
                public bool supports_shapes ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_sync")]
                public void sync ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_warp_pointer")]
                public void warp_pointer (Gdk.Screen screen, int x, int y);
                public signal void closed (bool is_error);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class DisplayManager : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_manager_get")]
                public static weak Gdk.DisplayManager @get ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_manager_get_default_display")]
                public weak Gdk.Display get_default_display ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_manager_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_manager_list_displays")]
                public weak GLib.SList list_displays ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_display_manager_set_default_display")]
                public void set_default_display (Gdk.Display display);
                public weak Gdk.Display default_display { get; set; }
                public signal void display_opened (Gdk.Display display);
@@ -790,67 +669,47 @@ namespace Gdk {
                public Gdk.DragAction suggested_action;
                public Gdk.DragAction action;
                public uint start_time;
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_context_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_context_new")]
                public DragContext ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Drawable : GLib.Object {
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_arc")]
                public virtual void draw_arc (Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_drawable")]
                public virtual void draw_drawable (Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_glyphs")]
                public virtual void draw_glyphs (Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_glyphs_transformed")]
                public virtual void draw_glyphs_transformed (Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
                [NoArrayLength]
                [CCode (cname = "gdk_draw_gray_image")]
                public void draw_gray_image (Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, uchar[] buf, int rowstride);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_image")]
                public virtual void draw_image (Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
                [NoArrayLength]
                [CCode (cname = "gdk_draw_indexed_image")]
                public void draw_indexed_image (Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, uchar[] buf, int rowstride, Gdk.RgbCmap cmap);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_layout")]
                public void draw_layout (Gdk.GC gc, int x, int y, Pango.Layout layout);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_layout_line")]
                public void draw_layout_line (Gdk.GC gc, int x, int y, Pango.LayoutLine line);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_layout_line_with_colors")]
                public void draw_layout_line_with_colors (Gdk.GC gc, int x, int y, Pango.LayoutLine line, ref Gdk.Color foreground, ref Gdk.Color background);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_layout_with_colors")]
                public void draw_layout_with_colors (Gdk.GC gc, int x, int y, Pango.Layout layout, ref Gdk.Color foreground, ref Gdk.Color background);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_line")]
                public void draw_line (Gdk.GC gc, int x1_, int y1_, int x2_, int y2_);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_lines")]
                public virtual void draw_lines (Gdk.GC gc, Gdk.Point points, int npoints);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_pixbuf")]
                public virtual void draw_pixbuf (Gdk.GC gc, Gdk.Pixbuf pixbuf, 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);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_point")]
                public void draw_point (Gdk.GC gc, int x, int y);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_points")]
                public virtual void draw_points (Gdk.GC gc, Gdk.Point points, int npoints);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_polygon")]
                public virtual void draw_polygon (Gdk.GC gc, bool filled, Gdk.Point points, int npoints);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_rectangle")]
                public virtual void draw_rectangle (Gdk.GC gc, bool filled, int x, int y, int width, int height);
                [NoArrayLength]
@@ -865,131 +724,53 @@ namespace Gdk {
                [NoArrayLength]
                [CCode (cname = "gdk_draw_rgb_image_dithalign")]
                public void draw_rgb_image_dithalign (Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, uchar[] rgb_buf, int rowstride, int xdith, int ydith);
-               [NoArrayLength]
                [CCode (cname = "gdk_draw_segments")]
                public virtual void draw_segments (Gdk.GC gc, Gdk.Segment segs, int nsegs);
                [NoArrayLength]
                [CCode (cname = "gdk_draw_trapezoids")]
                public virtual void draw_trapezoids (Gdk.GC gc, Gdk.Trapezoid[] trapezoids, int n_trapezoids);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_copy_to_image")]
                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);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_get_clip_region")]
                public virtual weak Gdk.Region get_clip_region ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_get_colormap")]
                public virtual weak Gdk.Colormap get_colormap ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_get_depth")]
                public virtual int get_depth ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_get_display")]
                public weak Gdk.Display get_display ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_get_image")]
                public virtual weak Gdk.Image get_image (int x, int y, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_get_screen")]
                public virtual weak Gdk.Screen get_screen ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_get_size")]
                public virtual void get_size (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_get_visible_region")]
                public virtual weak Gdk.Region get_visible_region ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_get_visual")]
                public virtual weak Gdk.Visual get_visual ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_drawable_set_colormap")]
                public virtual void set_colormap (Gdk.Colormap colormap);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class GC : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_copy")]
                public void copy (Gdk.GC src_gc);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_get_colormap")]
                public weak Gdk.Colormap get_colormap ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_get_screen")]
                public weak Gdk.Screen get_screen ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_get_values")]
                public virtual void get_values (Gdk.GCValues values);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_new")]
                public GC (Gdk.Drawable drawable);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_new_with_values")]
                public GC.with_values (Gdk.Drawable drawable, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_offset")]
                public void offset (int x_offset, int y_offset);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_background")]
                public void set_background (ref Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_clip_mask")]
                public void set_clip_mask (Gdk.Bitmap mask);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_clip_origin")]
                public void set_clip_origin (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_clip_rectangle")]
                public void set_clip_rectangle (ref Gdk.Rectangle rectangle);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_clip_region")]
                public void set_clip_region (Gdk.Region region);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_colormap")]
                public void set_colormap (Gdk.Colormap colormap);
                [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_dashes")]
                public virtual void set_dashes (int dash_offset, char[] dash_list, int n);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_exposures")]
                public void set_exposures (bool exposures);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_fill")]
                public void set_fill (Gdk.Fill fill);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_foreground")]
                public void set_foreground (ref Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_function")]
                public void set_function (Gdk.Function function);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_line_attributes")]
                public void set_line_attributes (int line_width, Gdk.LineStyle line_style, Gdk.CapStyle cap_style, Gdk.JoinStyle join_style);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_rgb_bg_color")]
                public void set_rgb_bg_color (ref Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_rgb_fg_color")]
                public void set_rgb_fg_color (ref Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_stipple")]
                public void set_stipple (Gdk.Pixmap stipple);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_subwindow")]
                public void set_subwindow (Gdk.SubwindowMode mode);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_tile")]
                public void set_tile (Gdk.Pixmap tile);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_ts_origin")]
                public void set_ts_origin (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_gc_set_values")]
                public virtual void set_values (Gdk.GCValues values, Gdk.GCValuesMask values_mask);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
@@ -1005,216 +786,88 @@ namespace Gdk {
                public ushort bits_per_pixel;
                public pointer mem;
                public weak Gdk.Colormap colormap;
-               [NoArrayLength]
-               [CCode (cname = "gdk_image_get_colormap")]
                public weak Gdk.Colormap get_colormap ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_image_get_pixel")]
                public uint get_pixel (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_image_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_image_new")]
                public Image (Gdk.ImageType type, Gdk.Visual visual, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_image_put_pixel")]
                public void put_pixel (int x, int y, uint pixel);
-               [NoArrayLength]
-               [CCode (cname = "gdk_image_set_colormap")]
                public void set_colormap (Gdk.Colormap colormap);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Keymap : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gdk_keymap_get_default")]
                public static weak Gdk.Keymap get_default ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_keymap_get_direction")]
                public Pango.Direction get_direction ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_keymap_get_entries_for_keycode")]
                public bool get_entries_for_keycode (uint hardware_keycode, Gdk.KeymapKey keys, uint keyvals, int n_entries);
                [NoArrayLength]
-               [CCode (cname = "gdk_keymap_get_entries_for_keyval")]
                public bool get_entries_for_keyval (uint keyval, Gdk.KeymapKey[] keys, int n_keys);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keymap_get_for_display")]
                public static weak Gdk.Keymap get_for_display (Gdk.Display display);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keymap_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_keymap_lookup_key")]
                public uint lookup_key (Gdk.KeymapKey key);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keymap_translate_keyboard_state")]
                public bool translate_keyboard_state (uint hardware_keycode, Gdk.ModifierType state, int group, uint keyval, int effective_group, int level, Gdk.ModifierType consumed_modifiers);
                public signal void direction_changed ();
                public signal void keys_changed ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class PangoRenderer : Pango.Renderer {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_renderer_get_default")]
                public static weak Pango.Renderer get_default (Gdk.Screen screen);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_renderer_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_renderer_new")]
                public PangoRenderer (Gdk.Screen screen);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_renderer_set_drawable")]
                public void set_drawable (Gdk.Drawable drawable);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_renderer_set_gc")]
                public void set_gc (Gdk.GC gc);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_renderer_set_override_color")]
                public void set_override_color (Pango.RenderPart part, ref Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_renderer_set_stipple")]
                public void set_stipple (Pango.RenderPart part, Gdk.Bitmap stipple);
                [NoAccessorMethod]
                public weak Gdk.Screen screen { get; construct; }
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Pixbuf : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_add_alpha")]
                public weak Gdk.Pixbuf add_alpha (bool substitute_color, uchar r, uchar g, uchar b);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_composite")]
                public void composite (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, int overall_alpha);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_composite_color")]
                public void composite_color (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, int overall_alpha, int check_x, int check_y, int check_size, uint color1, uint color2);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_composite_color_simple")]
                public weak Gdk.Pixbuf composite_color_simple (int dest_width, int dest_height, Gdk.InterpType interp_type, int overall_alpha, int check_size, uint color1, uint color2);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_copy")]
                public weak Gdk.Pixbuf copy ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_copy_area")]
                public void copy_area (int src_x, int src_y, int width, int height, Gdk.Pixbuf dest_pixbuf, int dest_x, int dest_y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_error_quark")]
                public static GLib.Quark error_quark ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_fill")]
                public void fill (uint pixel);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_flip")]
                public weak Gdk.Pixbuf flip (bool horizontal);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_from_pixdata")]
                public static weak Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_bits_per_sample")]
                public int get_bits_per_sample ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_colorspace")]
                public Gdk.Colorspace get_colorspace ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_file_info")]
                public static weak Gdk.PixbufFormat get_file_info (string filename, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_formats")]
                public static weak GLib.SList get_formats ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_from_drawable")]
                public weak Gdk.Pixbuf get_from_drawable (Gdk.Drawable src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_from_image")]
                public weak Gdk.Pixbuf get_from_image (Gdk.Image src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_has_alpha")]
                public bool get_has_alpha ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_height")]
                public int get_height ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_n_channels")]
                public int get_n_channels ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_option")]
                public weak string get_option (string key);
                [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_pixels")]
                public weak uchar[] get_pixels ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_rowstride")]
                public int get_rowstride ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_get_width")]
                public int get_width ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_new")]
                public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
                [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_new_from_data")]
                public Pixbuf.from_data (uchar[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify destroy_fn, pointer destroy_fn_data);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_new_from_file")]
                public Pixbuf.from_file (string filename, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_new_from_file_at_scale")]
                public Pixbuf.from_file_at_scale (string filename, int width, int height, bool preserve_aspect_ratio, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_new_from_file_at_size")]
                public Pixbuf.from_file_at_size (string filename, int width, int height, GLib.Error error);
                [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_new_from_inline")]
                public Pixbuf.from_inline (int data_length, uchar[] data, bool copy_pixels, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_new_from_xpm_data")]
                public Pixbuf.from_xpm_data (string data);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_new_subpixbuf")]
                public Pixbuf.subpixbuf (int src_x, int src_y, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_render_pixmap_and_mask")]
                public void render_pixmap_and_mask (Gdk.Pixmap pixmap_return, Gdk.Bitmap mask_return, int alpha_threshold);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_render_pixmap_and_mask_for_colormap")]
                public void render_pixmap_and_mask_for_colormap (Gdk.Colormap colormap, Gdk.Pixmap pixmap_return, Gdk.Bitmap mask_return, int alpha_threshold);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_render_threshold_alpha")]
                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);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_rotate_simple")]
                public weak Gdk.Pixbuf rotate_simple (Gdk.PixbufRotation angle);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_saturate_and_pixelate")]
                public void saturate_and_pixelate (Gdk.Pixbuf dest, float saturation, bool pixelate);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_save")]
                public bool save (string filename, string type, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_save_to_buffer")]
                public bool save_to_buffer (string buffer, ulong buffer_size, string type, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_save_to_bufferv")]
                public bool save_to_bufferv (string buffer, ulong buffer_size, string type, string option_keys, string option_values, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_save_to_callback")]
                public bool save_to_callback (Gdk.PixbufSaveFunc save_func, pointer user_data, string type, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_save_to_callbackv")]
                public bool save_to_callbackv (Gdk.PixbufSaveFunc save_func, pointer user_data, string type, string option_keys, string option_values, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_savev")]
                public bool savev (string filename, string type, string option_keys, string option_values, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_scale")]
                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);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_scale_simple")]
                public weak Gdk.Pixbuf scale_simple (int dest_width, int dest_height, Gdk.InterpType interp_type);
                [NoAccessorMethod]
                public weak int n_channels { get; set; }
@@ -1235,104 +888,51 @@ namespace Gdk {
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class PixbufAnimation : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_get_height")]
                public int get_height ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_get_iter")]
                public weak Gdk.PixbufAnimationIter get_iter (GLib.TimeVal start_time);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_get_static_image")]
                public weak Gdk.Pixbuf get_static_image ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_get_width")]
                public int get_width ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_is_static_image")]
                public bool is_static_image ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_new_from_file")]
                public PixbufAnimation.from_file (string filename, GLib.Error error);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class PixbufAnimationIter : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_iter_advance")]
                public bool advance (GLib.TimeVal current_time);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_iter_get_delay_time")]
                public int get_delay_time ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_iter_get_pixbuf")]
                public weak Gdk.Pixbuf get_pixbuf ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_iter_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_animation_iter_on_currently_loading_frame")]
                public bool on_currently_loading_frame ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class PixbufAniAnim : Gdk.PixbufAnimation {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_ani_anim_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class PixbufAniAnimIter : Gdk.PixbufAnimationIter {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_ani_anim_iter_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class PixbufGifAnim : Gdk.PixbufAnimation {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_gif_anim_frame_composite")]
                public void frame_composite (Gdk.PixbufFrame frame);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_gif_anim_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class PixbufGifAnimIter : Gdk.PixbufAnimationIter {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_gif_anim_iter_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class PixbufLoader : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_loader_close")]
                public bool close (GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_loader_get_animation")]
                public weak Gdk.PixbufAnimation get_animation ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_loader_get_format")]
                public weak Gdk.PixbufFormat get_format ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_loader_get_pixbuf")]
                public weak Gdk.Pixbuf get_pixbuf ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_loader_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_loader_new")]
                public PixbufLoader ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_loader_new_with_mime_type")]
                public PixbufLoader.with_mime_type (string mime_type, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_loader_new_with_type")]
                public PixbufLoader.with_type (string image_type, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_loader_set_size")]
                public void set_size (int width, int height);
                [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_loader_write")]
                public bool write (uchar[] buf, ulong count, GLib.Error error);
                public signal void size_prepared (int width, int height);
                public signal void area_prepared ();
@@ -1341,170 +941,64 @@ namespace Gdk {
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class PixbufSimpleAnim : Gdk.PixbufAnimation {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_simple_anim_add_frame")]
                public void add_frame (Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_simple_anim_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_simple_anim_iter_get_type")]
                public static GLib.Type iter_get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_simple_anim_new")]
                public PixbufSimpleAnim (int width, int height, float rate);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Pixmap : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_colormap_create_from_xpm")]
                public static weak Gdk.Pixmap colormap_create_from_xpm (Gdk.Drawable drawable, Gdk.Colormap colormap, Gdk.Bitmap mask, ref Gdk.Color transparent_color, string filename);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_colormap_create_from_xpm_d")]
                public static weak Gdk.Pixmap colormap_create_from_xpm_d (Gdk.Drawable drawable, Gdk.Colormap colormap, Gdk.Bitmap mask, ref Gdk.Color transparent_color, string data);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_create_from_data")]
                public static weak Gdk.Pixmap create_from_data (Gdk.Drawable drawable, string data, int width, int height, int depth, ref Gdk.Color fg, ref Gdk.Color bg);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_create_from_xpm")]
                public static weak Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, Gdk.Bitmap mask, ref Gdk.Color transparent_color, string filename);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_create_from_xpm_d")]
                public static weak Gdk.Pixmap create_from_xpm_d (Gdk.Drawable drawable, Gdk.Bitmap mask, ref Gdk.Color transparent_color, string data);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_foreign_new")]
                public static weak Gdk.Pixmap foreign_new (pointer anid);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_foreign_new_for_display")]
                public static weak Gdk.Pixmap foreign_new_for_display (Gdk.Display display, pointer anid);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_foreign_new_for_screen")]
                public static weak Gdk.Pixmap foreign_new_for_screen (Gdk.Screen screen, pointer anid, int width, int height, int depth);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_lookup")]
                public static weak Gdk.Pixmap lookup (pointer anid);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_lookup_for_display")]
                public static weak Gdk.Pixmap lookup_for_display (Gdk.Display display, pointer anid);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixmap_new")]
                public Pixmap (Gdk.Drawable drawable, int width, int height, int depth);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Screen : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_broadcast_client_message")]
                public void broadcast_client_message (Gdk.Event event);
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_active_window")]
                public weak Gdk.Window get_active_window ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_default")]
                public static weak Gdk.Screen get_default ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_default_colormap")]
                public weak Gdk.Colormap get_default_colormap ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_display")]
                public weak Gdk.Display get_display ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_font_options")]
                public pointer get_font_options ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_height")]
                public int get_height ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_height_mm")]
                public int get_height_mm ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_monitor_at_point")]
                public int get_monitor_at_point (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_monitor_at_window")]
                public int get_monitor_at_window (Gdk.Window window);
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_monitor_geometry")]
                public void get_monitor_geometry (int monitor_num, ref Gdk.Rectangle dest);
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_n_monitors")]
                public int get_n_monitors ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_number")]
                public int get_number ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_resolution")]
                public double get_resolution ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_rgb_colormap")]
                public weak Gdk.Colormap get_rgb_colormap ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_rgb_visual")]
                public weak Gdk.Visual get_rgb_visual ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_rgba_colormap")]
                public weak Gdk.Colormap get_rgba_colormap ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_rgba_visual")]
                public weak Gdk.Visual get_rgba_visual ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_root_window")]
                public weak Gdk.Window get_root_window ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_setting")]
                public bool get_setting (string name, GLib.Value value);
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_system_colormap")]
                public weak Gdk.Colormap get_system_colormap ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_system_visual")]
                public weak Gdk.Visual get_system_visual ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_toplevel_windows")]
                public weak GLib.List get_toplevel_windows ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_width")]
                public int get_width ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_width_mm")]
                public int get_width_mm ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_get_window_stack")]
                public weak GLib.List get_window_stack ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_height")]
                public static int height ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_height_mm")]
                public static int height_mm ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_is_composited")]
                public bool is_composited ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_list_visuals")]
                public weak GLib.List list_visuals ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_make_display_name")]
                public weak string make_display_name ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_set_default_colormap")]
                public void set_default_colormap (Gdk.Colormap colormap);
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_set_font_options")]
                public void set_font_options (pointer options);
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_set_resolution")]
                public void set_resolution (double dpi);
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_width")]
                public static int width ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_screen_width_mm")]
                public static int width_mm ();
                public weak pointer font_options { get; set; }
                public weak double resolution { get; set; }
@@ -1513,360 +1007,128 @@ namespace Gdk {
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Visual : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gdk_visual_get_best")]
                public static weak Gdk.Visual get_best ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_visual_get_best_depth")]
                public static int get_best_depth ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_visual_get_best_type")]
                public static Gdk.VisualType get_best_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_visual_get_best_with_both")]
                public static weak Gdk.Visual get_best_with_both (int depth, Gdk.VisualType visual_type);
-               [NoArrayLength]
-               [CCode (cname = "gdk_visual_get_best_with_depth")]
                public static weak Gdk.Visual get_best_with_depth (int depth);
-               [NoArrayLength]
-               [CCode (cname = "gdk_visual_get_best_with_type")]
                public static weak Gdk.Visual get_best_with_type (Gdk.VisualType visual_type);
-               [NoArrayLength]
-               [CCode (cname = "gdk_visual_get_screen")]
                public weak Gdk.Screen get_screen ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_visual_get_system")]
                public static weak Gdk.Visual get_system ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_visual_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Window : Gdk.Drawable {
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_add_filter")]
                public void add_filter (Gdk.FilterFunc function, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_at_pointer")]
                public static weak Gdk.Window at_pointer (int win_x, int win_y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_begin_move_drag")]
                public void begin_move_drag (int button, int root_x, int root_y, uint timestamp);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_begin_paint_rect")]
                public void begin_paint_rect (ref Gdk.Rectangle rectangle);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_begin_paint_region")]
                public void begin_paint_region (Gdk.Region region);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_begin_resize_drag")]
                public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint timestamp);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_clear")]
                public void clear ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_clear_area")]
                public void clear_area (int x, int y, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_clear_area_e")]
                public void clear_area_e (int x, int y, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_configure_finished")]
                public void configure_finished ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_constrain_size")]
                public static void constrain_size (Gdk.Geometry geometry, uint @flags, int width, int height, int new_width, int new_height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_deiconify")]
                public void deiconify ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_destroy")]
                public void destroy ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_enable_synchronized_configure")]
                public void enable_synchronized_configure ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_end_paint")]
                public void end_paint ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_focus")]
                public void focus (uint timestamp);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_foreign_new")]
                public static weak Gdk.Window foreign_new (pointer anid);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_foreign_new_for_display")]
                public static weak Gdk.Window foreign_new_for_display (Gdk.Display display, pointer anid);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_freeze_updates")]
                public void freeze_updates ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_fullscreen")]
                public void fullscreen ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_children")]
                public weak GLib.List get_children ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_decorations")]
                public bool get_decorations (Gdk.WMDecoration decorations);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_events")]
                public Gdk.EventMask get_events ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_frame_extents")]
                public void get_frame_extents (ref Gdk.Rectangle rect);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_geometry")]
                public void get_geometry (int x, int y, int width, int height, int depth);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_group")]
                public weak Gdk.Window get_group ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_internal_paint_info")]
                public void get_internal_paint_info (Gdk.Drawable real_drawable, int x_offset, int y_offset);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_origin")]
                public int get_origin (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_parent")]
                public weak Gdk.Window get_parent ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_pointer")]
                public weak Gdk.Window get_pointer (int x, int y, Gdk.ModifierType mask);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_position")]
                public void get_position (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_root_origin")]
                public void get_root_origin (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_state")]
                public Gdk.WindowState get_state ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_toplevel")]
                public weak Gdk.Window get_toplevel ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_toplevels")]
                public static weak GLib.List get_toplevels ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_type_hint")]
                public Gdk.WindowTypeHint get_type_hint ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_update_area")]
                public weak Gdk.Region get_update_area ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_user_data")]
                public void get_user_data (pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_get_window_type")]
                public Gdk.WindowType get_window_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_hide")]
                public void hide ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_iconify")]
                public void iconify ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_input_shape_combine_mask")]
                public void input_shape_combine_mask (Gdk.Bitmap mask, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_input_shape_combine_region")]
                public void input_shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_invalidate_maybe_recurse")]
                public void invalidate_maybe_recurse (Gdk.Region region, Gdk.invalidate_maybe_recurseChildFunc child_func, pointer user_data);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_invalidate_rect")]
                public void invalidate_rect (ref Gdk.Rectangle rect, bool invalidate_children);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_invalidate_region")]
                public void invalidate_region (Gdk.Region region, bool invalidate_children);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_is_viewable")]
                public bool is_viewable ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_is_visible")]
                public bool is_visible ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_lookup")]
                public static weak Gdk.Window lookup (pointer anid);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_lookup_for_display")]
                public static weak Gdk.Window lookup_for_display (Gdk.Display display, pointer anid);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_lower")]
                public void lower ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_maximize")]
                public void maximize ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_merge_child_input_shapes")]
                public void merge_child_input_shapes ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_merge_child_shapes")]
                public void merge_child_shapes ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_move")]
                public void move (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_move_region")]
                public void move_region (Gdk.Region region, int dx, int dy);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_move_resize")]
                public void move_resize (int x, int y, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_new")]
                public Window (ref Gdk.WindowAttr attributes, int attributes_mask);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_peek_children")]
                public weak GLib.List peek_children ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_process_all_updates")]
                public static void process_all_updates ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_process_updates")]
                public void process_updates (bool update_children);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_raise")]
                public void raise ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_register_dnd")]
                public void register_dnd ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_remove_filter")]
                public void remove_filter (Gdk.FilterFunc function, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_reparent")]
                public void reparent (Gdk.Window new_parent, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_resize")]
                public void resize (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_scroll")]
                public void scroll (int dx, int dy);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_accept_focus")]
                public void set_accept_focus (bool accept_focus);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_back_pixmap")]
                public void set_back_pixmap (Gdk.Pixmap pixmap, bool parent_relative);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_background")]
                public void set_background (ref Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_child_input_shapes")]
                public void set_child_input_shapes ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_child_shapes")]
                public void set_child_shapes ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_cursor")]
                public void set_cursor (Gdk.Cursor cursor);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_debug_updates")]
                public static void set_debug_updates (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_decorations")]
                public void set_decorations (Gdk.WMDecoration decorations);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_events")]
                public void set_events (Gdk.EventMask event_mask);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_focus_on_map")]
                public void set_focus_on_map (bool focus_on_map);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_functions")]
                public void set_functions (Gdk.WMFunction functions);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_geometry_hints")]
                public void set_geometry_hints (Gdk.Geometry geometry, Gdk.WindowHints geom_mask);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_group")]
                public void set_group (Gdk.Window leader);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_icon")]
                public void set_icon (Gdk.Window icon_window, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_icon_list")]
                public void set_icon_list (GLib.List pixbufs);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_icon_name")]
                public void set_icon_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_keep_above")]
                public void set_keep_above (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_keep_below")]
                public void set_keep_below (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_modal_hint")]
                public void set_modal_hint (bool modal);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_override_redirect")]
                public void set_override_redirect (bool override_redirect);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_role")]
                public void set_role (string role);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_skip_pager_hint")]
                public void set_skip_pager_hint (bool skips_pager);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_skip_taskbar_hint")]
                public void set_skip_taskbar_hint (bool skips_taskbar);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_static_gravities")]
                public bool set_static_gravities (bool use_static);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_title")]
                public void set_title (string title);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_transient_for")]
                public void set_transient_for (Gdk.Window parent);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_type_hint")]
                public void set_type_hint (Gdk.WindowTypeHint hint);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_urgency_hint")]
                public void set_urgency_hint (bool urgent);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_set_user_data")]
                public void set_user_data (pointer user_data);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_shape_combine_mask")]
                public void shape_combine_mask (Gdk.Bitmap mask, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_shape_combine_region")]
                public void shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_show")]
                public void show ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_show_unraised")]
                public void show_unraised ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_stick")]
                public void stick ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_thaw_updates")]
                public void thaw_updates ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_unfullscreen")]
                public void unfullscreen ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_unmaximize")]
                public void unmaximize ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_unstick")]
                public void unstick ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_withdraw")]
                public void withdraw ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Bitmap : GLib.Object {
                public weak GLib.Object parent_instance;
-               [NoArrayLength]
-               [CCode (cname = "gdk_bitmap_create_from_data")]
                public static weak Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height);
        }
        [ReferenceType]
@@ -1892,61 +1154,29 @@ namespace Gdk {
                public ushort red;
                public ushort green;
                public ushort blue;
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gdk_color_copy")]
                public Gdk.Color copy ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gdk_color_equal")]
                public bool equal (ref Gdk.Color colorb);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gdk_color_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_color_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gdk_color_hash")]
                public uint hash ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_color_parse")]
                public static bool parse (string spec, ref Gdk.Color color);
        }
        [ReferenceType]
        public struct Cursor {
                public Gdk.CursorType type;
-               [NoArrayLength]
-               [CCode (cname = "gdk_cursor_get_display")]
                public weak Gdk.Display get_display ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_cursor_get_image")]
                public weak Gdk.Pixbuf get_image ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_cursor_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_cursor_new")]
                public Cursor (Gdk.CursorType cursor_type);
-               [NoArrayLength]
-               [CCode (cname = "gdk_cursor_new_for_display")]
                public Cursor.for_display (Gdk.Display display, Gdk.CursorType cursor_type);
-               [NoArrayLength]
-               [CCode (cname = "gdk_cursor_new_from_name")]
                public Cursor.from_name (Gdk.Display display, string name);
-               [NoArrayLength]
-               [CCode (cname = "gdk_cursor_new_from_pixbuf")]
                public Cursor.from_pixbuf (Gdk.Display display, Gdk.Pixbuf pixbuf, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_cursor_new_from_pixmap")]
                public Cursor.from_pixmap (Gdk.Pixmap source, Gdk.Pixmap mask, ref Gdk.Color fg, ref Gdk.Color bg, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_cursor_ref")]
                public weak Gdk.Cursor @ref ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_cursor_unref")]
                public void unref ();
        }
        [ReferenceType]
@@ -2216,46 +1446,24 @@ namespace Gdk {
        public struct PangoAttrEmbossed {
                public weak Pango.Attribute attr;
                public bool embossed;
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_attr_embossed_new")]
                public PangoAttrEmbossed (bool embossed);
        }
        [ReferenceType]
        public struct PangoAttrStipple {
                public weak Pango.Attribute attr;
                public weak Gdk.Bitmap stipple;
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_attr_stipple_new")]
                public PangoAttrStipple (Gdk.Bitmap stipple);
        }
        [ReferenceType]
        public struct PixbufFormat {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_format_get_description")]
                public weak string get_description ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_format_get_extensions")]
                public weak string get_extensions ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_format_get_license")]
                public weak string get_license ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_format_get_mime_types")]
                public weak string get_mime_types ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_format_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_format_is_disabled")]
                public bool is_disabled ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_format_is_scalable")]
                public bool is_scalable ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_format_is_writable")]
                public bool is_writable ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixbuf_format_set_disabled")]
                public void set_disabled (bool disabled);
        }
        [ReferenceType]
@@ -2281,16 +1489,9 @@ namespace Gdk {
                public uint height;
                public uchar pixel_data;
                [NoArrayLength]
-               [CCode (cname = "gdk_pixdata_deserialize")]
                public bool deserialize (uint stream_length, uchar[] stream, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixdata_from_pixbuf")]
                public pointer from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixdata_serialize")]
                public uchar serialize (uint stream_length_p);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pixdata_to_csource")]
                public weak GLib.String to_csource (string name, Gdk.PixdataDumpType dump_type);
        }
        [ReferenceType]
@@ -2312,16 +1513,10 @@ namespace Gdk {
                public int y;
                public int width;
                public int height;
-               [NoArrayLength]
-               [CCode (cname = "gdk_rectangle_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gdk_rectangle_intersect")]
                public bool intersect (ref Gdk.Rectangle src2, ref Gdk.Rectangle dest);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gdk_rectangle_union")]
                public void union (ref Gdk.Rectangle src2, ref Gdk.Rectangle dest);
        }
        [ReferenceType]
@@ -2330,62 +1525,26 @@ namespace Gdk {
                public long numRects;
                public weak Gdk.RegionBox rects;
                public weak Gdk.RegionBox extents;
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_copy")]
                public weak Gdk.Region copy ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_destroy")]
                public void destroy ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_empty")]
                public bool empty ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_equal")]
                public bool equal (Gdk.Region region2);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_get_clipbox")]
                public void get_clipbox (ref Gdk.Rectangle rectangle);
                [NoArrayLength]
-               [CCode (cname = "gdk_region_get_rectangles")]
                public void get_rectangles (Gdk.Rectangle[] rectangles, int n_rectangles);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_intersect")]
                public void intersect (Gdk.Region source2);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_new")]
                public Region ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_offset")]
                public void offset (int dx, int dy);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_point_in")]
                public bool point_in (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_polygon")]
                public static weak Gdk.Region polygon (Gdk.Point points, int npoints, Gdk.FillRule fill_rule);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_rect_in")]
                public Gdk.OverlapType rect_in (ref Gdk.Rectangle rectangle);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_rectangle")]
                public static weak Gdk.Region rectangle (ref Gdk.Rectangle rectangle);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_shrink")]
                public void shrink (int dx, int dy);
                [NoArrayLength]
-               [CCode (cname = "gdk_region_spans_intersect_foreach")]
                public void spans_intersect_foreach (Gdk.Span[] spans, int n_spans, bool sorted, Gdk.SpanFunc function, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_subtract")]
                public void subtract (Gdk.Region source2);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_union")]
                public void union (Gdk.Region source2);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_union_with_rect")]
                public void union_with_rect (ref Gdk.Rectangle rect);
-               [NoArrayLength]
-               [CCode (cname = "gdk_region_xor")]
                public void xor (Gdk.Region source2);
        }
        [ReferenceType]
@@ -2399,11 +1558,8 @@ namespace Gdk {
        public struct RgbCmap {
                public uint colors;
                public int n_colors;
-               [NoArrayLength]
-               [CCode (cname = "gdk_rgb_cmap_free")]
                public void free ();
                [NoArrayLength]
-               [CCode (cname = "gdk_rgb_cmap_new")]
                public RgbCmap (uint[] colors, int n_colors);
        }
        [ReferenceType]
@@ -2477,8 +1633,6 @@ namespace Gdk {
                public uint focus_on_map;
                public uint shaped;
                public Gdk.EventMask event_mask;
-               [NoArrayLength]
-               [CCode (cname = "gdk_window_object_get_type")]
                public static GLib.Type get_type ();
        }
        [ReferenceType]
@@ -2491,35 +1645,17 @@ namespace Gdk {
        public struct ScanLineListBlock {
        }
        public struct Atom {
-               [NoArrayLength]
-               [CCode (cname = "gdk_atom_intern")]
                public static Gdk.Atom intern (string atom_name, bool only_if_exists);
-               [NoArrayLength]
-               [CCode (cname = "gdk_atom_intern_static_string")]
                public static Gdk.Atom intern_static_string (string atom_name);
-               [NoArrayLength]
-               [CCode (cname = "gdk_atom_name")]
                public weak string name ();
        }
        [ReferenceType]
        public struct Cairo {
-               [NoArrayLength]
-               [CCode (cname = "gdk_cairo_create")]
                public static weak Cairo.Context create (Gdk.Drawable drawable);
-               [NoArrayLength]
-               [CCode (cname = "gdk_cairo_rectangle")]
                public static void rectangle (Cairo.Context cr, ref Gdk.Rectangle rectangle);
-               [NoArrayLength]
-               [CCode (cname = "gdk_cairo_region")]
                public static void region (Cairo.Context cr, Gdk.Region region);
-               [NoArrayLength]
-               [CCode (cname = "gdk_cairo_set_source_color")]
                public static void set_source_color (Cairo.Context cr, ref Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gdk_cairo_set_source_pixbuf")]
                public static void set_source_pixbuf (Cairo.Context cr, Gdk.Pixbuf pixbuf, double pixbuf_x, double pixbuf_y);
-               [NoArrayLength]
-               [CCode (cname = "gdk_cairo_set_source_pixmap")]
                public static void set_source_pixmap (Cairo.Context cr, Gdk.Pixmap pixmap, double pixmap_x, double pixmap_y);
        }
        [ReferenceType]
@@ -2530,116 +1666,48 @@ namespace Gdk {
        }
        [ReferenceType]
        public struct Drag {
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_abort")]
                public static void abort (Gdk.DragContext context, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_begin")]
                public static weak Gdk.DragContext begin (Gdk.Window window, GLib.List targets);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_drop")]
                public static void drop (Gdk.DragContext context, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_drop_succeeded")]
                public static bool drop_succeeded (Gdk.DragContext context);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_find_window")]
                public static void find_window (Gdk.DragContext context, Gdk.Window drag_window, int x_root, int y_root, Gdk.Window dest_window, Gdk.DragProtocol protocol);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_find_window_for_screen")]
                public static void find_window_for_screen (Gdk.DragContext context, Gdk.Window drag_window, Gdk.Screen screen, int x_root, int y_root, Gdk.Window dest_window, Gdk.DragProtocol protocol);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_get_protocol")]
                public static uint get_protocol (uint xid, Gdk.DragProtocol protocol);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_get_protocol_for_display")]
                public static uint get_protocol_for_display (Gdk.Display display, uint xid, Gdk.DragProtocol protocol);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_get_selection")]
                public static Gdk.Atom get_selection (Gdk.DragContext context);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_motion")]
                public static bool motion (Gdk.DragContext context, Gdk.Window dest_window, Gdk.DragProtocol protocol, int x_root, int y_root, Gdk.DragAction suggested_action, Gdk.DragAction possible_actions, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drag_status")]
                public static void status (Gdk.DragContext context, Gdk.DragAction action, uint time_);
        }
        [ReferenceType]
        public struct Drop {
-               [NoArrayLength]
-               [CCode (cname = "gdk_drop_finish")]
                public static void finish (Gdk.DragContext context, bool success, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gdk_drop_reply")]
                public static void reply (Gdk.DragContext context, bool ok, uint time_);
        }
        [ReferenceType]
        public struct Error {
-               [NoArrayLength]
-               [CCode (cname = "gdk_error_trap_pop")]
                public static int trap_pop ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_error_trap_push")]
                public static void trap_push ();
        }
        [ReferenceType]
        public struct Event {
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_copy")]
                public weak Gdk.Event copy ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_get")]
                public static weak Gdk.Event @get ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_get_axis")]
                public bool get_axis (Gdk.AxisUse axis_use, double value);
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_get_coords")]
                public bool get_coords (double x_win, double y_win);
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_get_graphics_expose")]
                public static weak Gdk.Event get_graphics_expose (Gdk.Window window);
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_get_root_coords")]
                public bool get_root_coords (double x_root, double y_root);
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_get_screen")]
                public weak Gdk.Screen get_screen ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_get_state")]
                public bool get_state (Gdk.ModifierType state);
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_get_time")]
                public uint get_time ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_handler_set")]
                public static void handler_set (Gdk.EventFunc func, pointer data, GLib.DestroyNotify notify);
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_new")]
                public Event (Gdk.EventType type);
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_peek")]
                public static weak Gdk.Event peek ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_put")]
                public void put ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_send_client_message")]
                public bool send_client_message (pointer winid);
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_send_client_message_for_display")]
                public static bool send_client_message_for_display (Gdk.Display display, Gdk.Event event, pointer winid);
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_send_clientmessage_toall")]
                public void send_clientmessage_toall ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_event_set_screen")]
                public void set_screen (Gdk.Screen screen);
        }
        [ReferenceType]
@@ -2647,194 +1715,97 @@ namespace Gdk {
        }
        [ReferenceType]
        public struct Input {
-               [NoArrayLength]
-               [CCode (cname = "gdk_input_set_extension_events")]
                public static void set_extension_events (Gdk.Window window, int mask, Gdk.ExtensionMode mode);
        }
        [ReferenceType]
        public struct Keyboard {
-               [NoArrayLength]
-               [CCode (cname = "gdk_keyboard_grab")]
                public static Gdk.GrabStatus grab (Gdk.Window window, bool owner_events, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keyboard_grab_info_libgtk_only")]
                public static bool grab_info_libgtk_only (Gdk.Display display, Gdk.Window grab_window, bool owner_events);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keyboard_ungrab")]
                public static void ungrab (uint time_);
        }
        [ReferenceType]
        public struct Keyval {
-               [NoArrayLength]
-               [CCode (cname = "gdk_keyval_convert_case")]
                public static void convert_case (uint symbol, uint lower, uint upper);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keyval_from_name")]
                public static uint from_name (string keyval_name);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keyval_is_lower")]
                public static bool is_lower (uint keyval);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keyval_is_upper")]
                public static bool is_upper (uint keyval);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keyval_name")]
                public static weak string name (uint keyval);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keyval_to_lower")]
                public static uint to_lower (uint keyval);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keyval_to_unicode")]
                public static uint to_unicode (uint keyval);
-               [NoArrayLength]
-               [CCode (cname = "gdk_keyval_to_upper")]
                public static uint to_upper (uint keyval);
        }
        [ReferenceType]
        public struct Pango {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_context_get")]
                public static weak Pango.Context context_get ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_context_get_for_screen")]
                public static weak Pango.Context context_get_for_screen (Gdk.Screen screen);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_layout_get_clip_region")]
                public static weak Gdk.Region layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pango_layout_line_get_clip_region")]
                public static weak Gdk.Region layout_line_get_clip_region (Pango.LayoutLine line, int x_origin, int y_origin, int index_ranges, int n_ranges);
        }
        [ReferenceType]
        public struct Pointer {
-               [NoArrayLength]
-               [CCode (cname = "gdk_pointer_grab")]
                public static Gdk.GrabStatus grab (Gdk.Window window, bool owner_events, Gdk.EventMask event_mask, Gdk.Window confine_to, Gdk.Cursor cursor, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pointer_grab_info_libgtk_only")]
                public static bool grab_info_libgtk_only (Gdk.Display display, Gdk.Window grab_window, bool owner_events);
-               [NoArrayLength]
-               [CCode (cname = "gdk_pointer_is_grabbed")]
                public static bool is_grabbed ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_pointer_ungrab")]
                public static void ungrab (uint time_);
        }
        [ReferenceType]
        public struct Property {
                [NoArrayLength]
-               [CCode (cname = "gdk_property_change")]
                public static void change (Gdk.Window window, Gdk.Atom property, Gdk.Atom type, int format, Gdk.PropMode mode, uchar[] data, int nelements);
-               [NoArrayLength]
-               [CCode (cname = "gdk_property_delete")]
                public static void delete (Gdk.Window window, Gdk.Atom property);
                [NoArrayLength]
-               [CCode (cname = "gdk_property_get")]
                public static bool @get (Gdk.Window window, Gdk.Atom property, Gdk.Atom type, ulong offset, ulong length, int pdelete, ref Gdk.Atom actual_property_type, int actual_format, int actual_length, uchar[] data);
        }
        [ReferenceType]
        public struct Query {
-               [NoArrayLength]
-               [CCode (cname = "gdk_query_depths")]
                public static void depths (int depths, int count);
-               [NoArrayLength]
-               [CCode (cname = "gdk_query_visual_types")]
                public static void visual_types (Gdk.VisualType visual_types, int count);
        }
        [ReferenceType]
        public struct Rgb {
-               [NoArrayLength]
-               [CCode (cname = "gdk_rgb_colormap_ditherable")]
                public static bool colormap_ditherable (Gdk.Colormap cmap);
-               [NoArrayLength]
-               [CCode (cname = "gdk_rgb_ditherable")]
                public static bool ditherable ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_rgb_find_color")]
                public static void find_color (Gdk.Colormap colormap, ref Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gdk_rgb_get_colormap")]
                public static weak Gdk.Colormap get_colormap ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_rgb_get_visual")]
                public static weak Gdk.Visual get_visual ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_rgb_set_install")]
                public static void set_install (bool install);
-               [NoArrayLength]
-               [CCode (cname = "gdk_rgb_set_min_colors")]
                public static void set_min_colors (int min_colors);
-               [NoArrayLength]
-               [CCode (cname = "gdk_rgb_set_verbose")]
                public static void set_verbose (bool verbose);
        }
        [ReferenceType]
        public struct Selection {
-               [NoArrayLength]
-               [CCode (cname = "gdk_selection_convert")]
                public static void convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gdk_selection_owner_get")]
                public static weak Gdk.Window owner_get (Gdk.Atom selection);
-               [NoArrayLength]
-               [CCode (cname = "gdk_selection_owner_get_for_display")]
                public static weak Gdk.Window owner_get_for_display (Gdk.Display display, Gdk.Atom selection);
-               [NoArrayLength]
-               [CCode (cname = "gdk_selection_owner_set")]
                public static bool owner_set (Gdk.Window owner, Gdk.Atom selection, uint time_, bool send_event);
-               [NoArrayLength]
-               [CCode (cname = "gdk_selection_owner_set_for_display")]
                public static bool owner_set_for_display (Gdk.Display display, Gdk.Window owner, Gdk.Atom selection, uint time_, bool send_event);
                [NoArrayLength]
-               [CCode (cname = "gdk_selection_property_get")]
                public static bool property_get (Gdk.Window requestor, uchar[] data, ref Gdk.Atom prop_type, int prop_format);
-               [NoArrayLength]
-               [CCode (cname = "gdk_selection_send_notify")]
                public static void send_notify (uint requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gdk_selection_send_notify_for_display")]
                public static void send_notify_for_display (Gdk.Display display, uint requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint time_);
        }
        [ReferenceType]
        public struct Spawn {
-               [NoArrayLength]
-               [CCode (cname = "gdk_spawn_command_line_on_screen")]
                public static bool command_line_on_screen (Gdk.Screen screen, string command_line, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_spawn_on_screen")]
                public static bool 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, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gdk_spawn_on_screen_with_pipes")]
                public static bool 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, GLib.Error error);
        }
        [ReferenceType]
        public struct Text {
                [NoArrayLength]
-               [CCode (cname = "gdk_text_property_to_text_list")]
                public static int property_to_text_list (Gdk.Atom encoding, int format, uchar[] text, int length, string list);
                [NoArrayLength]
-               [CCode (cname = "gdk_text_property_to_text_list_for_display")]
                public static int property_to_text_list_for_display (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
                [NoArrayLength]
-               [CCode (cname = "gdk_text_property_to_utf8_list")]
                public static int property_to_utf8_list (Gdk.Atom encoding, int format, uchar[] text, int length, string list);
                [NoArrayLength]
-               [CCode (cname = "gdk_text_property_to_utf8_list_for_display")]
                public static int property_to_utf8_list_for_display (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
        }
        [ReferenceType]
        public struct Threads {
-               [NoArrayLength]
-               [CCode (cname = "gdk_threads_enter")]
                public static void enter ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_threads_init")]
                public static void init ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_threads_leave")]
                public static void leave ();
-               [NoArrayLength]
-               [CCode (cname = "gdk_threads_set_lock_functions")]
                public static void set_lock_functions (GLib.Callback enter_fn, GLib.Callback leave_fn);
        }
        public callback void DestroyNotify (pointer data);
@@ -2845,82 +1816,33 @@ namespace Gdk {
        public callback bool PixbufSaveFunc (string buf, ulong count, GLib.Error error, pointer data);
        public callback void SpanFunc (Gdk.Span span, pointer data);
        public callback bool invalidate_maybe_recurseChildFunc (Gdk.Window arg1, pointer data);
-       [NoArrayLength]
-       [CCode (cname = "gdk_add_client_message_filter")]
        public static void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, pointer data);
-       [NoArrayLength]
-       [CCode (cname = "gdk_add_option_entries_libgtk_only")]
        public static void add_option_entries_libgtk_only (GLib.OptionGroup group);
-       [NoArrayLength]
-       [CCode (cname = "gdk_devices_list")]
        public static weak GLib.List devices_list ();
-       [NoArrayLength]
-       [CCode (cname = "gdk_events_pending")]
        public static bool events_pending ();
        [NoArrayLength]
-       [CCode (cname = "gdk_free_compound_text")]
        public static void free_compound_text (uchar[] ctext);
-       [NoArrayLength]
-       [CCode (cname = "gdk_free_text_list")]
        public static void free_text_list (string list);
-       [NoArrayLength]
-       [CCode (cname = "gdk_get_default_root_window")]
        public static weak Gdk.Window get_default_root_window ();
-       [NoArrayLength]
-       [CCode (cname = "gdk_get_display")]
        public static weak string get_display ();
-       [NoArrayLength]
-       [CCode (cname = "gdk_get_display_arg_name")]
        public static weak string get_display_arg_name ();
-       [NoArrayLength]
-       [CCode (cname = "gdk_get_program_class")]
        public static weak string get_program_class ();
-       [NoArrayLength]
-       [CCode (cname = "gdk_get_show_events")]
        public static bool get_show_events ();
-       [NoArrayLength]
-       [CCode (cname = "gdk_init_check")]
        public static bool init_check (int argc, string argv);
-       [NoArrayLength]
-       [CCode (cname = "gdk_list_visuals")]
        public static weak GLib.List list_visuals ();
-       [NoArrayLength]
-       [CCode (cname = "gdk_notify_startup_complete")]
        public static void notify_startup_complete ();
-       [NoArrayLength]
-       [CCode (cname = "gdk_parse_args")]
        public static void parse_args (int argc, string argv);
-       [NoArrayLength]
-       [CCode (cname = "gdk_pre_parse_libgtk_only")]
        public static void pre_parse_libgtk_only ();
-       [NoArrayLength]
-       [CCode (cname = "gdk_set_double_click_time")]
        public static void set_double_click_time (uint msec);
-       [NoArrayLength]
-       [CCode (cname = "gdk_set_locale")]
        public static weak string set_locale ();
-       [NoArrayLength]
-       [CCode (cname = "gdk_set_pointer_hooks")]
        public static weak Gdk.PointerHooks set_pointer_hooks (Gdk.PointerHooks new_hooks);
-       [NoArrayLength]
-       [CCode (cname = "gdk_set_program_class")]
        public static void set_program_class (string program_class);
-       [NoArrayLength]
-       [CCode (cname = "gdk_set_show_events")]
        public static void set_show_events (bool show_events);
-       [NoArrayLength]
-       [CCode (cname = "gdk_set_sm_client_id")]
        public static void set_sm_client_id (string sm_client_id);
-       [NoArrayLength]
-       [CCode (cname = "gdk_setting_get")]
        public static bool setting_get (string name, GLib.Value value);
        [NoArrayLength]
-       [CCode (cname = "gdk_string_to_compound_text")]
        public static int string_to_compound_text (string str, ref Gdk.Atom encoding, int format, uchar[] ctext, int length);
        [NoArrayLength]
-       [CCode (cname = "gdk_string_to_compound_text_for_display")]
        public static int string_to_compound_text_for_display (Gdk.Display display, string str, ref Gdk.Atom encoding, int format, uchar[] ctext, int length);
-       [NoArrayLength]
-       [CCode (cname = "gdk_unicode_to_keyval")]
        public static uint unicode_to_keyval (uint wc);
 }

diff --git a/vala/vapi/gtk+-2.0.vala b/vala/vapi/gtk+-2.0.vala
index 6bb91d6..022e6c0 100644 (file)
--- a/vala/vapi/gtk+-2.0.vala
+++ b/vala/vapi/gtk+-2.0.vala
@@ -870,101 +870,37 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class AboutDialog : Gtk.Dialog {
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_artists")]
                public weak string get_artists ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_authors")]
                public weak string get_authors ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_comments")]
                public weak string get_comments ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_copyright")]
                public weak string get_copyright ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_documenters")]
                public weak string get_documenters ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_license")]
                public weak string get_license ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_logo")]
                public weak Gdk.Pixbuf get_logo ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_logo_icon_name")]
                public weak string get_logo_icon_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_translator_credits")]
                public weak string get_translator_credits ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_version")]
                public weak string get_version ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_website")]
                public weak string get_website ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_website_label")]
                public weak string get_website_label ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_get_wrap_license")]
                public bool get_wrap_license ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_new")]
                public AboutDialog ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_artists")]
                public void set_artists (string artists);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_authors")]
                public void set_authors (string authors);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_comments")]
                public void set_comments (string comments);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_copyright")]
                public void set_copyright (string copyright);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_documenters")]
                public void set_documenters (string documenters);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_email_hook")]
                public static Gtk.AboutDialogActivateLinkFunc set_email_hook (Gtk.AboutDialogActivateLinkFunc func, pointer data, GLib.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_license")]
                public void set_license (string license);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_logo")]
                public void set_logo (Gdk.Pixbuf logo);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_logo_icon_name")]
                public void set_logo_icon_name (string icon_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_name")]
                public void set_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_translator_credits")]
                public void set_translator_credits (string translator_credits);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_url_hook")]
                public static Gtk.AboutDialogActivateLinkFunc set_url_hook (Gtk.AboutDialogActivateLinkFunc func, pointer data, GLib.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_version")]
                public void set_version (string version);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_website")]
                public void set_website (string website);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_website_label")]
                public void set_website_label (string website_label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_about_dialog_set_wrap_license")]
                public void set_wrap_license (bool wrap_license);
                public weak string name { get; set; }
                public weak string version { get; set; }
@@ -983,67 +919,29 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class AccelGroup : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_activate")]
                public bool activate (GLib.Quark accel_quark, GLib.Object acceleratable, uint accel_key, Gdk.ModifierType accel_mods);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_connect")]
                public void connect (uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags, GLib.Closure closure);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_connect_by_path")]
                public void connect_by_path (string accel_path, GLib.Closure closure);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_disconnect")]
                public bool disconnect (GLib.Closure closure);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_disconnect_key")]
                public bool disconnect_key (uint accel_key, Gdk.ModifierType accel_mods);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_find")]
                public weak Gtk.AccelKey find (Gtk.AccelGroupFindFunc find_func, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_from_accel_closure")]
                public static weak Gtk.AccelGroup from_accel_closure (GLib.Closure closure);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_lock")]
                public void @lock ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_new")]
                public AccelGroup ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_query")]
                public weak Gtk.AccelGroupEntry query (uint accel_key, Gdk.ModifierType accel_mods, uint n_entries);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_group_unlock")]
                public void unlock ();
                public signal bool accel_activate (GLib.Object p0, uint p1, Gdk.ModifierType p2);
                public signal void accel_changed (uint keyval, Gdk.ModifierType modifier, GLib.Closure accel_closure);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class AccelLabel : Gtk.Label {
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_label_get_accel_widget")]
                public weak Gtk.Widget get_accel_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_label_get_accel_width")]
                public uint get_accel_width ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_label_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_label_new")]
                public AccelLabel (string string);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_label_refetch")]
                public bool refetch ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_label_set_accel_closure")]
                public void set_accel_closure (GLib.Closure accel_closure);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_label_set_accel_widget")]
                public void set_accel_widget (Gtk.Widget accel_widget);
                [NoAccessorMethod]
                public weak GLib.Closure accel_closure { get; set; }
@@ -1051,132 +949,52 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class AccelMap : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_add_entry")]
                public static void add_entry (string accel_path, uint accel_key, Gdk.ModifierType accel_mods);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_add_filter")]
                public static void add_filter (string filter_pattern);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_change_entry")]
                public static bool change_entry (string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool replace);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_foreach")]
                public static void @foreach (pointer data, Gtk.AccelMapForeach foreach_func);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_foreach_unfiltered")]
                public static void foreach_unfiltered (pointer data, Gtk.AccelMapForeach foreach_func);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_get")]
                public static weak Gtk.AccelMap @get ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_load")]
                public static void load (string file_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_load_fd")]
                public static void load_fd (int fd);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_load_scanner")]
                public static void load_scanner (GLib.Scanner scanner);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_lock_path")]
                public static void lock_path (string accel_path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_lookup_entry")]
                public static bool lookup_entry (string accel_path, Gtk.AccelKey key);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_save")]
                public static void save (string file_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_save_fd")]
                public static void save_fd (int fd);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_map_unlock_path")]
                public static void unlock_path (string accel_path);
                public signal void changed (string p0, uint p1, Gdk.ModifierType p2);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Accessible : Atk.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_accessible_connect_widget_destroyed")]
                public virtual void connect_widget_destroyed ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_accessible_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Action : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_block_activate_from")]
                public void block_activate_from (Gtk.Widget proxy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_connect_accelerator")]
                public void connect_accelerator ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_connect_proxy")]
                public virtual void connect_proxy (Gtk.Widget proxy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_create_icon")]
                public weak Gtk.Widget create_icon (Gtk.IconSize icon_size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_create_menu_item")]
                public virtual weak Gtk.Widget create_menu_item ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_create_tool_item")]
                public virtual weak Gtk.Widget create_tool_item ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_disconnect_accelerator")]
                public void disconnect_accelerator ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_disconnect_proxy")]
                public virtual void disconnect_proxy (Gtk.Widget proxy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_get_accel_closure")]
                public GLib.Closure get_accel_closure ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_get_accel_path")]
                public weak string get_accel_path ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_get_proxies")]
                public weak GLib.SList get_proxies ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_get_sensitive")]
                public bool get_sensitive ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_get_visible")]
                public bool get_visible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_is_sensitive")]
                public bool is_sensitive ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_is_visible")]
                public bool is_visible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_new")]
                public Action (string name, string label, string tooltip, string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_set_accel_group")]
                public void set_accel_group (Gtk.AccelGroup accel_group);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_set_accel_path")]
                public void set_accel_path (string accel_path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_set_sensitive")]
                public void set_sensitive (bool sensitive);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_set_visible")]
                public void set_visible (bool visible);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_unblock_activate_from")]
                public void unblock_activate_from (Gtk.Widget proxy);
                [NoAccessorMethod]
                public weak string name { get; construct; }
@@ -1209,68 +1027,32 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ActionGroup : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_add_action")]
                public void add_action (Gtk.Action action);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_add_action_with_accel")]
                public void add_action_with_accel (Gtk.Action action, string accelerator);
                [NoArrayLength]
-               [CCode (cname = "gtk_action_group_add_actions")]
                public void add_actions (Gtk.ActionEntry[] entries, uint n_entries, pointer user_data);
                [NoArrayLength]
-               [CCode (cname = "gtk_action_group_add_actions_full")]
                public void add_actions_full (Gtk.ActionEntry[] entries, uint n_entries, pointer user_data, GLib.DestroyNotify destroy);
                [NoArrayLength]
-               [CCode (cname = "gtk_action_group_add_radio_actions")]
                public void add_radio_actions (Gtk.RadioActionEntry[] entries, uint n_entries, int value, GLib.Callback on_change, pointer user_data);
                [NoArrayLength]
-               [CCode (cname = "gtk_action_group_add_radio_actions_full")]
                public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, uint n_entries, int value, GLib.Callback on_change, pointer user_data, GLib.DestroyNotify destroy);
                [NoArrayLength]
-               [CCode (cname = "gtk_action_group_add_toggle_actions")]
                public void add_toggle_actions (Gtk.ToggleActionEntry[] entries, uint n_entries, pointer user_data);
                [NoArrayLength]
-               [CCode (cname = "gtk_action_group_add_toggle_actions_full")]
                public void add_toggle_actions_full (Gtk.ToggleActionEntry[] entries, uint n_entries, pointer user_data, GLib.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_get_action")]
                public virtual weak Gtk.Action get_action (string action_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_get_sensitive")]
                public bool get_sensitive ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_get_visible")]
                public bool get_visible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_list_actions")]
                public weak GLib.List list_actions ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_new")]
                public ActionGroup (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_remove_action")]
                public void remove_action (Gtk.Action action);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_set_sensitive")]
                public void set_sensitive (bool sensitive);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_set_translate_func")]
                public void set_translate_func (Gtk.TranslateFunc func, pointer data, Gtk.DestroyNotify notify);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_set_translation_domain")]
                public void set_translation_domain (string domain);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_set_visible")]
                public void set_visible (bool visible);
-               [NoArrayLength]
-               [CCode (cname = "gtk_action_group_translate_string")]
                public weak string translate_string (string string);
                [NoAccessorMethod]
                public weak string name { get; construct; }
@@ -1283,20 +1065,10 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Adjustment : Gtk.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_adjustment_clamp_page")]
                public void clamp_page (double lower, double upper);
-               [NoArrayLength]
-               [CCode (cname = "gtk_adjustment_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_adjustment_get_value")]
                public double get_value ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_adjustment_new")]
                public Adjustment (double value, double lower, double upper, double step_increment, double page_increment, double page_size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_adjustment_set_value")]
                public void set_value (double value);
                public weak double value { get; set; }
                [NoAccessorMethod]
@@ -1316,20 +1088,10 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Alignment : Gtk.Bin {
-               [NoArrayLength]
-               [CCode (cname = "gtk_alignment_get_padding")]
                public void get_padding (uint padding_top, uint padding_bottom, uint padding_left, uint padding_right);
-               [NoArrayLength]
-               [CCode (cname = "gtk_alignment_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_alignment_new")]
                public Alignment (float xalign, float yalign, float xscale, float yscale);
-               [NoArrayLength]
-               [CCode (cname = "gtk_alignment_set")]
                public void @set (float xalign, float yalign, float xscale, float yscale);
-               [NoArrayLength]
-               [CCode (cname = "gtk_alignment_set_padding")]
                public void set_padding (uint padding_top, uint padding_bottom, uint padding_left, uint padding_right);
                [NoAccessorMethod]
                public weak float xalign { get; set; }
@@ -1350,14 +1112,8 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Arrow : Gtk.Misc {
-               [NoArrayLength]
-               [CCode (cname = "gtk_arrow_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_arrow_new")]
                public Arrow (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_arrow_set")]
                public void @set (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
                [NoAccessorMethod]
                public weak Gtk.ArrowType arrow_type { get; set; }
@@ -1366,14 +1122,8 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class AspectFrame : Gtk.Frame {
-               [NoArrayLength]
-               [CCode (cname = "gtk_aspect_frame_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_aspect_frame_new")]
                public AspectFrame (string label, float xalign, float yalign, float ratio, bool obey_child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_aspect_frame_set")]
                public void @set (float xalign, float yalign, float ratio, bool obey_child);
                [NoAccessorMethod]
                public weak float xalign { get; set; }
@@ -1386,74 +1136,28 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Assistant : Gtk.Window {
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_add_action_widget")]
                public void add_action_widget (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_append_page")]
                public int append_page (Gtk.Widget page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_get_current_page")]
                public int get_current_page ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_get_n_pages")]
                public int get_n_pages ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_get_nth_page")]
                public weak Gtk.Widget get_nth_page (int page_num);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_get_page_complete")]
                public bool get_page_complete (Gtk.Widget page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_get_page_header_image")]
                public weak Gdk.Pixbuf get_page_header_image (Gtk.Widget page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_get_page_side_image")]
                public weak Gdk.Pixbuf get_page_side_image (Gtk.Widget page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_get_page_title")]
                public weak string get_page_title (Gtk.Widget page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_get_page_type")]
                public Gtk.AssistantPageType get_page_type (Gtk.Widget page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_insert_page")]
                public int insert_page (Gtk.Widget page, int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_new")]
                public Assistant ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_prepend_page")]
                public int prepend_page (Gtk.Widget page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_remove_action_widget")]
                public void remove_action_widget (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_set_current_page")]
                public void set_current_page (int page_num);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_set_forward_page_func")]
                public void set_forward_page_func (Gtk.AssistantPageFunc page_func, pointer data, GLib.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_set_page_complete")]
                public void set_page_complete (Gtk.Widget page, bool complete);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_set_page_header_image")]
                public void set_page_header_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_set_page_side_image")]
                public void set_page_side_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_set_page_title")]
                public void set_page_title (Gtk.Widget page, string title);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_set_page_type")]
                public void set_page_type (Gtk.Widget page, Gtk.AssistantPageType type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_assistant_update_buttons_state")]
                public void update_buttons_state ();
                public signal void cancel ();
                public signal void prepare (Gtk.Widget page);
@@ -1462,122 +1166,50 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Bin : Gtk.Container {
-               [NoArrayLength]
-               [CCode (cname = "gtk_bin_get_child")]
                public weak Gtk.Widget get_child ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_bin_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Box : Gtk.Container {
                public weak GLib.List children;
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_get_homogeneous")]
                public bool get_homogeneous ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_get_spacing")]
                public int get_spacing ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_pack_end")]
                public void pack_end (Gtk.Widget child, bool expand, bool fill, uint padding);
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_pack_end_defaults")]
                public void pack_end_defaults (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_pack_start")]
                public void pack_start (Gtk.Widget child, bool expand, bool fill, uint padding);
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_pack_start_defaults")]
                public void pack_start_defaults (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_query_child_packing")]
                public void query_child_packing (Gtk.Widget child, bool expand, bool fill, uint padding, Gtk.PackType pack_type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_reorder_child")]
                public void reorder_child (Gtk.Widget child, int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_set_child_packing")]
                public void set_child_packing (Gtk.Widget child, bool expand, bool fill, uint padding, Gtk.PackType pack_type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_set_homogeneous")]
                public void set_homogeneous (bool homogeneous);
-               [NoArrayLength]
-               [CCode (cname = "gtk_box_set_spacing")]
                public void set_spacing (int spacing);
                public weak int spacing { get; set; }
                public weak bool homogeneous { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Button : Gtk.Bin {
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_action_get_type")]
                public static GLib.Type action_get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_get_alignment")]
                public void get_alignment (float xalign, float yalign);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_get_focus_on_click")]
                public bool get_focus_on_click ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_get_image")]
                public weak Gtk.Widget get_image ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_get_image_position")]
                public Gtk.PositionType get_image_position ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_get_label")]
                public weak string get_label ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_get_relief")]
                public Gtk.ReliefStyle get_relief ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_get_use_stock")]
                public bool get_use_stock ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_get_use_underline")]
                public bool get_use_underline ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_new")]
                public Button ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_new_from_stock")]
                public Button.from_stock (string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_new_with_label")]
                public Button.with_label (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_new_with_mnemonic")]
                public Button.with_mnemonic (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_set_alignment")]
                public void set_alignment (float xalign, float yalign);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_set_focus_on_click")]
                public void set_focus_on_click (bool focus_on_click);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_set_image")]
                public void set_image (Gtk.Widget image);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_set_image_position")]
                public void set_image_position (Gtk.PositionType position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_set_label")]
                public void set_label (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_set_relief")]
                public void set_relief (Gtk.ReliefStyle newstyle);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_set_use_stock")]
                public void set_use_stock (bool use_stock);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_set_use_underline")]
                public void set_use_underline (bool use_underline);
                public weak string label { get; set construct; }
                public weak bool use_underline { get; set construct; }
@@ -1604,55 +1236,25 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ButtonBox : Gtk.Box {
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_box_get_child_secondary")]
                public bool get_child_secondary (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_box_get_layout")]
                public Gtk.ButtonBoxStyle get_layout ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_box_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_box_set_child_secondary")]
                public void set_child_secondary (Gtk.Widget child, bool is_secondary);
-               [NoArrayLength]
-               [CCode (cname = "gtk_button_box_set_layout")]
                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 Calendar : Gtk.Widget {
-               [NoArrayLength]
-               [CCode (cname = "gtk_calendar_clear_marks")]
                public void clear_marks ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_calendar_get_date")]
                public void get_date (uint year, uint month, uint day);
-               [NoArrayLength]
-               [CCode (cname = "gtk_calendar_get_display_options")]
                public Gtk.CalendarDisplayOptions get_display_options ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_calendar_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_calendar_mark_day")]
                public bool mark_day (uint day);
-               [NoArrayLength]
-               [CCode (cname = "gtk_calendar_new")]
                public Calendar ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_calendar_select_day")]
                public void select_day (uint day);
-               [NoArrayLength]
-               [CCode (cname = "gtk_calendar_select_month")]
                public bool select_month (uint month, uint year);
-               [NoArrayLength]
-               [CCode (cname = "gtk_calendar_set_display_options")]
                public void set_display_options (Gtk.CalendarDisplayOptions @flags);
-               [NoArrayLength]
-               [CCode (cname = "gtk_calendar_unmark_day")]
                public bool unmark_day (uint day);
                [NoAccessorMethod]
                public weak int year { get; set; }
@@ -1678,29 +1280,13 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CellRenderer : Gtk.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_activate")]
                public virtual bool activate (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState @flags);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_get_fixed_size")]
                public void get_fixed_size (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_get_size")]
                public virtual void get_size (Gtk.Widget widget, Gdk.Rectangle cell_area, int x_offset, int y_offset, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_render")]
                public virtual void render (Gdk.Window window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState @flags);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_set_fixed_size")]
                public void set_fixed_size (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_start_editing")]
                public virtual weak Gtk.CellEditable start_editing (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState @flags);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_stop_editing")]
                public void stop_editing (bool canceled);
                [NoAccessorMethod]
                public weak Gtk.CellRendererMode mode { get; set; }
@@ -1733,11 +1319,7 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CellRendererAccel : Gtk.CellRendererText {
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_accel_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_accel_new")]
                public CellRendererAccel ();
                [NoAccessorMethod]
                public weak uint accel_key { get; set; }
@@ -1752,11 +1334,7 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CellRendererCombo : Gtk.CellRendererText {
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_combo_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_combo_new")]
                public CellRendererCombo ();
                [NoAccessorMethod]
                public weak Gtk.TreeModel model { get; set; }
@@ -1767,11 +1345,7 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CellRendererPixbuf : Gtk.CellRenderer {
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_pixbuf_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_pixbuf_new")]
                public CellRendererPixbuf ();
                [NoAccessorMethod]
                public weak Gdk.Pixbuf pixbuf { get; set; }
@@ -1792,11 +1366,7 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CellRendererProgress : Gtk.CellRenderer {
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_progress_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_progress_new")]
                public CellRendererProgress ();
                [NoAccessorMethod]
                public weak int value { get; set; }
@@ -1805,11 +1375,7 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CellRendererSpin : Gtk.CellRendererText {
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_spin_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_spin_new")]
                public CellRendererSpin ();
                [NoAccessorMethod]
                public weak Gtk.Adjustment adjustment { get; set; }
@@ -1820,14 +1386,8 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CellRendererText : Gtk.CellRenderer {
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_text_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_text_new")]
                public CellRendererText ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_text_set_fixed_height_from_font")]
                public void set_fixed_height_from_font (int number_of_rows);
                [NoAccessorMethod]
                public weak string text { get; set; }
@@ -1889,23 +1449,11 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CellRendererToggle : Gtk.CellRenderer {
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_toggle_get_active")]
                public bool get_active ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_toggle_get_radio")]
                public bool get_radio ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_toggle_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_toggle_new")]
                public CellRendererToggle ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_toggle_set_active")]
                public void set_active (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_renderer_toggle_set_radio")]
                public void set_radio (bool radio);
                public weak bool active { get; set; }
                [NoAccessorMethod]
@@ -1919,38 +1467,16 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CellView : Gtk.Widget, Gtk.CellLayout {
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_view_get_cell_renderers")]
                public weak GLib.List get_cell_renderers ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_view_get_displayed_row")]
                public weak Gtk.TreePath get_displayed_row ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_view_get_size_of_row")]
                public bool get_size_of_row (Gtk.TreePath path, ref Gtk.Requisition requisition);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_view_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_view_new")]
                public CellView ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_view_new_with_markup")]
                public CellView.with_markup (string markup);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_view_new_with_pixbuf")]
                public CellView.with_pixbuf (Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_view_new_with_text")]
                public CellView.with_text (string text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_view_set_background_color")]
                public void set_background_color (Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_view_set_displayed_row")]
                public void set_displayed_row (Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_view_set_model")]
                public void set_model (Gtk.TreeModel model);
                [NoAccessorMethod]
                public weak string background { set; }
@@ -1961,50 +1487,22 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CheckButton : Gtk.ToggleButton {
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_button_new")]
                public CheckButton ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_button_new_with_label")]
                public CheckButton.with_label (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_button_new_with_mnemonic")]
                public CheckButton.with_mnemonic (string label);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CheckMenuItem : Gtk.MenuItem {
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_menu_item_get_active")]
                public bool get_active ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_menu_item_get_draw_as_radio")]
                public bool get_draw_as_radio ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_menu_item_get_inconsistent")]
                public bool get_inconsistent ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_menu_item_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_menu_item_new")]
                public CheckMenuItem ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_menu_item_new_with_label")]
                public CheckMenuItem.with_label (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_menu_item_new_with_mnemonic")]
                public CheckMenuItem.with_mnemonic (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_menu_item_set_active")]
                public void set_active (bool is_active);
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_menu_item_set_draw_as_radio")]
                public void set_draw_as_radio (bool draw_as_radio);
-               [NoArrayLength]
-               [CCode (cname = "gtk_check_menu_item_set_inconsistent")]
                public void set_inconsistent (bool setting);
                public weak bool active { get; set; }
                public weak bool inconsistent { get; set; }
@@ -2014,120 +1512,50 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Clipboard : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_clear")]
                public void clear ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_get")]
                public static weak Gtk.Clipboard @get (Gdk.Atom selection);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_get_display")]
                public weak Gdk.Display get_display ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_get_for_display")]
                public static weak Gtk.Clipboard get_for_display (Gdk.Display display, Gdk.Atom selection);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_get_owner")]
                public weak GLib.Object get_owner ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_request_contents")]
                public void request_contents (Gdk.Atom target, Gtk.ClipboardReceivedFunc @callback, pointer user_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_request_image")]
                public void request_image (Gtk.ClipboardImageReceivedFunc @callback, pointer user_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_request_rich_text")]
                public void request_rich_text (Gtk.TextBuffer buffer, Gtk.ClipboardRichTextReceivedFunc @callback, pointer user_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_request_targets")]
                public void request_targets (Gtk.ClipboardTargetsReceivedFunc @callback, pointer user_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_request_text")]
                public void request_text (Gtk.ClipboardTextReceivedFunc @callback, pointer user_data);
                [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_set_can_store")]
                public void set_can_store (Gtk.TargetEntry[] targets, int n_targets);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_set_image")]
                public void set_image (Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_set_text")]
                public void set_text (string text, int len);
                [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_set_with_data")]
                public bool set_with_data (Gtk.TargetEntry[] targets, uint n_targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func, pointer user_data);
                [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_set_with_owner")]
                public bool set_with_owner (Gtk.TargetEntry[] targets, uint n_targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func, GLib.Object owner);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_store")]
                public void store ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_wait_for_contents")]
                public weak Gtk.SelectionData wait_for_contents (Gdk.Atom target);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_wait_for_image")]
                public weak Gdk.Pixbuf wait_for_image ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_wait_for_rich_text")]
                public uchar wait_for_rich_text (Gtk.TextBuffer buffer, Gdk.Atom format, ulong length);
                [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_wait_for_targets")]
                public bool wait_for_targets (Gdk.Atom[] targets, int n_targets);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_wait_for_text")]
                public weak string wait_for_text ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_wait_is_image_available")]
                public bool wait_is_image_available ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_wait_is_rich_text_available")]
                public bool wait_is_rich_text_available (Gtk.TextBuffer buffer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_wait_is_target_available")]
                public bool wait_is_target_available (Gdk.Atom target);
-               [NoArrayLength]
-               [CCode (cname = "gtk_clipboard_wait_is_text_available")]
                public bool wait_is_text_available ();
                public signal void owner_change (Gdk.EventOwnerChange event);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ColorButton : Gtk.Button {
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_button_get_alpha")]
                public ushort get_alpha ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_button_get_color")]
                public void get_color (Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_button_get_title")]
                public weak string get_title ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_button_get_use_alpha")]
                public bool get_use_alpha ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_button_new")]
                public ColorButton ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_button_new_with_color")]
                public ColorButton.with_color (Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_button_set_alpha")]
                public void set_alpha (ushort alpha);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_button_set_color")]
                public void set_color (Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_button_set_title")]
                public void set_title (string title);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_button_set_use_alpha")]
                public void set_use_alpha (bool use_alpha);
                public weak bool use_alpha { get; set; }
                public weak string title { get; set; }
@@ -2137,59 +1565,25 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ColorSelection : Gtk.VBox {
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_get_current_alpha")]
                public ushort get_current_alpha ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_get_current_color")]
                public void get_current_color (Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_get_has_opacity_control")]
                public bool get_has_opacity_control ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_get_has_palette")]
                public bool get_has_palette ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_get_previous_alpha")]
                public ushort get_previous_alpha ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_get_previous_color")]
                public void get_previous_color (Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_is_adjusting")]
                public bool is_adjusting ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_new")]
                public ColorSelection ();
                [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_palette_from_string")]
                public static bool palette_from_string (string str, Gdk.Color[] colors, int n_colors);
                [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_palette_to_string")]
                public static weak string palette_to_string (Gdk.Color[] colors, int n_colors);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_set_change_palette_with_screen_hook")]
                public static Gtk.ColorSelectionChangePaletteWithScreenFunc set_change_palette_with_screen_hook (Gtk.ColorSelectionChangePaletteWithScreenFunc func);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_set_current_alpha")]
                public void set_current_alpha (ushort alpha);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_set_current_color")]
                public void set_current_color (Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_set_has_opacity_control")]
                public void set_has_opacity_control (bool has_opacity);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_set_has_palette")]
                public void set_has_palette (bool has_palette);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_set_previous_alpha")]
                public void set_previous_alpha (ushort alpha);
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_set_previous_color")]
                public void set_previous_color (Gdk.Color color);
                public weak bool has_opacity_control { get; set; }
                public weak bool has_palette { get; set; }
@@ -2199,11 +1593,7 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ColorSelectionDialog : Gtk.Dialog {
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_dialog_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_color_selection_dialog_new")]
                public ColorSelectionDialog (string title);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -2223,101 +1613,37 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ComboBox : Gtk.Bin, Gtk.CellLayout, Gtk.CellEditable {
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_append_text")]
                public void append_text (string text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_active")]
                public int get_active ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_active_iter")]
                public bool get_active_iter (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_active_text")]
                public virtual weak string get_active_text ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_add_tearoffs")]
                public bool get_add_tearoffs ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_column_span_column")]
                public int get_column_span_column ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_focus_on_click")]
                public bool get_focus_on_click ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_model")]
                public weak Gtk.TreeModel get_model ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_popup_accessible")]
                public weak Atk.Object get_popup_accessible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_row_separator_func")]
                public Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_row_span_column")]
                public int get_row_span_column ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_title")]
                public weak string get_title ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_get_wrap_width")]
                public int get_wrap_width ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_insert_text")]
                public void insert_text (int position, string text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_new")]
                public ComboBox ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_new_text")]
                public ComboBox.text ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_new_with_model")]
                public ComboBox.with_model (Gtk.TreeModel model);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_popdown")]
                public void popdown ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_popup")]
                public void popup ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_prepend_text")]
                public void prepend_text (string text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_remove_text")]
                public void remove_text (int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_set_active")]
                public void set_active (int index_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_set_active_iter")]
                public void set_active_iter (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_set_add_tearoffs")]
                public void set_add_tearoffs (bool add_tearoffs);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_set_column_span_column")]
                public void set_column_span_column (int column_span);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_set_focus_on_click")]
                public void set_focus_on_click (bool focus_on_click);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_set_model")]
                public void set_model (Gtk.TreeModel model);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_set_row_separator_func")]
                public void set_row_separator_func (Gtk.TreeViewRowSeparatorFunc func, pointer data, Gtk.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_set_row_span_column")]
                public void set_row_span_column (int row_span);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_set_title")]
                public void set_title (string title);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_set_wrap_width")]
                public void set_wrap_width (int width);
                public weak Gtk.TreeModel model { get; set; }
                public weak int wrap_width { get; set; }
@@ -2336,114 +1662,44 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ComboBoxEntry : Gtk.ComboBox {
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_entry_get_text_column")]
                public int get_text_column ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_entry_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_entry_new")]
                public ComboBoxEntry ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_entry_new_text")]
                public ComboBoxEntry.text ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_entry_new_with_model")]
                public ComboBoxEntry.with_model (Gtk.TreeModel model, int text_column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_combo_box_entry_set_text_column")]
                public void set_text_column (int text_column);
                public weak int text_column { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Container : Gtk.Widget {
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_add_with_properties")]
                public void add_with_properties (Gtk.Widget widget, string first_prop_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_child_get")]
                public void child_get (Gtk.Widget child, string first_prop_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_child_get_property")]
                public void child_get_property (Gtk.Widget child, string property_name, GLib.Value value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_child_get_valist")]
                public void child_get_valist (Gtk.Widget child, string first_property_name, pointer var_args);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_child_set")]
                public void child_set (Gtk.Widget child, string first_prop_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_child_set_property")]
                public void child_set_property (Gtk.Widget child, string property_name, GLib.Value value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_child_set_valist")]
                public void child_set_valist (Gtk.Widget child, string first_property_name, pointer var_args);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_child_type")]
                public virtual GLib.Type child_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_class_find_child_property")]
                public static weak GLib.ParamSpec class_find_child_property (pointer cclass, string property_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_class_install_child_property")]
                public static void class_install_child_property (pointer cclass, uint property_id, GLib.ParamSpec pspec);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_class_list_child_properties")]
                public static weak GLib.ParamSpec class_list_child_properties (pointer cclass, uint n_properties);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_forall")]
                public virtual void forall (Gtk.Callback @callback, pointer callback_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_foreach")]
                public void @foreach (Gtk.Callback @callback, pointer callback_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_get_border_width")]
                public uint get_border_width ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_get_children")]
                public weak GLib.List get_children ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_get_focus_chain")]
                public bool get_focus_chain (GLib.List focusable_widgets);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_get_focus_hadjustment")]
                public weak Gtk.Adjustment get_focus_hadjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_get_focus_vadjustment")]
                public weak Gtk.Adjustment get_focus_vadjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_get_resize_mode")]
                public Gtk.ResizeMode get_resize_mode ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_propagate_expose")]
                public void propagate_expose (Gtk.Widget child, Gdk.EventExpose event);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_resize_children")]
                public void resize_children ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_set_border_width")]
                public void set_border_width (uint border_width);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_set_focus_chain")]
                public void set_focus_chain (GLib.List focusable_widgets);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_set_focus_hadjustment")]
                public void set_focus_hadjustment (Gtk.Adjustment adjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_set_focus_vadjustment")]
                public void set_focus_vadjustment (Gtk.Adjustment adjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_set_reallocate_redraws")]
                public void set_reallocate_redraws (bool needs_redraws);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_set_resize_mode")]
                public void set_resize_mode (Gtk.ResizeMode resize_mode);
-               [NoArrayLength]
-               [CCode (cname = "gtk_container_unset_focus_chain")]
                public void unset_focus_chain ();
                public weak Gtk.ResizeMode resize_mode { get; set; }
                public weak uint border_width { get; set; }
@@ -2460,29 +1716,15 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Curve : Gtk.DrawingArea {
-               [NoArrayLength]
-               [CCode (cname = "gtk_curve_get_type")]
                public static GLib.Type get_type ();
                [NoArrayLength]
-               [CCode (cname = "gtk_curve_get_vector")]
                public void get_vector (int veclen, float[] vector);
-               [NoArrayLength]
-               [CCode (cname = "gtk_curve_new")]
                public Curve ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_curve_reset")]
                public void reset ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_curve_set_curve_type")]
                public void set_curve_type (Gtk.CurveType type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_curve_set_gamma")]
                public void set_gamma (float gamma_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_curve_set_range")]
                public void set_range (float min_x, float max_x, float min_y, float max_y);
                [NoArrayLength]
-               [CCode (cname = "gtk_curve_set_vector")]
                public void set_vector (int veclen, float[] vector);
                [NoAccessorMethod]
                public weak Gtk.CurveType curve_type { get; set; }
@@ -2500,47 +1742,19 @@ namespace Gtk {
        public class Dialog : Gtk.Window {
                public weak Gtk.Widget vbox;
                public weak Gtk.Widget action_area;
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_add_action_widget")]
                public void add_action_widget (Gtk.Widget child, int response_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_add_button")]
                public weak Gtk.Widget add_button (string button_text, int response_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_add_buttons")]
                public void add_buttons (string first_button_text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_get_has_separator")]
                public bool get_has_separator ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_get_response_for_widget")]
                public int get_response_for_widget (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_new")]
                public Dialog ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_new_with_buttons")]
                public Dialog.with_buttons (string title, Gtk.Window parent, Gtk.DialogFlags @flags, string first_button_text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_run")]
                public int run ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_set_alternative_button_order")]
                public void set_alternative_button_order (int first_response_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_set_alternative_button_order_from_array")]
                public void set_alternative_button_order_from_array (int n_params, int new_order);
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_set_default_response")]
                public void set_default_response (int response_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_set_has_separator")]
                public void set_has_separator (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_dialog_set_response_sensitive")]
                public void set_response_sensitive (int response_id, bool setting);
                public weak bool has_separator { get; set; }
                [HasEmitter]
@@ -2549,92 +1763,36 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class DrawingArea : Gtk.Widget {
-               [NoArrayLength]
-               [CCode (cname = "gtk_drawing_area_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_drawing_area_new")]
                public DrawingArea ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Entry : Gtk.Widget, Gtk.Editable, Gtk.CellEditable {
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_activates_default")]
                public bool get_activates_default ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_alignment")]
                public float get_alignment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_completion")]
                public weak Gtk.EntryCompletion get_completion ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_has_frame")]
                public bool get_has_frame ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_inner_border")]
                public Gtk.Border get_inner_border ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_invisible_char")]
                public unichar get_invisible_char ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_layout")]
                public weak Pango.Layout get_layout ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_layout_offsets")]
                public void get_layout_offsets (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_max_length")]
                public int get_max_length ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_text")]
                public weak string get_text ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_visibility")]
                public bool get_visibility ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_get_width_chars")]
                public int get_width_chars ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_layout_index_to_text_index")]
                public int layout_index_to_text_index (int layout_index);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_new")]
                public Entry ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_set_activates_default")]
                public void set_activates_default (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_set_alignment")]
                public void set_alignment (float xalign);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_set_completion")]
                public void set_completion (Gtk.EntryCompletion completion);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_set_has_frame")]
                public void set_has_frame (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_set_inner_border")]
                public void set_inner_border (ref Gtk.Border border);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_set_invisible_char")]
                public void set_invisible_char (unichar ch);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_set_max_length")]
                public void set_max_length (int max);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_set_text")]
                public void set_text (string text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_set_visibility")]
                public void set_visibility (bool visible);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_set_width_chars")]
                public void set_width_chars (int n_chars);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_text_index_to_layout_index")]
                public int text_index_to_layout_index (int text_index);
                [NoAccessorMethod]
                public weak int cursor_position { get; }
@@ -2669,71 +1827,27 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class EntryCompletion : GLib.Object, Gtk.CellLayout {
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_complete")]
                public void complete ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_delete_action")]
                public void delete_action (int index_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_get_entry")]
                public weak Gtk.Widget get_entry ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_get_inline_completion")]
                public bool get_inline_completion ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_get_minimum_key_length")]
                public int get_minimum_key_length ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_get_model")]
                public weak Gtk.TreeModel get_model ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_get_popup_completion")]
                public bool get_popup_completion ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_get_popup_set_width")]
                public bool get_popup_set_width ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_get_popup_single_match")]
                public bool get_popup_single_match ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_get_text_column")]
                public int get_text_column ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_insert_action_markup")]
                public void insert_action_markup (int index_, string markup);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_insert_action_text")]
                public void insert_action_text (int index_, string text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_new")]
                public EntryCompletion ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_set_inline_completion")]
                public void set_inline_completion (bool inline_completion);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_set_match_func")]
                public void set_match_func (Gtk.EntryCompletionMatchFunc func, pointer func_data, GLib.DestroyNotify func_notify);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_set_minimum_key_length")]
                public void set_minimum_key_length (int length);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_set_model")]
                public void set_model (Gtk.TreeModel model);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_set_popup_completion")]
                public void set_popup_completion (bool popup_completion);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_set_popup_set_width")]
                public void set_popup_set_width (bool popup_set_width);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_set_popup_single_match")]
                public void set_popup_single_match (bool popup_single_match);
-               [NoArrayLength]
-               [CCode (cname = "gtk_entry_completion_set_text_column")]
                public void set_text_column (int column);
                public weak Gtk.TreeModel model { get; set; }
                public weak int minimum_key_length { get; set; }
@@ -2749,73 +1863,31 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class EventBox : Gtk.Bin {
-               [NoArrayLength]
-               [CCode (cname = "gtk_event_box_get_above_child")]
                public bool get_above_child ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_event_box_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_event_box_get_visible_window")]
                public bool get_visible_window ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_event_box_new")]
                public EventBox ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_event_box_set_above_child")]
                public void set_above_child (bool above_child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_event_box_set_visible_window")]
                public void set_visible_window (bool visible_window);
                public weak bool visible_window { get; set; }
                public weak bool above_child { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Expander : Gtk.Bin {
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_get_expanded")]
                public bool get_expanded ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_get_label")]
                public weak string get_label ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_get_label_widget")]
                public weak Gtk.Widget get_label_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_get_spacing")]
                public int get_spacing ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_get_use_markup")]
                public bool get_use_markup ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_get_use_underline")]
                public bool get_use_underline ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_new")]
                public Expander (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_new_with_mnemonic")]
                public Expander.with_mnemonic (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_set_expanded")]
                public void set_expanded (bool expanded);
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_set_label")]
                public void set_label (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_set_label_widget")]
                public void set_label_widget (Gtk.Widget label_widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_set_spacing")]
                public void set_spacing (int spacing);
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_set_use_markup")]
                public void set_use_markup (bool use_markup);
-               [NoArrayLength]
-               [CCode (cname = "gtk_expander_set_use_underline")]
                public void set_use_underline (bool use_underline);
                public weak bool expanded { get; set construct; }
                public weak string label { get; set construct; }
@@ -2827,35 +1899,15 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class FileChooserButton : Gtk.HBox, Gtk.FileChooser {
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_button_get_focus_on_click")]
                public bool get_focus_on_click ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_button_get_title")]
                public weak string get_title ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_button_get_width_chars")]
                public int get_width_chars ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_button_new")]
                public FileChooserButton (string title, Gtk.FileChooserAction action);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_button_new_with_backend")]
                public FileChooserButton.with_backend (string title, Gtk.FileChooserAction action, string backend);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_button_new_with_dialog")]
                public FileChooserButton.with_dialog (Gtk.Widget dialog);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_button_set_focus_on_click")]
                public void set_focus_on_click (bool focus_on_click);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_button_set_title")]
                public void set_title (string title);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_button_set_width_chars")]
                public void set_width_chars (int n_chars);
                [NoAccessorMethod]
                public weak Gtk.FileChooser dialog { construct; }
@@ -2865,59 +1917,27 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class FileChooserDialog : Gtk.Dialog, Gtk.FileChooser {
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_dialog_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_dialog_new")]
                public FileChooserDialog (string title, Gtk.Window parent, Gtk.FileChooserAction action, string first_button_text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_dialog_new_with_backend")]
                public FileChooserDialog.with_backend (string title, Gtk.Window parent, Gtk.FileChooserAction action, string backend, string first_button_text);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class FileChooserWidget : Gtk.VBox, Gtk.FileChooser {
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_widget_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_widget_new")]
                public FileChooserWidget (Gtk.FileChooserAction action);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_widget_new_with_backend")]
                public FileChooserWidget.with_backend (Gtk.FileChooserAction action, string backend);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class FileFilter : Gtk.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_filter_add_custom")]
                public void add_custom (Gtk.FileFilterFlags needed, Gtk.FileFilterFunc func, pointer data, GLib.DestroyNotify notify);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_filter_add_mime_type")]
                public void add_mime_type (string mime_type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_filter_add_pattern")]
                public void add_pattern (string pattern);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_filter_add_pixbuf_formats")]
                public void add_pixbuf_formats ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_filter_filter")]
                public bool filter (Gtk.FileFilterInfo filter_info);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_filter_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_filter_get_needed")]
                public Gtk.FileFilterFlags get_needed ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_filter_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_filter_new")]
                public FileFilter ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_filter_set_name")]
                public void set_name (string name);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -2942,35 +1962,15 @@ namespace Gtk {
                public weak Gtk.Widget fileop_ren_file;
                public weak Gtk.Widget button_area;
                public weak Gtk.Widget action_area;
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_selection_complete")]
                public void complete (string pattern);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_selection_get_filename")]
                public weak string get_filename ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_selection_get_select_multiple")]
                public bool get_select_multiple ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_selection_get_selections")]
                public weak string get_selections ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_selection_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_selection_hide_fileop_buttons")]
                public void hide_fileop_buttons ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_selection_new")]
                public FileSelection (string title);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_selection_set_filename")]
                public void set_filename (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_selection_set_select_multiple")]
                public void set_select_multiple (bool select_multiple);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_selection_show_fileop_buttons")]
                public void show_fileop_buttons ();
                public weak string filename { get; set; }
                [NoAccessorMethod]
@@ -2979,71 +1979,29 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Fixed : Gtk.Container {
-               [NoArrayLength]
-               [CCode (cname = "gtk_fixed_get_has_window")]
                public bool get_has_window ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_fixed_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_fixed_move")]
                public void move (Gtk.Widget widget, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_fixed_new")]
                public Fixed ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_fixed_put")]
                public void put (Gtk.Widget widget, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_fixed_set_has_window")]
                public void set_has_window (bool has_window);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class FontButton : Gtk.Button {
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_get_font_name")]
                public weak string get_font_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_get_show_size")]
                public bool get_show_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_get_show_style")]
                public bool get_show_style ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_get_title")]
                public weak string get_title ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_get_use_font")]
                public bool get_use_font ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_get_use_size")]
                public bool get_use_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_new")]
                public FontButton ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_new_with_font")]
                public FontButton.with_font (string fontname);
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_set_font_name")]
                public bool set_font_name (string fontname);
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_set_show_size")]
                public void set_show_size (bool show_size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_set_show_style")]
                public void set_show_style (bool show_style);
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_set_title")]
                public void set_title (string title);
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_set_use_font")]
                public void set_use_font (bool use_font);
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_button_set_use_size")]
                public void set_use_size (bool use_size);
                public weak string title { get; set; }
                public weak string font_name { get; set; }
@@ -3055,23 +2013,11 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class FontSelection : Gtk.VBox {
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_get_font_name")]
                public weak string get_font_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_get_preview_text")]
                public weak string get_preview_text ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_new")]
                public FontSelection ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_set_font_name")]
                public bool set_font_name (string fontname);
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_set_preview_text")]
                public void set_preview_text (string text);
                public weak string font_name { get; set; }
                [NoAccessorMethod]
@@ -3083,56 +2029,24 @@ namespace Gtk {
                public weak Gtk.Widget ok_button;
                public weak Gtk.Widget apply_button;
                public weak Gtk.Widget cancel_button;
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_dialog_get_font_name")]
                public weak string get_font_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_dialog_get_preview_text")]
                public weak string get_preview_text ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_dialog_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_dialog_new")]
                public FontSelectionDialog (string title);
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_dialog_set_font_name")]
                public bool set_font_name (string fontname);
-               [NoArrayLength]
-               [CCode (cname = "gtk_font_selection_dialog_set_preview_text")]
                public void set_preview_text (string text);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Frame : Gtk.Bin {
-               [NoArrayLength]
-               [CCode (cname = "gtk_frame_get_label")]
                public weak string get_label ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_frame_get_label_align")]
                public void get_label_align (float xalign, float yalign);
-               [NoArrayLength]
-               [CCode (cname = "gtk_frame_get_label_widget")]
                public weak Gtk.Widget get_label_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_frame_get_shadow_type")]
                public Gtk.ShadowType get_shadow_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_frame_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_frame_new")]
                public Frame (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_frame_set_label")]
                public void set_label (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_frame_set_label_align")]
                public void set_label_align (float xalign, float yalign);
-               [NoArrayLength]
-               [CCode (cname = "gtk_frame_set_label_widget")]
                public void set_label_widget (Gtk.Widget label_widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_frame_set_shadow_type")]
                public void set_shadow_type (Gtk.ShadowType type);
                public weak string label { get; set; }
                [NoAccessorMethod]
@@ -3146,38 +2060,18 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class GammaCurve : Gtk.VBox {
-               [NoArrayLength]
-               [CCode (cname = "gtk_gamma_curve_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_gamma_curve_new")]
                public GammaCurve ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class HandleBox : Gtk.Bin {
-               [NoArrayLength]
-               [CCode (cname = "gtk_handle_box_get_handle_position")]
                public Gtk.PositionType get_handle_position ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_handle_box_get_shadow_type")]
                public Gtk.ShadowType get_shadow_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_handle_box_get_snap_edge")]
                public Gtk.PositionType get_snap_edge ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_handle_box_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_handle_box_new")]
                public HandleBox ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_handle_box_set_handle_position")]
                public void set_handle_position (Gtk.PositionType position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_handle_box_set_shadow_type")]
                public void set_shadow_type (Gtk.ShadowType type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_handle_box_set_snap_edge")]
                public void set_snap_edge (Gtk.PositionType edge);
                [NoAccessorMethod]
                public weak Gtk.ShadowType shadow { get; set; }
@@ -3191,94 +2085,56 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class HBox : Gtk.Box {
-               [NoArrayLength]
-               [CCode (cname = "gtk_hbox_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_hbox_new")]
                public HBox (bool homogeneous, int spacing);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class HButtonBox : Gtk.ButtonBox {
-               [NoArrayLength]
-               [CCode (cname = "gtk_hbutton_box_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_hbutton_box_new")]
                public HButtonBox ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class HPaned : Gtk.Paned {
-               [NoArrayLength]
-               [CCode (cname = "gtk_hpaned_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_hpaned_new")]
                public HPaned ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class HRuler : Gtk.Ruler {
-               [NoArrayLength]
-               [CCode (cname = "gtk_hruler_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_hruler_new")]
                public HRuler ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class HScale : Gtk.Scale {
-               [NoArrayLength]
-               [CCode (cname = "gtk_hscale_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_hscale_new")]
                public HScale (Gtk.Adjustment adjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_hscale_new_with_range")]
                public HScale.with_range (double min, double max, double step);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class HScrollbar : Gtk.Scrollbar {
-               [NoArrayLength]
-               [CCode (cname = "gtk_hscrollbar_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_hscrollbar_new")]
                public HScrollbar (Gtk.Adjustment adjustment);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class HSeparator : Gtk.Separator {
-               [NoArrayLength]
-               [CCode (cname = "gtk_hseparator_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_hseparator_new")]
                public HSeparator ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class HSV : Gtk.Widget {
-               [NoArrayLength]
                [CCode (cname = "gtk_hsv_get_color")]
                public void get_color (double h, double s, double v);
-               [NoArrayLength]
                [CCode (cname = "gtk_hsv_get_metrics")]
                public void get_metrics (int size, int ring_width);
-               [NoArrayLength]
                [CCode (cname = "gtk_hsv_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
                [CCode (cname = "gtk_hsv_is_adjusting")]
                public bool is_adjusting ();
-               [NoArrayLength]
                [CCode (cname = "gtk_hsv_new")]
                public HSV ();
-               [NoArrayLength]
                [CCode (cname = "gtk_hsv_set_color")]
                public void set_color (double h, double s, double v);
-               [NoArrayLength]
                [CCode (cname = "gtk_hsv_set_metrics")]
                public void set_metrics (int size, int ring_width);
-               [NoArrayLength]
                [CCode (cname = "gtk_hsv_to_rgb")]
                public static void to_rgb (double h, double s, double v, double r, double g, double b);
                public signal void changed ();
@@ -3286,234 +2142,90 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class IconFactory : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_factory_add")]
                public void add (string stock_id, Gtk.IconSet icon_set);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_factory_add_default")]
                public void add_default ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_factory_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_factory_lookup")]
                public weak Gtk.IconSet lookup (string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_factory_lookup_default")]
                public static weak Gtk.IconSet lookup_default (string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_factory_new")]
                public IconFactory ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_factory_remove_default")]
                public void remove_default ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class IconTheme : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_add_builtin_icon")]
                public static void add_builtin_icon (string icon_name, int size, Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_append_search_path")]
                public void append_search_path (string path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_error_quark")]
                public static GLib.Quark error_quark ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_get_default")]
                public static weak Gtk.IconTheme get_default ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_get_example_icon_name")]
                public weak string get_example_icon_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_get_for_screen")]
                public static weak Gtk.IconTheme get_for_screen (Gdk.Screen screen);
                [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_get_icon_sizes")]
                public weak int[] get_icon_sizes (string icon_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_get_search_path")]
                public void get_search_path (string path, int n_elements);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_has_icon")]
                public bool has_icon (string icon_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_list_icons")]
                public weak GLib.List list_icons (string context);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_load_icon")]
                public weak Gdk.Pixbuf load_icon (string icon_name, int size, Gtk.IconLookupFlags @flags, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_lookup_icon")]
                public weak Gtk.IconInfo lookup_icon (string icon_name, int size, Gtk.IconLookupFlags @flags);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_new")]
                public IconTheme ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_prepend_search_path")]
                public void prepend_search_path (string path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_rescan_if_needed")]
                public bool rescan_if_needed ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_set_custom_theme")]
                public void set_custom_theme (string theme_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_set_screen")]
                public void set_screen (Gdk.Screen screen);
                [NoArrayLength]
-               [CCode (cname = "gtk_icon_theme_set_search_path")]
                public void set_search_path (string[] path, int n_elements);
                public signal void changed ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class IconView : Gtk.Container, Gtk.CellLayout {
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_create_drag_icon")]
                public weak Gdk.Pixmap create_drag_icon (Gtk.TreePath path);
                [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_enable_model_drag_dest")]
                public void enable_model_drag_dest (Gtk.TargetEntry[] targets, int n_targets, Gdk.DragAction actions);
                [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_enable_model_drag_source")]
                public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, int n_targets, Gdk.DragAction actions);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_column_spacing")]
                public int get_column_spacing ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_columns")]
                public int get_columns ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_cursor")]
                public bool get_cursor (Gtk.TreePath path, Gtk.CellRenderer cell);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_dest_item_at_pos")]
                public bool get_dest_item_at_pos (int drag_x, int drag_y, Gtk.TreePath path, Gtk.IconViewDropPosition pos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_drag_dest_item")]
                public void get_drag_dest_item (Gtk.TreePath path, Gtk.IconViewDropPosition pos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_item_at_pos")]
                public bool get_item_at_pos (int x, int y, Gtk.TreePath path, Gtk.CellRenderer cell);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_item_width")]
                public int get_item_width ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_margin")]
                public int get_margin ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_markup_column")]
                public int get_markup_column ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_model")]
                public weak Gtk.TreeModel get_model ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_orientation")]
                public Gtk.Orientation get_orientation ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_path_at_pos")]
                public weak Gtk.TreePath get_path_at_pos (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_pixbuf_column")]
                public int get_pixbuf_column ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_reorderable")]
                public bool get_reorderable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_row_spacing")]
                public int get_row_spacing ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_selected_items")]
                public weak GLib.List get_selected_items ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_selection_mode")]
                public Gtk.SelectionMode get_selection_mode ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_spacing")]
                public int get_spacing ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_text_column")]
                public int get_text_column ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_get_visible_range")]
                public bool get_visible_range (Gtk.TreePath start_path, Gtk.TreePath end_path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_new")]
                public IconView ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_new_with_model")]
                public IconView.with_model (Gtk.TreeModel model);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_path_is_selected")]
                public bool path_is_selected (Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_scroll_to_path")]
                public void scroll_to_path (Gtk.TreePath path, bool use_align, float row_align, float col_align);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_select_path")]
                public void select_path (Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_selected_foreach")]
                public void selected_foreach (Gtk.IconViewForeachFunc func, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_column_spacing")]
                public void set_column_spacing (int column_spacing);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_columns")]
                public void set_columns (int columns);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_cursor")]
                public void set_cursor (Gtk.TreePath path, Gtk.CellRenderer cell, bool start_editing);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_drag_dest_item")]
                public void set_drag_dest_item (Gtk.TreePath path, Gtk.IconViewDropPosition pos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_item_width")]
                public void set_item_width (int item_width);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_margin")]
                public void set_margin (int margin);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_markup_column")]
                public void set_markup_column (int column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_model")]
                public void set_model (Gtk.TreeModel model);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_orientation")]
                public void set_orientation (Gtk.Orientation orientation);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_pixbuf_column")]
                public void set_pixbuf_column (int column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_reorderable")]
                public void set_reorderable (bool reorderable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_row_spacing")]
                public void set_row_spacing (int row_spacing);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_selection_mode")]
                public void set_selection_mode (Gtk.SelectionMode mode);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_spacing")]
                public void set_spacing (int spacing);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_set_text_column")]
                public void set_text_column (int column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_unselect_path")]
                public void unselect_path (Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_unset_model_drag_dest")]
                public void unset_model_drag_dest ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_view_unset_model_drag_source")]
                public void unset_model_drag_source ();
                public weak Gtk.SelectionMode selection_mode { get; set; }
                public weak int pixbuf_column { get; set; }
@@ -3541,92 +2253,34 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Image : Gtk.Misc {
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_clear")]
                public void clear ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_get_animation")]
                public weak Gdk.PixbufAnimation get_animation ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_get_icon_name")]
                public void get_icon_name (string icon_name, Gtk.IconSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_get_icon_set")]
                public void get_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_get_image")]
                public void get_image (Gdk.Image gdk_image, Gdk.Bitmap mask);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_get_pixbuf")]
                public weak Gdk.Pixbuf get_pixbuf ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_get_pixel_size")]
                public int get_pixel_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_get_pixmap")]
                public void get_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_get_stock")]
                public void get_stock (string stock_id, Gtk.IconSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_get_storage_type")]
                public Gtk.ImageType get_storage_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_new")]
                public Image ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_new_from_animation")]
                public Image.from_animation (Gdk.PixbufAnimation animation);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_new_from_file")]
                public Image.from_file (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_new_from_icon_name")]
                public Image.from_icon_name (string icon_name, Gtk.IconSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_new_from_icon_set")]
                public Image.from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_new_from_image")]
                public Image.from_image (Gdk.Image image, Gdk.Bitmap mask);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_new_from_pixbuf")]
                public Image.from_pixbuf (Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_new_from_pixmap")]
                public Image.from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_new_from_stock")]
                public Image.from_stock (string stock_id, Gtk.IconSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_set_from_animation")]
                public void set_from_animation (Gdk.PixbufAnimation animation);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_set_from_file")]
                public void set_from_file (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_set_from_icon_name")]
                public void set_from_icon_name (string icon_name, Gtk.IconSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_set_from_icon_set")]
                public void set_from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_set_from_image")]
                public void set_from_image (Gdk.Image gdk_image, Gdk.Bitmap mask);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_set_from_pixbuf")]
                public void set_from_pixbuf (Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_set_from_pixmap")]
                public void set_from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_set_from_stock")]
                public void set_from_stock (string stock_id, Gtk.IconSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_set_pixel_size")]
                public void set_pixel_size (int pixel_size);
                [NoAccessorMethod]
                public weak Gdk.Pixbuf pixbuf { get; set; }
@@ -3653,63 +2307,27 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ImageMenuItem : Gtk.MenuItem {
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_menu_item_get_image")]
                public weak Gtk.Widget get_image ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_menu_item_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_menu_item_new")]
                public ImageMenuItem ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_menu_item_new_from_stock")]
                public ImageMenuItem.from_stock (string stock_id, Gtk.AccelGroup accel_group);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_menu_item_new_with_label")]
                public ImageMenuItem.with_label (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_menu_item_new_with_mnemonic")]
                public ImageMenuItem.with_mnemonic (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_image_menu_item_set_image")]
                public void set_image (Gtk.Widget image);
                public weak Gtk.Widget image { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class IMContext : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_filter_keypress")]
                public virtual bool filter_keypress (Gdk.EventKey event);
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_focus_in")]
                public virtual void focus_in ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_focus_out")]
                public virtual void focus_out ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_get_preedit_string")]
                public virtual void get_preedit_string (string str, Pango.AttrList attrs, int cursor_pos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_get_surrounding")]
                public virtual bool get_surrounding (string text, int cursor_index);
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_reset")]
                public virtual void reset ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_set_client_window")]
                public virtual void set_client_window (Gdk.Window window);
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_set_cursor_location")]
                public virtual void set_cursor_location (Gdk.Rectangle area);
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_set_surrounding")]
                public virtual void set_surrounding (string text, int len, int cursor_index);
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_set_use_preedit")]
                public virtual void set_use_preedit (bool use_preedit);
                public signal void preedit_start ();
                public signal void preedit_end ();
@@ -3721,62 +2339,34 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class IMContextSimple : Gtk.IMContext {
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_simple_add_table")]
                public void add_table (ushort data, int max_seq_len, int n_seqs);
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_simple_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_context_simple_new")]
                public IMContextSimple ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class IMMulticontext : Gtk.IMContext {
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_multicontext_append_menuitems")]
                public void append_menuitems (Gtk.MenuShell menushell);
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_multicontext_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_im_multicontext_new")]
                public IMMulticontext ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class InputDialog : Gtk.Dialog {
-               [NoArrayLength]
-               [CCode (cname = "gtk_input_dialog_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_input_dialog_new")]
                public InputDialog ();
                public signal void enable_device (Gdk.Device device);
                public signal void disable_device (Gdk.Device device);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Invisible : Gtk.Widget {
-               [NoArrayLength]
-               [CCode (cname = "gtk_invisible_get_screen")]
                public weak Gdk.Screen get_screen ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_invisible_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_invisible_new")]
                public Invisible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_invisible_new_for_screen")]
                public Invisible.for_screen (Gdk.Screen screen);
-               [NoArrayLength]
-               [CCode (cname = "gtk_invisible_set_screen")]
                public void set_screen (Gdk.Screen screen);
                public weak Gdk.Screen screen { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Item : Gtk.Bin {
-               [NoArrayLength]
-               [CCode (cname = "gtk_item_get_type")]
                public static GLib.Type get_type ();
                [HasEmitter]
                public signal void select ();
@@ -3790,131 +2380,47 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Label : Gtk.Misc {
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_angle")]
                public double get_angle ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_attributes")]
                public weak Pango.AttrList get_attributes ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_ellipsize")]
                public Pango.EllipsizeMode get_ellipsize ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_justify")]
                public Gtk.Justification get_justify ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_label")]
                public weak string get_label ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_layout")]
                public weak Pango.Layout get_layout ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_layout_offsets")]
                public void get_layout_offsets (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_line_wrap")]
                public bool get_line_wrap ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_line_wrap_mode")]
                public Pango.WrapMode get_line_wrap_mode ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_max_width_chars")]
                public int get_max_width_chars ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_mnemonic_keyval")]
                public uint get_mnemonic_keyval ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_mnemonic_widget")]
                public weak Gtk.Widget get_mnemonic_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_selectable")]
                public bool get_selectable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_selection_bounds")]
                public bool get_selection_bounds (int start, int end);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_single_line_mode")]
                public bool get_single_line_mode ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_text")]
                public weak string get_text ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_use_markup")]
                public bool get_use_markup ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_use_underline")]
                public bool get_use_underline ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_get_width_chars")]
                public int get_width_chars ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_new")]
                public Label (string str);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_new_with_mnemonic")]
                public Label.with_mnemonic (string str);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_select_region")]
                public void select_region (int start_offset, int end_offset);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_angle")]
                public void set_angle (double angle);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_attributes")]
                public void set_attributes (Pango.AttrList attrs);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_ellipsize")]
                public void set_ellipsize (Pango.EllipsizeMode mode);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_justify")]
                public void set_justify (Gtk.Justification jtype);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_label")]
                public void set_label (string str);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_line_wrap")]
                public void set_line_wrap (bool wrap);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_line_wrap_mode")]
                public void set_line_wrap_mode (Pango.WrapMode wrap_mode);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_markup")]
                public void set_markup (string str);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_markup_with_mnemonic")]
                public void set_markup_with_mnemonic (string str);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_max_width_chars")]
                public void set_max_width_chars (int n_chars);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_mnemonic_widget")]
                public void set_mnemonic_widget (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_pattern")]
                public void set_pattern (string pattern);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_selectable")]
                public void set_selectable (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_single_line_mode")]
                public void set_single_line_mode (bool single_line_mode);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_text")]
                public void set_text (string str);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_text_with_mnemonic")]
                public void set_text_with_mnemonic (string str);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_use_markup")]
                public void set_use_markup (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_use_underline")]
                public void set_use_underline (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_label_set_width_chars")]
                public void set_width_chars (int n_chars);
                public weak string label { get; set; }
                public weak Pango.AttrList attributes { get; set; }
@@ -3945,35 +2451,15 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Layout : Gtk.Container {
                public weak Gdk.Window bin_window;
-               [NoArrayLength]
-               [CCode (cname = "gtk_layout_get_hadjustment")]
                public weak Gtk.Adjustment get_hadjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_layout_get_size")]
                public void get_size (uint width, uint height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_layout_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_layout_get_vadjustment")]
                public weak Gtk.Adjustment get_vadjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_layout_move")]
                public void move (Gtk.Widget child_widget, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_layout_new")]
                public Layout (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_layout_put")]
                public void put (Gtk.Widget child_widget, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_layout_set_hadjustment")]
                public void set_hadjustment (Gtk.Adjustment adjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_layout_set_size")]
                public void set_size (uint width, uint height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_layout_set_vadjustment")]
                public void set_vadjustment (Gtk.Adjustment adjustment);
                public weak Gtk.Adjustment hadjustment { get; set; }
                public weak Gtk.Adjustment vadjustment { get; set; }
@@ -3985,159 +2471,63 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class LinkButton : Gtk.Button {
-               [NoArrayLength]
-               [CCode (cname = "gtk_link_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_link_button_get_uri")]
                public weak string get_uri ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_link_button_new")]
                public LinkButton (string uri);
-               [NoArrayLength]
-               [CCode (cname = "gtk_link_button_new_with_label")]
                public LinkButton.with_label (string uri, string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_link_button_set_uri")]
                public void set_uri (string uri);
-               [NoArrayLength]
-               [CCode (cname = "gtk_link_button_set_uri_hook")]
                public static Gtk.LinkButtonUriFunc set_uri_hook (Gtk.LinkButtonUriFunc func, pointer data, GLib.DestroyNotify destroy);
                public weak string uri { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ListStore : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource, Gtk.TreeDragDest, Gtk.TreeSortable {
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_append")]
                public void append (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_clear")]
                public void clear ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_insert")]
                public void insert (ref Gtk.TreeIter iter, int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_insert_after")]
                public void insert_after (ref Gtk.TreeIter iter, ref Gtk.TreeIter sibling);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_insert_before")]
                public void insert_before (ref Gtk.TreeIter iter, ref Gtk.TreeIter sibling);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_insert_with_values")]
                public void insert_with_values (ref Gtk.TreeIter iter, int position, ...);
                [NoArrayLength]
-               [CCode (cname = "gtk_list_store_insert_with_valuesv")]
                public void insert_with_valuesv (ref Gtk.TreeIter iter, int position, int columns, GLib.Value[] values, int n_values);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_iter_is_valid")]
                public bool iter_is_valid (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_move_after")]
                public void move_after (ref Gtk.TreeIter iter, ref Gtk.TreeIter position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_move_before")]
                public void move_before (ref Gtk.TreeIter iter, ref Gtk.TreeIter position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_new")]
                public ListStore (int n_columns, ...);
-               [NoArrayLength]
                [CCode (cname = "gtk_list_store_newv")]
                public ListStore.newv (int n_columns, GLib.Type types);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_prepend")]
                public void prepend (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_remove")]
                public bool remove (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_reorder")]
                public void reorder (int new_order);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_set")]
                public void @set (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_set_column_types")]
                public void set_column_types (int n_columns, GLib.Type types);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_set_valist")]
                public void set_valist (ref Gtk.TreeIter iter, pointer var_args);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_set_value")]
                public void set_value (ref Gtk.TreeIter iter, int column, GLib.Value value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_list_store_swap")]
                public void swap (ref Gtk.TreeIter a, ref Gtk.TreeIter b);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Menu : Gtk.MenuShell {
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_attach")]
                public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_attach_to_widget")]
                public void attach_to_widget (Gtk.Widget attach_widget, Gtk.MenuDetachFunc detacher);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_detach")]
                public void detach ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_get_accel_group")]
                public weak Gtk.AccelGroup get_accel_group ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_get_active")]
                public weak Gtk.Widget get_active ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_get_attach_widget")]
                public weak Gtk.Widget get_attach_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_get_for_attach_widget")]
                public static weak GLib.List get_for_attach_widget (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_get_tearoff_state")]
                public bool get_tearoff_state ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_get_title")]
                public weak string get_title ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_new")]
                public Menu ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_popdown")]
                public void popdown ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_popup")]
                public void popup (Gtk.Widget parent_menu_shell, Gtk.Widget parent_menu_item, Gtk.MenuPositionFunc func, pointer data, uint button, uint activate_time);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_reorder_child")]
                public void reorder_child (Gtk.Widget child, int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_reposition")]
                public void reposition ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_set_accel_group")]
                public void set_accel_group (Gtk.AccelGroup accel_group);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_set_accel_path")]
                public void set_accel_path (string accel_path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_set_active")]
                public void set_active (uint index_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_set_monitor")]
                public void set_monitor (int monitor_num);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_set_screen")]
                public void set_screen (Gdk.Screen screen);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_set_tearoff_state")]
                public void set_tearoff_state (bool torn_off);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_set_title")]
                public void set_title (string title);
                [NoAccessorMethod]
                public weak string tearoff_title { get; set; }
@@ -4145,64 +2535,28 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class MenuBar : Gtk.MenuShell {
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_bar_get_child_pack_direction")]
                public Gtk.PackDirection get_child_pack_direction ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_bar_get_pack_direction")]
                public Gtk.PackDirection get_pack_direction ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_bar_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_bar_new")]
                public MenuBar ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_bar_set_child_pack_direction")]
                public void set_child_pack_direction (Gtk.PackDirection child_pack_dir);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_bar_set_pack_direction")]
                public void set_pack_direction (Gtk.PackDirection pack_dir);
                public weak Gtk.PackDirection pack_direction { get; set; }
                public weak Gtk.PackDirection child_pack_direction { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class MenuItem : Gtk.Item {
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_deselect")]
                public void deselect ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_get_right_justified")]
                public bool get_right_justified ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_get_submenu")]
                public weak Gtk.Widget get_submenu ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_new")]
                public MenuItem ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_new_with_label")]
                public MenuItem.with_label (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_new_with_mnemonic")]
                public MenuItem.with_mnemonic (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_remove_submenu")]
                public void remove_submenu ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_select")]
                public void select ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_set_accel_path")]
                public void set_accel_path (string accel_path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_set_right_justified")]
                public void set_right_justified (bool right_justified);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_item_set_submenu")]
                public void set_submenu (Gtk.Widget submenu);
                [HasEmitter]
                public signal void activate ();
@@ -4214,35 +2568,15 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class MenuShell : Gtk.Container {
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_shell_activate_item")]
                public void activate_item (Gtk.Widget menu_item, bool force_deactivate);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_shell_append")]
                public void append (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_shell_deselect")]
                public void deselect ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_shell_get_take_focus")]
                public bool get_take_focus ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_shell_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_shell_insert")]
                public virtual void insert (Gtk.Widget child, int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_shell_prepend")]
                public void prepend (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_shell_select_first")]
                public void select_first (bool search_sensitive);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_shell_select_item")]
                public virtual void select_item (Gtk.Widget menu_item);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_shell_set_take_focus")]
                public void set_take_focus (bool take_focus);
                public weak bool take_focus { get; set; }
                [HasEmitter]
@@ -4255,49 +2589,23 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class MenuToolButton : Gtk.ToolButton {
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_tool_button_get_menu")]
                public weak Gtk.Widget get_menu ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_tool_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_tool_button_new")]
                public MenuToolButton (Gtk.Widget icon_widget, string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_tool_button_new_from_stock")]
                public MenuToolButton.from_stock (string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_tool_button_set_arrow_tooltip")]
                public void set_arrow_tooltip (Gtk.Tooltips tooltips, string tip_text, string tip_private);
-               [NoArrayLength]
-               [CCode (cname = "gtk_menu_tool_button_set_menu")]
                public void set_menu (Gtk.Widget menu);
                public weak Gtk.Menu menu { get; set; }
                public signal void show_menu ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class MessageDialog : Gtk.Dialog {
-               [NoArrayLength]
-               [CCode (cname = "gtk_message_dialog_format_secondary_markup")]
                public void format_secondary_markup (string message_format);
-               [NoArrayLength]
-               [CCode (cname = "gtk_message_dialog_format_secondary_text")]
                public void format_secondary_text (string message_format);
-               [NoArrayLength]
-               [CCode (cname = "gtk_message_dialog_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_message_dialog_new")]
                public MessageDialog (Gtk.Window parent, Gtk.DialogFlags @flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format);
-               [NoArrayLength]
-               [CCode (cname = "gtk_message_dialog_new_with_markup")]
                public MessageDialog.with_markup (Gtk.Window parent, Gtk.DialogFlags @flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format);
-               [NoArrayLength]
-               [CCode (cname = "gtk_message_dialog_set_image")]
                public void set_image (Gtk.Widget image);
-               [NoArrayLength]
-               [CCode (cname = "gtk_message_dialog_set_markup")]
                public void set_markup (string str);
                [NoAccessorMethod]
                public weak Gtk.MessageType message_type { get; set construct; }
@@ -4316,20 +2624,10 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Misc : Gtk.Widget {
-               [NoArrayLength]
-               [CCode (cname = "gtk_misc_get_alignment")]
                public void get_alignment (float xalign, float yalign);
-               [NoArrayLength]
-               [CCode (cname = "gtk_misc_get_padding")]
                public void get_padding (int xpad, int ypad);
-               [NoArrayLength]
-               [CCode (cname = "gtk_misc_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_misc_set_alignment")]
                public void set_alignment (float xalign, float yalign);
-               [NoArrayLength]
-               [CCode (cname = "gtk_misc_set_padding")]
                public void set_padding (int xpad, int ypad);
                [NoAccessorMethod]
                public weak float xalign { get; set; }
@@ -4342,134 +2640,48 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Notebook : Gtk.Container {
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_append_page")]
                public int append_page (Gtk.Widget child, Gtk.Widget tab_label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_append_page_menu")]
                public int append_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_current_page")]
                public int get_current_page ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_group_id")]
                public int get_group_id ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_menu_label")]
                public weak Gtk.Widget get_menu_label (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_menu_label_text")]
                public weak string get_menu_label_text (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_n_pages")]
                public int get_n_pages ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_nth_page")]
                public weak Gtk.Widget get_nth_page (int page_num);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_scrollable")]
                public bool get_scrollable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_show_border")]
                public bool get_show_border ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_show_tabs")]
                public bool get_show_tabs ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_tab_detachable")]
                public bool get_tab_detachable (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_tab_label")]
                public weak Gtk.Widget get_tab_label (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_tab_label_text")]
                public weak string get_tab_label_text (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_tab_pos")]
                public Gtk.PositionType get_tab_pos ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_tab_reorderable")]
                public bool get_tab_reorderable (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_insert_page")]
                public virtual int insert_page (Gtk.Widget child, Gtk.Widget tab_label, int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_insert_page_menu")]
                public int insert_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label, int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_new")]
                public Notebook ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_next_page")]
                public void next_page ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_popup_disable")]
                public void popup_disable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_popup_enable")]
                public void popup_enable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_prepend_page")]
                public int prepend_page (Gtk.Widget child, Gtk.Widget tab_label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_prepend_page_menu")]
                public int prepend_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_prev_page")]
                public void prev_page ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_query_tab_label_packing")]
                public void query_tab_label_packing (Gtk.Widget child, bool expand, bool fill, Gtk.PackType pack_type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_remove_page")]
                public void remove_page (int page_num);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_reorder_child")]
                public void reorder_child (Gtk.Widget child, int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_current_page")]
                public void set_current_page (int page_num);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_group_id")]
                public void set_group_id (int group_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_menu_label")]
                public void set_menu_label (Gtk.Widget child, Gtk.Widget menu_label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_menu_label_text")]
                public void set_menu_label_text (Gtk.Widget child, string menu_text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_scrollable")]
                public void set_scrollable (bool scrollable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_show_border")]
                public void set_show_border (bool show_border);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_show_tabs")]
                public void set_show_tabs (bool show_tabs);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_tab_detachable")]
                public void set_tab_detachable (Gtk.Widget child, bool detachable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_tab_label")]
                public void set_tab_label (Gtk.Widget child, Gtk.Widget tab_label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_tab_label_packing")]
                public void set_tab_label_packing (Gtk.Widget child, bool expand, bool fill, Gtk.PackType pack_type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_tab_label_text")]
                public void set_tab_label_text (Gtk.Widget child, string tab_text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_tab_pos")]
                public void set_tab_pos (Gtk.PositionType pos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_tab_reorderable")]
                public void set_tab_reorderable (Gtk.Widget child, bool reorderable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_set_window_creation_hook")]
                public static void set_window_creation_hook (Gtk.NotebookWindowCreationFunc func, pointer data, GLib.DestroyNotify destroy);
                [NoAccessorMethod]
                public weak int page { get; set; }
@@ -4500,8 +2712,6 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Object : GLib.InitiallyUnowned {
-               [NoArrayLength]
-               [CCode (cname = "gtk_object_get_type")]
                public static weak Gtk.Type get_type ();
                [NoAccessorMethod]
                public weak pointer user_data { get; set; }
@@ -4515,116 +2725,46 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class PageSetup : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_copy")]
                public weak Gtk.PageSetup copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_get_bottom_margin")]
                public double get_bottom_margin (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_get_left_margin")]
                public double get_left_margin (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_get_orientation")]
                public Gtk.PageOrientation get_orientation ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_get_page_height")]
                public double get_page_height (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_get_page_width")]
                public double get_page_width (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_get_paper_height")]
                public double get_paper_height (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_get_paper_size")]
                public weak Gtk.PaperSize get_paper_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_get_paper_width")]
                public double get_paper_width (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_get_right_margin")]
                public double get_right_margin (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_get_top_margin")]
                public double get_top_margin (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_new")]
                public PageSetup ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_set_bottom_margin")]
                public void set_bottom_margin (double margin, Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_set_left_margin")]
                public void set_left_margin (double margin, Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_set_orientation")]
                public void set_orientation (Gtk.PageOrientation orientation);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_set_paper_size")]
                public void set_paper_size (Gtk.PaperSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_set_paper_size_and_default_margins")]
                public void set_paper_size_and_default_margins (Gtk.PaperSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_set_right_margin")]
                public void set_right_margin (double margin, Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_set_top_margin")]
                public void set_top_margin (double margin, Gtk.Unit unit);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class PageSetupUnixDialog : Gtk.Dialog {
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_unix_dialog_get_page_setup")]
                public weak Gtk.PageSetup get_page_setup ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_unix_dialog_get_print_settings")]
                public weak Gtk.PrintSettings get_print_settings ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_unix_dialog_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_unix_dialog_new")]
                public PageSetupUnixDialog (string title, Gtk.Window parent);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_unix_dialog_set_page_setup")]
                public void set_page_setup (Gtk.PageSetup page_setup);
-               [NoArrayLength]
-               [CCode (cname = "gtk_page_setup_unix_dialog_set_print_settings")]
                public void set_print_settings (Gtk.PrintSettings print_settings);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Paned : Gtk.Container {
-               [NoArrayLength]
-               [CCode (cname = "gtk_paned_add1")]
                public void add1 (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paned_add2")]
                public void add2 (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paned_get_child1")]
                public weak Gtk.Widget get_child1 ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paned_get_child2")]
                public weak Gtk.Widget get_child2 ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paned_get_position")]
                public int get_position ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paned_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paned_pack1")]
                public void pack1 (Gtk.Widget child, bool resize, bool shrink);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paned_pack2")]
                public void pack2 (Gtk.Widget child, bool resize, bool shrink);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paned_set_position")]
                public void set_position (int position);
                public weak int position { get; set; }
                [NoAccessorMethod]
@@ -4642,93 +2782,37 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Plug : Gtk.Window {
-               [NoArrayLength]
-               [CCode (cname = "gtk_plug_construct")]
                public void @construct (pointer socket_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_plug_construct_for_display")]
                public void construct_for_display (Gdk.Display display, pointer socket_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_plug_get_id")]
                public pointer get_id ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_plug_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_plug_new")]
                public Plug (pointer socket_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_plug_new_for_display")]
                public Plug.for_display (Gdk.Display display, pointer socket_id);
                public signal void embedded ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Printer : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_compare")]
                public int compare (Gtk.Printer b);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_get_backend")]
                public weak Gtk.PrintBackend get_backend ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_get_description")]
                public weak string get_description ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_get_icon_name")]
                public weak string get_icon_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_get_job_count")]
                public int get_job_count ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_get_location")]
                public weak string get_location ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_get_state_message")]
                public weak string get_state_message ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_is_active")]
                public bool is_active ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_is_default")]
                public bool is_default ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_is_new")]
                public bool is_new ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_new")]
                public Printer (string name, Gtk.PrintBackend backend, bool virtual_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_set_description")]
                public bool set_description (string description);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_set_has_details")]
                public void set_has_details (bool val);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_set_icon_name")]
                public void set_icon_name (string icon);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_set_is_active")]
                public void set_is_active (bool active);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_set_is_default")]
                public void set_is_default (bool val);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_set_is_new")]
                public void set_is_new (bool val);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_set_job_count")]
                public bool set_job_count (int count);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_set_location")]
                public bool set_location (string location);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_set_state_message")]
                public bool set_state_message (string message);
                [NoAccessorMethod]
                public weak string name { get; construct; }
@@ -4748,85 +2832,38 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class PrinterOption : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_allocate_choices")]
                public void allocate_choices (int num);
                [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_choices_from_array")]
                public void choices_from_array (int num_choices, string[] choices, string[] choices_display);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_clear_has_conflict")]
                public void clear_has_conflict ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_has_choice")]
                public bool has_choice (string choice);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_new")]
                public PrinterOption (string name, string display_text, Gtk.PrinterOptionType type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set")]
                public void @set (string value);
                public signal void changed ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class PrinterOptionSet : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set_add")]
                public void add (Gtk.PrinterOption option);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set_boolean")]
                public static void boolean (Gtk.PrinterOption option, bool value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set_clear_conflicts")]
                public void clear_conflicts ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set_foreach")]
                public void @foreach (Gtk.PrinterOptionSetFunc func, pointer user_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set_foreach_in_group")]
                public void foreach_in_group (string group, Gtk.PrinterOptionSetFunc func, pointer user_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set_get_groups")]
                public weak GLib.List get_groups ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set_has_conflict")]
                public static void has_conflict (Gtk.PrinterOption option, bool has_conflict);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set_lookup")]
                public weak Gtk.PrinterOption lookup (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set_new")]
                public PrinterOptionSet ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_set_remove")]
                public void remove (Gtk.PrinterOption option);
                public signal void changed ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class PrinterOptionWidget : Gtk.HBox {
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_widget_get_external_label")]
                public weak Gtk.Widget get_external_label ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_widget_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_widget_get_value")]
                public weak string get_value ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_widget_has_external_label")]
                public bool has_external_label ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_widget_new")]
                public PrinterOptionWidget (Gtk.PrinterOption source);
-               [NoArrayLength]
-               [CCode (cname = "gtk_printer_option_widget_set_source")]
                public void set_source (Gtk.PrinterOption source);
                [NoAccessorMethod]
                public weak Gtk.PrinterOption source { get; set construct; }
@@ -4834,38 +2871,16 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class PrintBackend : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_backend_add_printer")]
                public void add_printer (Gtk.Printer printer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_backend_destroy")]
                public void destroy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_backend_error_quark")]
                public static GLib.Quark error_quark ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_backend_find_printer")]
                public weak Gtk.Printer find_printer (string printer_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_backend_get_printer_list")]
                public weak GLib.List get_printer_list ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_backend_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_backend_load_modules")]
                public static weak GLib.List load_modules ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_backend_print_stream")]
                public virtual void print_stream (Gtk.PrintJob job, GLib.IOChannel data_io, Gtk.PrintJobCompleteFunc @callback, pointer user_data, GLib.DestroyNotify dnotify);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_backend_printer_list_is_done")]
                public bool printer_list_is_done ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_backend_remove_printer")]
                public void remove_printer (Gtk.Printer printer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_backend_set_list_done")]
                public void set_list_done ();
                public signal void printer_list_changed ();
                public signal void printer_list_done ();
@@ -4875,74 +2890,30 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class PrintContext : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_context_create_pango_context")]
                public weak Pango.Context create_pango_context ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_context_create_pango_layout")]
                public weak Pango.Layout create_pango_layout ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_context_get_cairo_context")]
                public weak Cairo.Context get_cairo_context ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_context_get_dpi_x")]
                public double get_dpi_x ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_context_get_dpi_y")]
                public double get_dpi_y ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_context_get_height")]
                public double get_height ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_context_get_page_setup")]
                public weak Gtk.PageSetup get_page_setup ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_context_get_pango_fontmap")]
                public weak Pango.FontMap get_pango_fontmap ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_context_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_context_get_width")]
                public double get_width ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_context_set_cairo_context")]
                public void set_cairo_context (Cairo.Context cr, double dpi_x, double dpi_y);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class PrintJob : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_job_get_printer")]
                public weak Gtk.Printer get_printer ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_job_get_settings")]
                public weak Gtk.PrintSettings get_settings ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_job_get_status")]
                public Gtk.PrintStatus get_status ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_job_get_surface")]
                public weak Cairo.Surface get_surface (GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_job_get_title")]
                public weak string get_title ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_job_get_track_print_status")]
                public bool get_track_print_status ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_job_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_job_new")]
                public PrintJob (string title, Gtk.Printer printer, Gtk.PrintSettings settings, Gtk.PageSetup page_setup);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_job_send")]
                public void send (Gtk.PrintJobCompleteFunc @callback, pointer user_data, GLib.DestroyNotify dnotify);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_job_set_source_file")]
                public bool set_source_file (string filename, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_job_set_track_print_status")]
                public void set_track_print_status (bool track_status);
                [NoAccessorMethod]
                public weak string title { get; construct; }
@@ -4957,71 +2928,27 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class PrintOperation : GLib.Object, Gtk.PrintOperationPreview {
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_cancel")]
                public void cancel ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_get_default_page_setup")]
                public weak Gtk.PageSetup get_default_page_setup ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_get_error")]
                public void get_error (GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_get_print_settings")]
                public weak Gtk.PrintSettings get_print_settings ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_get_status")]
                public Gtk.PrintStatus get_status ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_get_status_string")]
                public weak string get_status_string ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_is_finished")]
                public bool is_finished ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_new")]
                public PrintOperation ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_run")]
                public Gtk.PrintOperationResult run (Gtk.PrintOperationAction action, Gtk.Window parent, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_allow_async")]
                public void set_allow_async (bool allow_async);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_current_page")]
                public void set_current_page (int current_page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_custom_tab_label")]
                public void set_custom_tab_label (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_default_page_setup")]
                public void set_default_page_setup (Gtk.PageSetup default_page_setup);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_export_filename")]
                public void set_export_filename (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_job_name")]
                public void set_job_name (string job_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_n_pages")]
                public void set_n_pages (int n_pages);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_print_settings")]
                public void set_print_settings (Gtk.PrintSettings print_settings);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_show_progress")]
                public void set_show_progress (bool show_progress);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_track_print_status")]
                public void set_track_print_status (bool track_status);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_unit")]
                public void set_unit (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_set_use_full_page")]
                public void set_use_full_page (bool full_page);
                public weak Gtk.PageSetup default_page_setup { get; set; }
                public weak Gtk.PrintSettings print_settings { get; set; }
@@ -5060,227 +2987,81 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class PrintSettings : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_copy")]
                public weak Gtk.PrintSettings copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_foreach")]
                public void @foreach (Gtk.PrintSettingsFunc func, pointer user_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get")]
                public weak string @get (string key);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_bool")]
                public bool get_bool (string key);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_collate")]
                public bool get_collate ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_default_source")]
                public weak string get_default_source ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_dither")]
                public weak string get_dither ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_double")]
                public double get_double (string key);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_double_with_default")]
                public double get_double_with_default (string key, double def);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_duplex")]
                public Gtk.PrintDuplex get_duplex ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_finishings")]
                public weak string get_finishings ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_int")]
                public int get_int (string key);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_int_with_default")]
                public int get_int_with_default (string key, int def);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_length")]
                public double get_length (string key, Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_media_type")]
                public weak string get_media_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_n_copies")]
                public int get_n_copies ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_number_up")]
                public int get_number_up ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_orientation")]
                public Gtk.PageOrientation get_orientation ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_output_bin")]
                public weak string get_output_bin ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_page_ranges")]
                public weak Gtk.PageRange get_page_ranges (int num_ranges);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_page_set")]
                public Gtk.PageSet get_page_set ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_paper_height")]
                public double get_paper_height (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_paper_size")]
                public weak Gtk.PaperSize get_paper_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_paper_width")]
                public double get_paper_width (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_print_pages")]
                public Gtk.PrintPages get_print_pages ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_printer")]
                public weak string get_printer ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_quality")]
                public Gtk.PrintQuality get_quality ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_resolution")]
                public int get_resolution ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_reverse")]
                public bool get_reverse ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_scale")]
                public double get_scale ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_get_use_color")]
                public bool get_use_color ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_has_key")]
                public bool has_key (string key);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_new")]
                public PrintSettings ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set")]
                public void @set (string key, string value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_bool")]
                public void set_bool (string key, bool value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_collate")]
                public void set_collate (bool collate);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_default_source")]
                public void set_default_source (string default_source);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_dither")]
                public void set_dither (string dither);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_double")]
                public void set_double (string key, double value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_duplex")]
                public void set_duplex (Gtk.PrintDuplex duplex);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_finishings")]
                public void set_finishings (string finishings);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_int")]
                public void set_int (string key, int value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_length")]
                public void set_length (string key, double value, Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_media_type")]
                public void set_media_type (string media_type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_n_copies")]
                public void set_n_copies (int num_copies);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_number_up")]
                public void set_number_up (int number_up);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_orientation")]
                public void set_orientation (Gtk.PageOrientation orientation);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_output_bin")]
                public void set_output_bin (string output_bin);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_page_ranges")]
                public void set_page_ranges (Gtk.PageRange page_ranges, int num_ranges);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_page_set")]
                public void set_page_set (Gtk.PageSet page_set);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_paper_height")]
                public void set_paper_height (double height, Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_paper_size")]
                public void set_paper_size (Gtk.PaperSize paper_size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_paper_width")]
                public void set_paper_width (double width, Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_print_pages")]
                public void set_print_pages (Gtk.PrintPages pages);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_printer")]
                public void set_printer (string printer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_quality")]
                public void set_quality (Gtk.PrintQuality quality);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_resolution")]
                public void set_resolution (int resolution);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_reverse")]
                public void set_reverse (bool reverse);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_scale")]
                public void set_scale (double scale);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_set_use_color")]
                public void set_use_color (bool use_color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_settings_unset")]
                public void unset (string key);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class PrintUnixDialog : Gtk.Dialog {
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_unix_dialog_add_custom_tab")]
                public void add_custom_tab (Gtk.Widget child, Gtk.Widget tab_label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_unix_dialog_get_current_page")]
                public int get_current_page ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_unix_dialog_get_page_setup")]
                public weak Gtk.PageSetup get_page_setup ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_unix_dialog_get_selected_printer")]
                public weak Gtk.Printer get_selected_printer ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_unix_dialog_get_settings")]
                public weak Gtk.PrintSettings get_settings ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_unix_dialog_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_unix_dialog_new")]
                public PrintUnixDialog (string title, Gtk.Window parent);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_unix_dialog_set_current_page")]
                public void set_current_page (int current_page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_unix_dialog_set_manual_capabilities")]
                public void set_manual_capabilities (Gtk.PrintCapabilities capabilities);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_unix_dialog_set_page_setup")]
                public void set_page_setup (Gtk.PageSetup page_setup);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_unix_dialog_set_settings")]
                public void set_settings (Gtk.PrintSettings settings);
                public weak Gtk.PageSetup page_setup { get; set; }
                public weak int current_page { get; set; }
@@ -5301,44 +3082,18 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ProgressBar : Gtk.Progress {
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_get_ellipsize")]
                public Pango.EllipsizeMode get_ellipsize ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_get_fraction")]
                public double get_fraction ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_get_orientation")]
                public Gtk.ProgressBarOrientation get_orientation ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_get_pulse_step")]
                public double get_pulse_step ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_get_text")]
                public weak string get_text ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_new")]
                public ProgressBar ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_pulse")]
                public void pulse ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_set_ellipsize")]
                public void set_ellipsize (Pango.EllipsizeMode mode);
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_set_fraction")]
                public void set_fraction (double fraction);
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_set_orientation")]
                public void set_orientation (Gtk.ProgressBarOrientation orientation);
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_set_pulse_step")]
                public void set_pulse_step (double fraction);
-               [NoArrayLength]
-               [CCode (cname = "gtk_progress_bar_set_text")]
                public void set_text (string text);
                [NoAccessorMethod]
                public weak Gtk.Adjustment adjustment { get; set; }
@@ -5358,23 +3113,11 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class RadioAction : Gtk.ToggleAction {
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_action_get_current_value")]
                public int get_current_value ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_action_get_group")]
                public weak GLib.SList get_group ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_action_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_action_new")]
                public RadioAction (string name, string label, string tooltip, string stock_id, int value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_action_set_current_value")]
                public void set_current_value (int current_value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_action_set_group")]
                public void set_group (GLib.SList group);
                [NoAccessorMethod]
                public weak int value { get; set; }
@@ -5384,139 +3127,59 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class RadioButton : Gtk.CheckButton {
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_button_get_group")]
                public weak GLib.SList get_group ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_button_new")]
                public RadioButton (GLib.SList group);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_button_new_from_widget")]
                public RadioButton.from_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_button_new_with_label")]
                public RadioButton.with_label (GLib.SList group, string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_button_new_with_label_from_widget")]
                public RadioButton.with_label_from_widget (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_button_new_with_mnemonic")]
                public RadioButton.with_mnemonic (GLib.SList group, string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_button_new_with_mnemonic_from_widget")]
                public RadioButton.with_mnemonic_from_widget (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_button_set_group")]
                public void set_group (GLib.SList group);
                public weak Gtk.RadioButton group { set; }
                public signal void group_changed ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class RadioMenuItem : Gtk.CheckMenuItem {
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_menu_item_get_group")]
                public weak GLib.SList get_group ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_menu_item_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_menu_item_new")]
                public RadioMenuItem (GLib.SList group);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_menu_item_new_from_widget")]
                public RadioMenuItem.from_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_menu_item_new_with_label")]
                public RadioMenuItem.with_label (GLib.SList group, string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_menu_item_new_with_label_from_widget")]
                public RadioMenuItem.with_label_from_widget (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_menu_item_new_with_mnemonic")]
                public RadioMenuItem.with_mnemonic (GLib.SList group, string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_menu_item_new_with_mnemonic_from_widget")]
                public RadioMenuItem.with_mnemonic_from_widget (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_menu_item_set_group")]
                public void set_group (GLib.SList group);
                public weak Gtk.RadioMenuItem group { set; }
                public signal void group_changed ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class RadioToolButton : Gtk.ToggleToolButton {
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_tool_button_get_group")]
                public weak GLib.SList get_group ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_tool_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_tool_button_new")]
                public RadioToolButton (GLib.SList group);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_tool_button_new_from_stock")]
                public RadioToolButton.from_stock (GLib.SList group, string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_tool_button_new_from_widget")]
                public RadioToolButton.from_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_tool_button_new_with_stock_from_widget")]
                public RadioToolButton.with_stock_from_widget (string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_radio_tool_button_set_group")]
                public void set_group (GLib.SList group);
                public weak Gtk.RadioToolButton group { set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Range : Gtk.Widget {
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_get_adjustment")]
                public weak Gtk.Adjustment get_adjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_get_inverted")]
                public bool get_inverted ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_get_lower_stepper_sensitivity")]
                public Gtk.SensitivityType get_lower_stepper_sensitivity ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_get_update_policy")]
                public Gtk.UpdateType get_update_policy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_get_upper_stepper_sensitivity")]
                public Gtk.SensitivityType get_upper_stepper_sensitivity ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_get_value")]
                public double get_value ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_set_adjustment")]
                public void set_adjustment (Gtk.Adjustment adjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_set_increments")]
                public void set_increments (double step, double page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_set_inverted")]
                public void set_inverted (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_set_lower_stepper_sensitivity")]
                public void set_lower_stepper_sensitivity (Gtk.SensitivityType sensitivity);
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_set_range")]
                public void set_range (double min, double max);
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_set_update_policy")]
                public void set_update_policy (Gtk.UpdateType policy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_set_upper_stepper_sensitivity")]
                public void set_upper_stepper_sensitivity (Gtk.SensitivityType sensitivity);
-               [NoArrayLength]
-               [CCode (cname = "gtk_range_set_value")]
                public void set_value (double value);
                public weak Gtk.UpdateType update_policy { get; set; }
                public weak Gtk.Adjustment adjustment { get; set construct; }
@@ -5540,20 +3203,10 @@ namespace Gtk {
                public Gdk.Color @base;
                public int xthickness;
                public int ythickness;
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_style_copy")]
                public weak Gtk.RcStyle copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_style_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_style_new")]
                public RcStyle ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_style_ref")]
                public void @ref ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_style_unref")]
                public void unref ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -5561,138 +3214,58 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class RecentChooserDialog : Gtk.Dialog, Gtk.RecentChooser {
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_dialog_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_dialog_new")]
                public RecentChooserDialog (string title, Gtk.Window parent, string first_button_text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_dialog_new_for_manager")]
                public RecentChooserDialog.for_manager (string title, Gtk.Window parent, Gtk.RecentManager manager, string first_button_text);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class RecentChooserMenu : Gtk.Menu, Gtk.RecentChooser {
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_menu_get_show_numbers")]
                public bool get_show_numbers ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_menu_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_menu_new")]
                public RecentChooserMenu ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_menu_new_for_manager")]
                public RecentChooserMenu.for_manager (Gtk.RecentManager manager);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_menu_set_show_numbers")]
                public void set_show_numbers (bool show_numbers);
                public weak bool show_numbers { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class RecentChooserWidget : Gtk.VBox, Gtk.RecentChooser {
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_widget_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_widget_new")]
                public RecentChooserWidget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_widget_new_for_manager")]
                public RecentChooserWidget.for_manager (Gtk.RecentManager manager);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class RecentFilter : Gtk.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_add_age")]
                public void add_age (int days);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_add_application")]
                public void add_application (string application);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_add_custom")]
                public void add_custom (Gtk.RecentFilterFlags needed, Gtk.RecentFilterFunc func, pointer data, GLib.DestroyNotify data_destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_add_group")]
                public void add_group (string group);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_add_mime_type")]
                public void add_mime_type (string mime_type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_add_pattern")]
                public void add_pattern (string pattern);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_add_pixbuf_formats")]
                public void add_pixbuf_formats ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_filter")]
                public bool filter (Gtk.RecentFilterInfo filter_info);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_get_needed")]
                public Gtk.RecentFilterFlags get_needed ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_new")]
                public RecentFilter ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_filter_set_name")]
                public void set_name (string name);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class RecentManager : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_add_full")]
                public bool add_full (string uri, Gtk.RecentData recent_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_add_item")]
                public bool add_item (string uri);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_error_quark")]
                public static GLib.Quark error_quark ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_get_default")]
                public static weak Gtk.RecentManager get_default ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_get_for_screen")]
                public static weak Gtk.RecentManager get_for_screen (Gdk.Screen screen);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_get_items")]
                public weak GLib.List get_items ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_get_limit")]
                public int get_limit ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_has_item")]
                public bool has_item (string uri);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_lookup_item")]
                public weak Gtk.RecentInfo lookup_item (string uri, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_move_item")]
                public bool move_item (string uri, string new_uri, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_new")]
                public RecentManager ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_purge_items")]
                public int purge_items (GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_remove_item")]
                public bool remove_item (string uri, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_set_limit")]
                public void set_limit (int limit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_manager_set_screen")]
                public void set_screen (Gdk.Screen screen);
                [NoAccessorMethod]
                public weak string filename { get; construct; }
@@ -5703,26 +3276,12 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Ruler : Gtk.Widget {
-               [NoArrayLength]
-               [CCode (cname = "gtk_ruler_draw_pos")]
                public virtual void draw_pos ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ruler_draw_ticks")]
                public virtual void draw_ticks ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ruler_get_metric")]
                public Gtk.MetricType get_metric ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ruler_get_range")]
                public void get_range (double lower, double upper, double position, double max_size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_ruler_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ruler_set_metric")]
                public void set_metric (Gtk.MetricType metric);
-               [NoArrayLength]
-               [CCode (cname = "gtk_ruler_set_range")]
                public void set_range (double lower, double upper, double position, double max_size);
                [NoAccessorMethod]
                public weak double lower { get; set; }
@@ -5736,32 +3295,14 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Scale : Gtk.Range {
-               [NoArrayLength]
-               [CCode (cname = "gtk_scale_get_digits")]
                public int get_digits ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scale_get_draw_value")]
                public bool get_draw_value ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scale_get_layout")]
                public weak Pango.Layout get_layout ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scale_get_layout_offsets")]
                public virtual void get_layout_offsets (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_scale_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scale_get_value_pos")]
                public Gtk.PositionType get_value_pos ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scale_set_digits")]
                public void set_digits (int digits);
-               [NoArrayLength]
-               [CCode (cname = "gtk_scale_set_draw_value")]
                public void set_draw_value (bool draw_value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_scale_set_value_pos")]
                public void set_value_pos (Gtk.PositionType pos);
                public weak int digits { get; set; }
                public weak bool draw_value { get; set; }
@@ -5770,61 +3311,27 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Scrollbar : Gtk.Range {
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrollbar_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ScrolledWindow : Gtk.Bin {
                public weak Gtk.Widget hscrollbar;
                public weak Gtk.Widget vscrollbar;
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_add_with_viewport")]
                public void add_with_viewport (Gtk.Widget child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_get_hadjustment")]
                public weak Gtk.Adjustment get_hadjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_get_hscrollbar")]
                public weak Gtk.Widget get_hscrollbar ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_get_placement")]
                public Gtk.CornerType get_placement ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_get_policy")]
                public void get_policy (Gtk.PolicyType hscrollbar_policy, Gtk.PolicyType vscrollbar_policy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_get_shadow_type")]
                public Gtk.ShadowType get_shadow_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_get_vadjustment")]
                public weak Gtk.Adjustment get_vadjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_get_vscrollbar")]
                public weak Gtk.Widget get_vscrollbar ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_new")]
                public ScrolledWindow (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_set_hadjustment")]
                public void set_hadjustment (Gtk.Adjustment hadjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_set_placement")]
                public void set_placement (Gtk.CornerType window_placement);
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_set_policy")]
                public void set_policy (Gtk.PolicyType hscrollbar_policy, Gtk.PolicyType vscrollbar_policy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_set_shadow_type")]
                public void set_shadow_type (Gtk.ShadowType type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_set_vadjustment")]
                public void set_vadjustment (Gtk.Adjustment vadjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_scrolled_window_unset_placement")]
                public void unset_placement ();
                public weak Gtk.Adjustment hadjustment { get; set construct; }
                public weak Gtk.Adjustment vadjustment { get; set construct; }
@@ -5842,192 +3349,84 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Separator : Gtk.Widget {
-               [NoArrayLength]
-               [CCode (cname = "gtk_separator_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class SeparatorMenuItem : Gtk.MenuItem {
-               [NoArrayLength]
-               [CCode (cname = "gtk_separator_menu_item_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_separator_menu_item_new")]
                public SeparatorMenuItem ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class SeparatorToolItem : Gtk.ToolItem {
-               [NoArrayLength]
-               [CCode (cname = "gtk_separator_tool_item_get_draw")]
                public bool get_draw ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_separator_tool_item_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_separator_tool_item_new")]
                public SeparatorToolItem ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_separator_tool_item_set_draw")]
                public void set_draw (bool draw);
                public weak bool draw { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Settings : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_settings_get_default")]
                public static weak Gtk.Settings get_default ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_settings_get_for_screen")]
                public static weak Gtk.Settings get_for_screen (Gdk.Screen screen);
-               [NoArrayLength]
-               [CCode (cname = "gtk_settings_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_settings_install_property")]
                public static void install_property (GLib.ParamSpec pspec);
-               [NoArrayLength]
-               [CCode (cname = "gtk_settings_install_property_parser")]
                public static void install_property_parser (GLib.ParamSpec pspec, Gtk.RcPropertyParser parser);
-               [NoArrayLength]
-               [CCode (cname = "gtk_settings_set_double_property")]
                public void set_double_property (string name, double v_double, string origin);
-               [NoArrayLength]
-               [CCode (cname = "gtk_settings_set_long_property")]
                public void set_long_property (string name, long v_long, string origin);
-               [NoArrayLength]
-               [CCode (cname = "gtk_settings_set_property_value")]
                public void set_property_value (string name, Gtk.SettingsValue svalue);
-               [NoArrayLength]
-               [CCode (cname = "gtk_settings_set_string_property")]
                public void set_string_property (string name, string v_string, string origin);
                [NoAccessorMethod]
                public weak GLib.HashTable color_hash { get; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class SizeGroup : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_size_group_add_widget")]
                public void add_widget (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_size_group_get_ignore_hidden")]
                public bool get_ignore_hidden ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_size_group_get_mode")]
                public Gtk.SizeGroupMode get_mode ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_size_group_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_size_group_get_widgets")]
                public weak GLib.SList get_widgets ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_size_group_new")]
                public SizeGroup (Gtk.SizeGroupMode mode);
-               [NoArrayLength]
-               [CCode (cname = "gtk_size_group_remove_widget")]
                public void remove_widget (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_size_group_set_ignore_hidden")]
                public void set_ignore_hidden (bool ignore_hidden);
-               [NoArrayLength]
-               [CCode (cname = "gtk_size_group_set_mode")]
                public void set_mode (Gtk.SizeGroupMode mode);
                public weak Gtk.SizeGroupMode mode { get; set; }
                public weak bool ignore_hidden { get; set; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Socket : Gtk.Container {
-               [NoArrayLength]
-               [CCode (cname = "gtk_socket_add_id")]
                public void add_id (pointer window_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_socket_get_id")]
                public pointer get_id ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_socket_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_socket_new")]
                public Socket ();
                public signal void plug_added ();
                public signal bool plug_removed ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class SpinButton : Gtk.Entry, Gtk.Editable {
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_configure")]
                public void configure (Gtk.Adjustment adjustment, double climb_rate, uint digits);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_get_adjustment")]
                public weak Gtk.Adjustment get_adjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_get_digits")]
                public uint get_digits ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_get_increments")]
                public void get_increments (double step, double page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_get_numeric")]
                public bool get_numeric ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_get_range")]
                public void get_range (double min, double max);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_get_snap_to_ticks")]
                public bool get_snap_to_ticks ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_get_update_policy")]
                public Gtk.SpinButtonUpdatePolicy get_update_policy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_get_value")]
                public double get_value ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_get_value_as_int")]
                public int get_value_as_int ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_get_wrap")]
                public bool get_wrap ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_new")]
                public SpinButton (Gtk.Adjustment adjustment, double climb_rate, uint digits);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_new_with_range")]
                public SpinButton.with_range (double min, double max, double step);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_set_adjustment")]
                public void set_adjustment (Gtk.Adjustment adjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_set_digits")]
                public void set_digits (uint digits);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_set_increments")]
                public void set_increments (double step, double page);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_set_numeric")]
                public void set_numeric (bool numeric);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_set_range")]
                public void set_range (double min, double max);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_set_snap_to_ticks")]
                public void set_snap_to_ticks (bool snap_to_ticks);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_set_update_policy")]
                public void set_update_policy (Gtk.SpinButtonUpdatePolicy policy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_set_value")]
                public void set_value (double value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_set_wrap")]
                public void set_wrap (bool wrap);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_spin")]
                public void spin (Gtk.SpinType direction, double increment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_spin_button_update")]
                public void update ();
                public weak Gtk.Adjustment adjustment { get; set; }
                [NoAccessorMethod]
@@ -6046,29 +3445,13 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Statusbar : Gtk.HBox {
-               [NoArrayLength]
-               [CCode (cname = "gtk_statusbar_get_context_id")]
                public uint get_context_id (string context_description);
-               [NoArrayLength]
-               [CCode (cname = "gtk_statusbar_get_has_resize_grip")]
                public bool get_has_resize_grip ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_statusbar_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_statusbar_new")]
                public Statusbar ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_statusbar_pop")]
                public void pop (uint context_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_statusbar_push")]
                public uint push (uint context_id, string text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_statusbar_remove")]
                public void remove (uint context_id, uint message_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_statusbar_set_has_resize_grip")]
                public void set_has_resize_grip (bool setting);
                public weak bool has_resize_grip { get; set; }
                public signal void text_pushed (uint context_id, string text);
@@ -6076,74 +3459,28 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class StatusIcon : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_get_blinking")]
                public bool get_blinking ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_get_geometry")]
                public bool get_geometry (Gdk.Screen screen, Gdk.Rectangle area, Gtk.Orientation orientation);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_get_icon_name")]
                public weak string get_icon_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_get_pixbuf")]
                public weak Gdk.Pixbuf get_pixbuf ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_get_size")]
                public int get_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_get_stock")]
                public weak string get_stock ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_get_storage_type")]
                public Gtk.ImageType get_storage_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_get_visible")]
                public bool get_visible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_is_embedded")]
                public bool is_embedded ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_new")]
                public StatusIcon ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_new_from_file")]
                public StatusIcon.from_file (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_new_from_icon_name")]
                public StatusIcon.from_icon_name (string icon_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_new_from_pixbuf")]
                public StatusIcon.from_pixbuf (Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_new_from_stock")]
                public StatusIcon.from_stock (string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_position_menu")]
                public static void position_menu (Gtk.Menu menu, int x, int y, bool push_in, pointer user_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_set_blinking")]
                public void set_blinking (bool blinking);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_set_from_file")]
                public void set_from_file (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_set_from_icon_name")]
                public void set_from_icon_name (string icon_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_set_from_pixbuf")]
                public void set_from_pixbuf (Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_set_from_stock")]
                public void set_from_stock (string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_set_tooltip")]
                public void set_tooltip (string tooltip_text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_status_icon_set_visible")]
                public void set_visible (bool visible);
                [NoAccessorMethod]
                public weak Gdk.Pixbuf pixbuf { get; set; }
@@ -6187,85 +3524,35 @@ namespace Gtk {
                public weak Gdk.GC black_gc;
                public weak Gdk.GC white_gc;
                public weak Gdk.Pixmap bg_pixmap;
-               [NoArrayLength]
-               [CCode (cname = "gtk_style_apply_default_background")]
                public void apply_default_background (Gdk.Window window, bool set_bg, Gtk.StateType state_type, Gdk.Rectangle area, int x, int y, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_style_attach")]
                public weak Gtk.Style attach (Gdk.Window window);
-               [NoArrayLength]
-               [CCode (cname = "gtk_style_copy")]
                public virtual weak Gtk.Style copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_style_detach")]
                public void detach ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_style_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_style_lookup_color")]
                public bool lookup_color (string color_name, Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_style_lookup_icon_set")]
                public weak Gtk.IconSet lookup_icon_set (string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_style_new")]
                public Style ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_style_render_icon")]
                public virtual weak Gdk.Pixbuf render_icon (Gtk.IconSource source, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
-               [NoArrayLength]
-               [CCode (cname = "gtk_style_set_background")]
                public virtual void set_background (Gdk.Window window, Gtk.StateType state_type);
                public signal void realize ();
                public signal void unrealize ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Table : Gtk.Container {
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_attach")]
                public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach, Gtk.AttachOptions xoptions, Gtk.AttachOptions yoptions, uint xpadding, uint ypadding);
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_attach_defaults")]
                public void attach_defaults (Gtk.Widget widget, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_get_col_spacing")]
                public uint get_col_spacing (uint column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_get_default_col_spacing")]
                public uint get_default_col_spacing ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_get_default_row_spacing")]
                public uint get_default_row_spacing ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_get_homogeneous")]
                public bool get_homogeneous ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_get_row_spacing")]
                public uint get_row_spacing (uint row);
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_new")]
                public Table (uint rows, uint columns, bool homogeneous);
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_resize")]
                public void resize (uint rows, uint columns);
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_set_col_spacing")]
                public void set_col_spacing (uint column, uint spacing);
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_set_col_spacings")]
                public void set_col_spacings (uint spacing);
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_set_homogeneous")]
                public void set_homogeneous (bool homogeneous);
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_set_row_spacing")]
                public void set_row_spacing (uint row, uint spacing);
-               [NoArrayLength]
-               [CCode (cname = "gtk_table_set_row_spacings")]
                public void set_row_spacings (uint spacing);
                [NoAccessorMethod]
                public weak uint n_rows { get; set; }
@@ -6278,215 +3565,78 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TearoffMenuItem : Gtk.MenuItem {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tearoff_menu_item_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tearoff_menu_item_new")]
                public TearoffMenuItem ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TextBuffer : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_add_selection_clipboard")]
                public void add_selection_clipboard (Gtk.Clipboard clipboard);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_apply_tag_by_name")]
                public void apply_tag_by_name (string name, ref Gtk.TextIter start, ref Gtk.TextIter end);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_backspace")]
                public bool backspace (ref Gtk.TextIter iter, bool interactive, bool default_editable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_copy_clipboard")]
                public void copy_clipboard (Gtk.Clipboard clipboard);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_create_child_anchor")]
                public weak Gtk.TextChildAnchor create_child_anchor (ref Gtk.TextIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_create_mark")]
                public weak Gtk.TextMark create_mark (string mark_name, ref Gtk.TextIter where, bool left_gravity);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_create_tag")]
                public weak Gtk.TextTag create_tag (string tag_name, string first_property_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_cut_clipboard")]
                public void cut_clipboard (Gtk.Clipboard clipboard, bool default_editable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_delete")]
                public void delete (ref Gtk.TextIter start, ref Gtk.TextIter end);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_delete_interactive")]
                public bool delete_interactive (ref Gtk.TextIter start_iter, ref Gtk.TextIter end_iter, bool default_editable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_delete_mark")]
                public void delete_mark (Gtk.TextMark mark);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_delete_mark_by_name")]
                public void delete_mark_by_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_delete_selection")]
                public bool delete_selection (bool interactive, bool default_editable);
                [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_deserialize")]
                public bool deserialize (Gtk.TextBuffer content_buffer, Gdk.Atom format, ref Gtk.TextIter iter, uchar[] data, ulong length, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_deserialize_get_can_create_tags")]
                public bool deserialize_get_can_create_tags (Gdk.Atom format);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_deserialize_set_can_create_tags")]
                public void deserialize_set_can_create_tags (Gdk.Atom format, bool can_create_tags);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_bounds")]
                public void get_bounds (ref Gtk.TextIter start, ref Gtk.TextIter end);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_char_count")]
                public int get_char_count ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_copy_target_list")]
                public weak Gtk.TargetList get_copy_target_list ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_deserialize_formats")]
                public Gdk.Atom get_deserialize_formats (int n_formats);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_end_iter")]
                public void get_end_iter (ref Gtk.TextIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_has_selection")]
                public bool get_has_selection ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_insert")]
                public weak Gtk.TextMark get_insert ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_iter_at_child_anchor")]
                public void get_iter_at_child_anchor (ref Gtk.TextIter iter, Gtk.TextChildAnchor anchor);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_iter_at_line")]
                public void get_iter_at_line (ref Gtk.TextIter iter, int line_number);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_iter_at_line_index")]
                public void get_iter_at_line_index (ref Gtk.TextIter iter, int line_number, int byte_index);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_iter_at_line_offset")]
                public void get_iter_at_line_offset (ref Gtk.TextIter iter, int line_number, int char_offset);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_iter_at_mark")]
                public void get_iter_at_mark (ref Gtk.TextIter iter, Gtk.TextMark mark);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_iter_at_offset")]
                public void get_iter_at_offset (ref Gtk.TextIter iter, int char_offset);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_line_count")]
                public int get_line_count ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_mark")]
                public weak Gtk.TextMark get_mark (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_modified")]
                public bool get_modified ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_paste_target_list")]
                public weak Gtk.TargetList get_paste_target_list ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_selection_bound")]
                public weak Gtk.TextMark get_selection_bound ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_selection_bounds")]
                public bool get_selection_bounds (ref Gtk.TextIter start, ref Gtk.TextIter end);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_serialize_formats")]
                public Gdk.Atom get_serialize_formats (int n_formats);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_slice")]
                public weak string get_slice (ref Gtk.TextIter start, ref Gtk.TextIter end, bool include_hidden_chars);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_start_iter")]
                public void get_start_iter (ref Gtk.TextIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_tag_table")]
                public weak Gtk.TextTagTable get_tag_table ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_text")]
                public weak string get_text (ref Gtk.TextIter start, ref Gtk.TextIter end, bool include_hidden_chars);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_insert")]
                public void insert (ref Gtk.TextIter iter, string text, int len);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_insert_at_cursor")]
                public void insert_at_cursor (string text, int len);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_insert_interactive")]
                public bool insert_interactive (ref Gtk.TextIter iter, string text, int len, bool default_editable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_insert_interactive_at_cursor")]
                public bool insert_interactive_at_cursor (string text, int len, bool default_editable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_insert_range")]
                public void insert_range (ref Gtk.TextIter iter, ref Gtk.TextIter start, ref Gtk.TextIter end);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_insert_range_interactive")]
                public bool insert_range_interactive (ref Gtk.TextIter iter, ref Gtk.TextIter start, ref Gtk.TextIter end, bool default_editable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_insert_with_tags")]
                public void insert_with_tags (ref Gtk.TextIter iter, string text, int len, Gtk.TextTag first_tag);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_insert_with_tags_by_name")]
                public void insert_with_tags_by_name (ref Gtk.TextIter iter, string text, int len, string first_tag_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_move_mark")]
                public void move_mark (Gtk.TextMark mark, ref Gtk.TextIter where);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_move_mark_by_name")]
                public void move_mark_by_name (string name, ref Gtk.TextIter where);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_new")]
                public TextBuffer (Gtk.TextTagTable table);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_paste_clipboard")]
                public void paste_clipboard (Gtk.Clipboard clipboard, ref Gtk.TextIter override_location, bool default_editable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_place_cursor")]
                public void place_cursor (ref Gtk.TextIter where);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_register_deserialize_format")]
                public Gdk.Atom register_deserialize_format (string mime_type, Gtk.TextBufferDeserializeFunc function, pointer user_data, GLib.DestroyNotify user_data_destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_register_deserialize_tagset")]
                public Gdk.Atom register_deserialize_tagset (string tagset_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_register_serialize_format")]
                public Gdk.Atom register_serialize_format (string mime_type, Gtk.TextBufferSerializeFunc function, pointer user_data, GLib.DestroyNotify user_data_destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_register_serialize_tagset")]
                public Gdk.Atom register_serialize_tagset (string tagset_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_remove_all_tags")]
                public void remove_all_tags (ref Gtk.TextIter start, ref Gtk.TextIter end);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_remove_selection_clipboard")]
                public void remove_selection_clipboard (Gtk.Clipboard clipboard);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_remove_tag_by_name")]
                public void remove_tag_by_name (string name, ref Gtk.TextIter start, ref Gtk.TextIter end);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_select_range")]
                public void select_range (ref Gtk.TextIter ins, ref Gtk.TextIter bound);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_serialize")]
                public uchar serialize (Gtk.TextBuffer content_buffer, Gdk.Atom format, ref Gtk.TextIter start, ref Gtk.TextIter end, ulong length);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_set_modified")]
                public void set_modified (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_set_text")]
                public void set_text (string text, int len);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_unregister_deserialize_format")]
                public void unregister_deserialize_format (Gdk.Atom format);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_buffer_unregister_serialize_format")]
                public void unregister_serialize_format (Gdk.Atom format);
                [NoAccessorMethod]
                public weak Gtk.TextTagTable tag_table { get; construct; }
@@ -6517,56 +3667,26 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TextChildAnchor : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_child_anchor_get_deleted")]
                public bool get_deleted ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_child_anchor_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_child_anchor_get_widgets")]
                public weak GLib.List get_widgets ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_child_anchor_new")]
                public TextChildAnchor ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TextMark : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_mark_get_buffer")]
                public weak Gtk.TextBuffer get_buffer ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_mark_get_deleted")]
                public bool get_deleted ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_mark_get_left_gravity")]
                public bool get_left_gravity ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_mark_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_mark_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_mark_get_visible")]
                public bool get_visible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_mark_set_visible")]
                public void set_visible (bool setting);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TextTag : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_tag_get_priority")]
                public int get_priority ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_tag_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_tag_new")]
                public TextTag (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_tag_set_priority")]
                public void set_priority (int priority);
                [NoAccessorMethod]
                public weak string name { get; construct; }
@@ -6645,26 +3765,12 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TextTagTable : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_tag_table_add")]
                public void add (Gtk.TextTag tag);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_tag_table_foreach")]
                public void @foreach (Gtk.TextTagTableForeach func, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_tag_table_get_size")]
                public int get_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_tag_table_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_tag_table_lookup")]
                public weak Gtk.TextTag lookup (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_tag_table_new")]
                public TextTagTable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_tag_table_remove")]
                public void remove (Gtk.TextTag tag);
                public signal void tag_changed (Gtk.TextTag tag, bool size_changed);
                public signal void tag_added (Gtk.TextTag tag);
@@ -6672,179 +3778,63 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TextView : Gtk.Container {
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_add_child_at_anchor")]
                public void add_child_at_anchor (Gtk.Widget child, Gtk.TextChildAnchor anchor);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_add_child_in_window")]
                public void add_child_in_window (Gtk.Widget child, Gtk.TextWindowType which_window, int xpos, int ypos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_backward_display_line")]
                public bool backward_display_line (ref Gtk.TextIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_backward_display_line_start")]
                public bool backward_display_line_start (ref Gtk.TextIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_buffer_to_window_coords")]
                public void buffer_to_window_coords (Gtk.TextWindowType win, int buffer_x, int buffer_y, int window_x, int window_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_forward_display_line")]
                public bool forward_display_line (ref Gtk.TextIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_forward_display_line_end")]
                public bool forward_display_line_end (ref Gtk.TextIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_accepts_tab")]
                public bool get_accepts_tab ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_border_window_size")]
                public int get_border_window_size (Gtk.TextWindowType type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_buffer")]
                public weak Gtk.TextBuffer get_buffer ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_cursor_visible")]
                public bool get_cursor_visible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_default_attributes")]
                public weak Gtk.TextAttributes get_default_attributes ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_editable")]
                public bool get_editable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_indent")]
                public int get_indent ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_iter_at_location")]
                public void get_iter_at_location (ref Gtk.TextIter iter, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_iter_at_position")]
                public void get_iter_at_position (ref Gtk.TextIter iter, int trailing, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_iter_location")]
                public void get_iter_location (ref Gtk.TextIter iter, Gdk.Rectangle location);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_justification")]
                public Gtk.Justification get_justification ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_left_margin")]
                public int get_left_margin ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_line_at_y")]
                public void get_line_at_y (ref Gtk.TextIter target_iter, int y, int line_top);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_line_yrange")]
                public void get_line_yrange (ref Gtk.TextIter iter, int y, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_overwrite")]
                public bool get_overwrite ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_pixels_above_lines")]
                public int get_pixels_above_lines ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_pixels_below_lines")]
                public int get_pixels_below_lines ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_pixels_inside_wrap")]
                public int get_pixels_inside_wrap ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_right_margin")]
                public int get_right_margin ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_tabs")]
                public weak Pango.TabArray get_tabs ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_visible_rect")]
                public void get_visible_rect (Gdk.Rectangle visible_rect);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_window")]
                public weak Gdk.Window get_window (Gtk.TextWindowType win);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_window_type")]
                public Gtk.TextWindowType get_window_type (Gdk.Window window);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_get_wrap_mode")]
                public Gtk.WrapMode get_wrap_mode ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_move_child")]
                public void move_child (Gtk.Widget child, int xpos, int ypos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_move_mark_onscreen")]
                public bool move_mark_onscreen (Gtk.TextMark mark);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_move_visually")]
                public bool move_visually (ref Gtk.TextIter iter, int count);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_new")]
                public TextView ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_new_with_buffer")]
                public TextView.with_buffer (Gtk.TextBuffer buffer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_place_cursor_onscreen")]
                public bool place_cursor_onscreen ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_scroll_mark_onscreen")]
                public void scroll_mark_onscreen (Gtk.TextMark mark);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_scroll_to_iter")]
                public bool scroll_to_iter (ref Gtk.TextIter iter, double within_margin, bool use_align, double xalign, double yalign);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_scroll_to_mark")]
                public void scroll_to_mark (Gtk.TextMark mark, double within_margin, bool use_align, double xalign, double yalign);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_accepts_tab")]
                public void set_accepts_tab (bool accepts_tab);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_border_window_size")]
                public void set_border_window_size (Gtk.TextWindowType type, int size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_buffer")]
                public void set_buffer (Gtk.TextBuffer buffer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_cursor_visible")]
                public void set_cursor_visible (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_editable")]
                public void set_editable (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_indent")]
                public void set_indent (int indent);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_justification")]
                public void set_justification (Gtk.Justification justification);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_left_margin")]
                public void set_left_margin (int left_margin);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_overwrite")]
                public void set_overwrite (bool overwrite);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_pixels_above_lines")]
                public void set_pixels_above_lines (int pixels_above_lines);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_pixels_below_lines")]
                public void set_pixels_below_lines (int pixels_below_lines);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_pixels_inside_wrap")]
                public void set_pixels_inside_wrap (int pixels_inside_wrap);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_right_margin")]
                public void set_right_margin (int right_margin);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_tabs")]
                public void set_tabs (Pango.TabArray tabs);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_set_wrap_mode")]
                public void set_wrap_mode (Gtk.WrapMode wrap_mode);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_starts_display_line")]
                public bool starts_display_line (ref Gtk.TextIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_view_window_to_buffer_coords")]
                public void window_to_buffer_coords (Gtk.TextWindowType win, int window_x, int window_y, int buffer_x, int buffer_y);
                public weak int pixels_above_lines { get; set; }
                public weak int pixels_below_lines { get; set; }
@@ -6876,23 +3866,11 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ToggleAction : Gtk.Action {
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_action_get_active")]
                public bool get_active ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_action_get_draw_as_radio")]
                public bool get_draw_as_radio ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_action_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_action_new")]
                public ToggleAction (string name, string label, string tooltip, string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_action_set_active")]
                public void set_active (bool is_active);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_action_set_draw_as_radio")]
                public void set_draw_as_radio (bool draw_as_radio);
                public weak bool draw_as_radio { get; set; }
                public weak bool active { get; set; }
@@ -6901,35 +3879,15 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ToggleButton : Gtk.Button {
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_button_get_active")]
                public bool get_active ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_button_get_inconsistent")]
                public bool get_inconsistent ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_button_get_mode")]
                public bool get_mode ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_button_new")]
                public ToggleButton ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_button_new_with_label")]
                public ToggleButton.with_label (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_button_new_with_mnemonic")]
                public ToggleButton.with_mnemonic (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_button_set_active")]
                public void set_active (bool is_active);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_button_set_inconsistent")]
                public void set_inconsistent (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_button_set_mode")]
                public void set_mode (bool draw_indicator);
                public weak bool active { get; set; }
                public weak bool inconsistent { get; set; }
@@ -6940,20 +3898,10 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ToggleToolButton : Gtk.ToolButton {
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_tool_button_get_active")]
                public bool get_active ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_tool_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_tool_button_new")]
                public ToggleToolButton ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_tool_button_new_from_stock")]
                public ToggleToolButton.from_stock (string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toggle_tool_button_set_active")]
                public void set_active (bool is_active);
                public weak bool active { get; set; }
                public signal void toggled ();
@@ -6963,62 +3911,24 @@ namespace Gtk {
                public int num_children;
                public weak GLib.List children;
                public Gtk.ToolbarStyle style;
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_get_drop_index")]
                public int get_drop_index (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_get_icon_size")]
                public Gtk.IconSize get_icon_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_get_item_index")]
                public int get_item_index (Gtk.ToolItem item);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_get_n_items")]
                public int get_n_items ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_get_nth_item")]
                public weak Gtk.ToolItem get_nth_item (int n);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_get_orientation")]
                public Gtk.Orientation get_orientation ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_get_relief_style")]
                public Gtk.ReliefStyle get_relief_style ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_get_show_arrow")]
                public bool get_show_arrow ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_get_style")]
                public Gtk.ToolbarStyle get_style ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_get_tooltips")]
                public bool get_tooltips ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_insert")]
                public void insert (Gtk.ToolItem item, int pos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_new")]
                public Toolbar ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_set_drop_highlight_item")]
                public void set_drop_highlight_item (Gtk.ToolItem tool_item, int index_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_set_orientation")]
                public void set_orientation (Gtk.Orientation orientation);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_set_show_arrow")]
                public void set_show_arrow (bool show_arrow);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_set_style")]
                public void set_style (Gtk.ToolbarStyle style);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_set_tooltips")]
                public void set_tooltips (bool enable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_toolbar_unset_style")]
                public void unset_style ();
                public weak Gtk.Orientation orientation { get; set; }
                [NoAccessorMethod]
@@ -7035,74 +3945,30 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Tooltips : Gtk.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tooltips_disable")]
                public void disable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tooltips_enable")]
                public void enable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tooltips_force_window")]
                public void force_window ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tooltips_get_info_from_tip_window")]
                public static bool get_info_from_tip_window (Gtk.Window tip_window, Gtk.Tooltips tooltips, Gtk.Widget current_widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tooltips_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tooltips_new")]
                public Tooltips ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tooltips_set_tip")]
                public void set_tip (Gtk.Widget widget, string tip_text, string tip_private);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ToolButton : Gtk.ToolItem {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_get_icon_name")]
                public weak string get_icon_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_get_icon_widget")]
                public weak Gtk.Widget get_icon_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_get_label")]
                public weak string get_label ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_get_label_widget")]
                public weak Gtk.Widget get_label_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_get_stock_id")]
                public weak string get_stock_id ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_get_use_underline")]
                public bool get_use_underline ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_new")]
                public ToolButton (Gtk.Widget icon_widget, string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_new_from_stock")]
                public ToolButton.from_stock (string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_set_icon_name")]
                public void set_icon_name (string icon_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_set_icon_widget")]
                public void set_icon_widget (Gtk.Widget icon_widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_set_label")]
                public void set_label (string label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_set_label_widget")]
                public void set_label_widget (Gtk.Widget label_widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_set_stock_id")]
                public void set_stock_id (string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_button_set_use_underline")]
                public void set_use_underline (bool use_underline);
                public weak string label { get; set; }
                public weak bool use_underline { get; set; }
@@ -7114,71 +3980,27 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class ToolItem : Gtk.Bin {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_expand")]
                public bool get_expand ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_homogeneous")]
                public bool get_homogeneous ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_icon_size")]
                public Gtk.IconSize get_icon_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_is_important")]
                public bool get_is_important ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_orientation")]
                public Gtk.Orientation get_orientation ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_proxy_menu_item")]
                public weak Gtk.Widget get_proxy_menu_item (string menu_item_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_relief_style")]
                public Gtk.ReliefStyle get_relief_style ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_toolbar_style")]
                public Gtk.ToolbarStyle get_toolbar_style ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_use_drag_window")]
                public bool get_use_drag_window ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_visible_horizontal")]
                public bool get_visible_horizontal ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_get_visible_vertical")]
                public bool get_visible_vertical ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_new")]
                public ToolItem ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_rebuild_menu")]
                public void rebuild_menu ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_retrieve_proxy_menu_item")]
                public weak Gtk.Widget retrieve_proxy_menu_item ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_set_expand")]
                public void set_expand (bool expand);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_set_homogeneous")]
                public void set_homogeneous (bool homogeneous);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_set_is_important")]
                public void set_is_important (bool is_important);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_set_proxy_menu_item")]
                public void set_proxy_menu_item (string menu_item_id, Gtk.Widget menu_item);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_set_use_drag_window")]
                public void set_use_drag_window (bool use_drag_window);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_set_visible_horizontal")]
                public void set_visible_horizontal (bool visible_horizontal);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tool_item_set_visible_vertical")]
                public void set_visible_vertical (bool visible_vertical);
                public weak bool visible_horizontal { get; set; }
                public weak bool visible_vertical { get; set; }
@@ -7190,49 +4012,23 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TrayIcon : Gtk.Plug {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tray_icon_get_type")]
                public static GLib.Type get_type ();
                [NoAccessorMethod]
                public weak Gtk.Orientation orientation { get; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TreeModelFilter : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_clear_cache")]
                public void clear_cache ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_convert_child_iter_to_iter")]
                public bool convert_child_iter_to_iter (ref Gtk.TreeIter filter_iter, ref Gtk.TreeIter child_iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_convert_child_path_to_path")]
                public weak Gtk.TreePath convert_child_path_to_path (Gtk.TreePath child_path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_convert_iter_to_child_iter")]
                public void convert_iter_to_child_iter (ref Gtk.TreeIter child_iter, ref Gtk.TreeIter filter_iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_convert_path_to_child_path")]
                public weak Gtk.TreePath convert_path_to_child_path (Gtk.TreePath filter_path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_get_model")]
                public weak Gtk.TreeModel get_model ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_new")]
                public TreeModelFilter (Gtk.TreeModel child_model, Gtk.TreePath root);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_refilter")]
                public void refilter ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_set_modify_func")]
                public void set_modify_func (int n_columns, GLib.Type types, Gtk.TreeModelFilterModifyFunc func, pointer data, Gtk.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_set_visible_column")]
                public void set_visible_column (int column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_filter_set_visible_func")]
                public void set_visible_func (Gtk.TreeModelFilterVisibleFunc func, pointer data, Gtk.DestroyNotify destroy);
                [NoAccessorMethod]
                public weak Gtk.TreeModel child_model { get; construct; }
@@ -7241,425 +4037,157 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TreeModelSort : GLib.Object, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_sort_clear_cache")]
                public void clear_cache ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_sort_convert_child_iter_to_iter")]
                public void convert_child_iter_to_iter (ref Gtk.TreeIter sort_iter, ref Gtk.TreeIter child_iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_sort_convert_child_path_to_path")]
                public weak Gtk.TreePath convert_child_path_to_path (Gtk.TreePath child_path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_sort_convert_iter_to_child_iter")]
                public void convert_iter_to_child_iter (ref Gtk.TreeIter child_iter, ref Gtk.TreeIter sorted_iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_sort_convert_path_to_child_path")]
                public weak Gtk.TreePath convert_path_to_child_path (Gtk.TreePath sorted_path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_sort_get_model")]
                public weak Gtk.TreeModel get_model ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_sort_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_sort_iter_is_valid")]
                public bool iter_is_valid (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_sort_new_with_model")]
                public TreeModelSort.with_model (Gtk.TreeModel child_model);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_sort_reset_default_sort_func")]
                public void reset_default_sort_func ();
                [NoAccessorMethod]
                public weak Gtk.TreeModel model { get; construct; }
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TreeSelection : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_count_selected_rows")]
                public int count_selected_rows ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_get_mode")]
                public Gtk.SelectionMode get_mode ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_get_selected")]
                public bool get_selected (Gtk.TreeModel model, ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_get_selected_rows")]
                public weak GLib.List get_selected_rows (Gtk.TreeModel model);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_get_tree_view")]
                public weak Gtk.TreeView get_tree_view ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_get_user_data")]
                public pointer get_user_data ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_iter_is_selected")]
                public bool iter_is_selected (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_path_is_selected")]
                public bool path_is_selected (Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_select_all")]
                public void select_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_select_iter")]
                public void select_iter (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_select_path")]
                public void select_path (Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_select_range")]
                public void select_range (Gtk.TreePath start_path, Gtk.TreePath end_path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_selected_foreach")]
                public void selected_foreach (Gtk.TreeSelectionForeachFunc func, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_set_mode")]
                public void set_mode (Gtk.SelectionMode type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_set_select_function")]
                public void set_select_function (Gtk.TreeSelectionFunc func, pointer data, Gtk.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_unselect_all")]
                public void unselect_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_unselect_iter")]
                public void unselect_iter (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_unselect_path")]
                public void unselect_path (Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_selection_unselect_range")]
                public void unselect_range (Gtk.TreePath start_path, Gtk.TreePath end_path);
                public signal void changed ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TreeStore : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource, Gtk.TreeDragDest, Gtk.TreeSortable {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_append")]
                public void append (ref Gtk.TreeIter iter, ref Gtk.TreeIter parent);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_clear")]
                public void clear ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_insert")]
                public void insert (ref Gtk.TreeIter iter, ref Gtk.TreeIter parent, int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_insert_after")]
                public void insert_after (ref Gtk.TreeIter iter, ref Gtk.TreeIter parent, ref Gtk.TreeIter sibling);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_insert_before")]
                public void insert_before (ref Gtk.TreeIter iter, ref Gtk.TreeIter parent, ref Gtk.TreeIter sibling);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_insert_with_values")]
                public void insert_with_values (ref Gtk.TreeIter iter, ref Gtk.TreeIter parent, int position);
                [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_insert_with_valuesv")]
                public void insert_with_valuesv (ref Gtk.TreeIter iter, ref Gtk.TreeIter parent, int position, int columns, GLib.Value[] values, int n_values);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_is_ancestor")]
                public bool is_ancestor (ref Gtk.TreeIter iter, ref Gtk.TreeIter descendant);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_iter_depth")]
                public int iter_depth (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_iter_is_valid")]
                public bool iter_is_valid (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_move_after")]
                public void move_after (ref Gtk.TreeIter iter, ref Gtk.TreeIter position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_move_before")]
                public void move_before (ref Gtk.TreeIter iter, ref Gtk.TreeIter position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_new")]
                public TreeStore (int n_columns);
-               [NoArrayLength]
                [CCode (cname = "gtk_tree_store_newv")]
                public TreeStore.newv (int n_columns, GLib.Type types);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_prepend")]
                public void prepend (ref Gtk.TreeIter iter, ref Gtk.TreeIter parent);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_remove")]
                public bool remove (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_reorder")]
                public void reorder (ref Gtk.TreeIter parent, int new_order);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_set")]
                public void @set (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_set_column_types")]
                public void set_column_types (int n_columns, GLib.Type types);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_set_valist")]
                public void set_valist (ref Gtk.TreeIter iter, pointer var_args);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_set_value")]
                public void set_value (ref Gtk.TreeIter iter, int column, GLib.Value value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_store_swap")]
                public void swap (ref Gtk.TreeIter a, ref Gtk.TreeIter b);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TreeView : Gtk.Container {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_append_column")]
                public int append_column (Gtk.TreeViewColumn column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_collapse_all")]
                public void collapse_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_collapse_row")]
                public bool collapse_row (Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_columns_autosize")]
                public void columns_autosize ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_create_row_drag_icon")]
                public weak Gdk.Pixmap create_row_drag_icon (Gtk.TreePath path);
                [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_enable_model_drag_dest")]
                public void enable_model_drag_dest (Gtk.TargetEntry[] targets, int n_targets, Gdk.DragAction actions);
                [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_enable_model_drag_source")]
                public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, int n_targets, Gdk.DragAction actions);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_expand_all")]
                public void expand_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_expand_row")]
                public bool expand_row (Gtk.TreePath path, bool open_all);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_expand_to_path")]
                public void expand_to_path (Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_background_area")]
                public void get_background_area (Gtk.TreePath path, Gtk.TreeViewColumn column, Gdk.Rectangle rect);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_bin_window")]
                public weak Gdk.Window get_bin_window ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_cell_area")]
                public void get_cell_area (Gtk.TreePath path, Gtk.TreeViewColumn column, Gdk.Rectangle rect);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_column")]
                public weak Gtk.TreeViewColumn get_column (int n);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_columns")]
                public weak GLib.List get_columns ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_cursor")]
                public void get_cursor (Gtk.TreePath path, Gtk.TreeViewColumn focus_column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_dest_row_at_pos")]
                public bool get_dest_row_at_pos (int drag_x, int drag_y, Gtk.TreePath path, Gtk.TreeViewDropPosition pos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_drag_dest_row")]
                public void get_drag_dest_row (Gtk.TreePath path, Gtk.TreeViewDropPosition pos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_enable_search")]
                public bool get_enable_search ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_enable_tree_lines")]
                public bool get_enable_tree_lines ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_expander_column")]
                public weak Gtk.TreeViewColumn get_expander_column ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_fixed_height_mode")]
                public bool get_fixed_height_mode ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_grid_lines")]
                public Gtk.TreeViewGridLines get_grid_lines ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_hadjustment")]
                public weak Gtk.Adjustment get_hadjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_headers_clickable")]
                public bool get_headers_clickable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_headers_visible")]
                public bool get_headers_visible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_hover_expand")]
                public bool get_hover_expand ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_hover_selection")]
                public bool get_hover_selection ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_model")]
                public weak Gtk.TreeModel get_model ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_path_at_pos")]
                public bool get_path_at_pos (int x, int y, Gtk.TreePath path, Gtk.TreeViewColumn column, int cell_x, int cell_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_reorderable")]
                public bool get_reorderable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_row_separator_func")]
                public Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_rubber_banding")]
                public bool get_rubber_banding ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_rules_hint")]
                public bool get_rules_hint ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_search_column")]
                public int get_search_column ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_search_entry")]
                public weak Gtk.Entry get_search_entry ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_search_equal_func")]
                public Gtk.TreeViewSearchEqualFunc get_search_equal_func ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_search_position_func")]
                public Gtk.TreeViewSearchPositionFunc get_search_position_func ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_selection")]
                public weak Gtk.TreeSelection get_selection ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_vadjustment")]
                public weak Gtk.Adjustment get_vadjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_visible_range")]
                public bool get_visible_range (Gtk.TreePath start_path, Gtk.TreePath end_path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_get_visible_rect")]
                public void get_visible_rect (Gdk.Rectangle visible_rect);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_insert_column")]
                public int insert_column (Gtk.TreeViewColumn column, int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_insert_column_with_attributes")]
                public int insert_column_with_attributes (int position, string title, Gtk.CellRenderer cell, ...);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_insert_column_with_data_func")]
                public int insert_column_with_data_func (int position, string title, Gtk.CellRenderer cell, Gtk.TreeCellDataFunc func, pointer data, GLib.DestroyNotify dnotify);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_map_expanded_rows")]
                public void map_expanded_rows (Gtk.TreeViewMappingFunc func, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_mode_get_type")]
                public static GLib.Type mode_get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_move_column_after")]
                public void move_column_after (Gtk.TreeViewColumn column, Gtk.TreeViewColumn base_column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_new")]
                public TreeView ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_new_with_model")]
                public TreeView.with_model (Gtk.TreeModel model);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_remove_column")]
                public int remove_column (Gtk.TreeViewColumn column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_scroll_to_cell")]
                public void scroll_to_cell (Gtk.TreePath path, Gtk.TreeViewColumn column, bool use_align, float row_align, float col_align);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_scroll_to_point")]
                public void scroll_to_point (int tree_x, int tree_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_column_drag_function")]
                public void set_column_drag_function (Gtk.TreeViewColumnDropFunc func, pointer user_data, Gtk.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_cursor")]
                public void set_cursor (Gtk.TreePath path, Gtk.TreeViewColumn focus_column, bool start_editing);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_cursor_on_cell")]
                public void set_cursor_on_cell (Gtk.TreePath path, Gtk.TreeViewColumn focus_column, Gtk.CellRenderer focus_cell, bool start_editing);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_destroy_count_func")]
                public void set_destroy_count_func (Gtk.TreeDestroyCountFunc func, pointer data, Gtk.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_drag_dest_row")]
                public void set_drag_dest_row (Gtk.TreePath path, Gtk.TreeViewDropPosition pos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_enable_search")]
                public void set_enable_search (bool enable_search);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_enable_tree_lines")]
                public void set_enable_tree_lines (bool enabled);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_expander_column")]
                public void set_expander_column (Gtk.TreeViewColumn column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_fixed_height_mode")]
                public void set_fixed_height_mode (bool enable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_grid_lines")]
                public void set_grid_lines (Gtk.TreeViewGridLines grid_lines);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_hadjustment")]
                public void set_hadjustment (Gtk.Adjustment adjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_headers_clickable")]
                public void set_headers_clickable (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_headers_visible")]
                public void set_headers_visible (bool headers_visible);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_hover_expand")]
                public void set_hover_expand (bool expand);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_hover_selection")]
                public void set_hover_selection (bool hover);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_model")]
                public void set_model (Gtk.TreeModel model);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_reorderable")]
                public void set_reorderable (bool reorderable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_row_separator_func")]
                public void set_row_separator_func (Gtk.TreeViewRowSeparatorFunc func, pointer data, Gtk.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_rubber_banding")]
                public void set_rubber_banding (bool enable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_rules_hint")]
                public void set_rules_hint (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_search_column")]
                public void set_search_column (int column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_search_entry")]
                public void set_search_entry (Gtk.Entry entry);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_search_equal_func")]
                public void set_search_equal_func (Gtk.TreeViewSearchEqualFunc search_equal_func, pointer search_user_data, Gtk.DestroyNotify search_destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_search_position_func")]
                public void set_search_position_func (Gtk.TreeViewSearchPositionFunc func, pointer data, GLib.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_set_vadjustment")]
                public void set_vadjustment (Gtk.Adjustment adjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_tree_to_widget_coords")]
                public void tree_to_widget_coords (int tx, int ty, int wx, int wy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_unset_rows_drag_dest")]
                public void unset_rows_drag_dest ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_unset_rows_drag_source")]
                public void unset_rows_drag_source ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_widget_to_tree_coords")]
                public void widget_to_tree_coords (int wx, int wy, int tx, int ty);
                public weak Gtk.TreeModel model { get; set; }
                public weak Gtk.Adjustment hadjustment { get; set; }
@@ -7703,155 +4231,55 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class TreeViewColumn : Gtk.Object, Gtk.CellLayout {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_add_attribute")]
                public void add_attribute (Gtk.CellRenderer cell_renderer, string attribute, int column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_cell_get_position")]
                public bool cell_get_position (Gtk.CellRenderer cell_renderer, int start_pos, int width);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_cell_get_size")]
                public void cell_get_size (Gdk.Rectangle cell_area, int x_offset, int y_offset, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_cell_is_visible")]
                public bool cell_is_visible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_cell_set_cell_data")]
                public void cell_set_cell_data (Gtk.TreeModel tree_model, ref Gtk.TreeIter iter, bool is_expander, bool is_expanded);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_clear")]
                public void clear ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_clear_attributes")]
                public void clear_attributes (Gtk.CellRenderer cell_renderer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_focus_cell")]
                public void focus_cell (Gtk.CellRenderer cell);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_alignment")]
                public float get_alignment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_cell_renderers")]
                public weak GLib.List get_cell_renderers ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_clickable")]
                public bool get_clickable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_expand")]
                public bool get_expand ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_fixed_width")]
                public int get_fixed_width ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_max_width")]
                public int get_max_width ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_min_width")]
                public int get_min_width ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_reorderable")]
                public bool get_reorderable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_resizable")]
                public bool get_resizable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_sizing")]
                public Gtk.TreeViewColumnSizing get_sizing ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_sort_column_id")]
                public int get_sort_column_id ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_sort_indicator")]
                public bool get_sort_indicator ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_sort_order")]
                public Gtk.SortType get_sort_order ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_spacing")]
                public int get_spacing ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_title")]
                public weak string get_title ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_visible")]
                public bool get_visible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_widget")]
                public weak Gtk.Widget get_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_get_width")]
                public int get_width ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_new")]
                public TreeViewColumn ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_new_with_attributes")]
                public TreeViewColumn.with_attributes (string title, Gtk.CellRenderer cell, ...);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_pack_end")]
                public void pack_end (Gtk.CellRenderer cell, bool expand);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_pack_start")]
                public void pack_start (Gtk.CellRenderer cell, bool expand);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_queue_resize")]
                public void queue_resize ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_alignment")]
                public void set_alignment (float xalign);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_attributes")]
                public void set_attributes (Gtk.CellRenderer cell_renderer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_cell_data_func")]
                public void set_cell_data_func (Gtk.CellRenderer cell_renderer, Gtk.TreeCellDataFunc func, pointer func_data, Gtk.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_clickable")]
                public void set_clickable (bool clickable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_expand")]
                public void set_expand (bool expand);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_fixed_width")]
                public void set_fixed_width (int fixed_width);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_max_width")]
                public void set_max_width (int max_width);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_min_width")]
                public void set_min_width (int min_width);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_reorderable")]
                public void set_reorderable (bool reorderable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_resizable")]
                public void set_resizable (bool resizable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_sizing")]
                public void set_sizing (Gtk.TreeViewColumnSizing type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_sort_column_id")]
                public void set_sort_column_id (int sort_column_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_sort_indicator")]
                public void set_sort_indicator (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_sort_order")]
                public void set_sort_order (Gtk.SortType order);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_spacing")]
                public void set_spacing (int spacing);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_title")]
                public void set_title (string title);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_visible")]
                public void set_visible (bool visible);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_view_column_set_widget")]
                public void set_widget (Gtk.Widget widget);
                public weak bool visible { get; set; }
                public weak bool resizable { get; set; }
@@ -7874,59 +4302,23 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class UIManager : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_add_ui")]
                public void add_ui (uint merge_id, string path, string name, string action, Gtk.UIManagerItemType type, bool top);
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_add_ui_from_file")]
                public uint add_ui_from_file (string filename, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_add_ui_from_string")]
                public uint add_ui_from_string (string buffer, long length, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_ensure_update")]
                public void ensure_update ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_get_accel_group")]
                public weak Gtk.AccelGroup get_accel_group ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_get_action")]
                public virtual weak Gtk.Action get_action (string path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_get_action_groups")]
                public weak GLib.List get_action_groups ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_get_add_tearoffs")]
                public bool get_add_tearoffs ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_get_toplevels")]
                public weak GLib.SList get_toplevels (Gtk.UIManagerItemType types);
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_get_ui")]
                public weak string get_ui ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_get_widget")]
                public virtual weak Gtk.Widget get_widget (string path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_insert_action_group")]
                public void insert_action_group (Gtk.ActionGroup action_group, int pos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_new")]
                public UIManager ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_new_merge_id")]
                public UIManager.merge_id ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_remove_action_group")]
                public void remove_action_group (Gtk.ActionGroup action_group);
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_remove_ui")]
                public void remove_ui (uint merge_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_ui_manager_set_add_tearoffs")]
                public void set_add_tearoffs (bool add_tearoffs);
                public weak bool add_tearoffs { get; set; }
                public weak string ui { get; }
@@ -7939,47 +4331,23 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class VBox : Gtk.Box {
-               [NoArrayLength]
-               [CCode (cname = "gtk_vbox_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_vbox_new")]
                public VBox (bool homogeneous, int spacing);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class VButtonBox : Gtk.ButtonBox {
-               [NoArrayLength]
-               [CCode (cname = "gtk_vbutton_box_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_vbutton_box_new")]
                public VButtonBox ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Viewport : Gtk.Bin {
-               [NoArrayLength]
-               [CCode (cname = "gtk_viewport_get_hadjustment")]
                public weak Gtk.Adjustment get_hadjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_viewport_get_shadow_type")]
                public Gtk.ShadowType get_shadow_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_viewport_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_viewport_get_vadjustment")]
                public weak Gtk.Adjustment get_vadjustment ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_viewport_new")]
                public Viewport (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_viewport_set_hadjustment")]
                public void set_hadjustment (Gtk.Adjustment adjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_viewport_set_shadow_type")]
                public void set_shadow_type (Gtk.ShadowType type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_viewport_set_vadjustment")]
                public void set_vadjustment (Gtk.Adjustment adjustment);
                public weak Gtk.Adjustment hadjustment { get; set construct; }
                public weak Gtk.Adjustment vadjustment { get; set construct; }
@@ -7988,50 +4356,28 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class VPaned : Gtk.Paned {
-               [NoArrayLength]
-               [CCode (cname = "gtk_vpaned_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_vpaned_new")]
                public VPaned ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class VRuler : Gtk.Ruler {
-               [NoArrayLength]
-               [CCode (cname = "gtk_vruler_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_vruler_new")]
                public VRuler ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class VScale : Gtk.Scale {
-               [NoArrayLength]
-               [CCode (cname = "gtk_vscale_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_vscale_new")]
                public VScale (Gtk.Adjustment adjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_vscale_new_with_range")]
                public VScale.with_range (double min, double max, double step);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class VScrollbar : Gtk.Scrollbar {
-               [NoArrayLength]
-               [CCode (cname = "gtk_vscrollbar_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_vscrollbar_new")]
                public VScrollbar (Gtk.Adjustment adjustment);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class VSeparator : Gtk.Separator {
-               [NoArrayLength]
-               [CCode (cname = "gtk_vseparator_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_vseparator_new")]
                public VSeparator ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -8039,341 +4385,117 @@ namespace Gtk {
                public Gtk.Requisition requisition;
                public Gtk.Allocation allocation;
                public weak Gdk.Window window;
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_activate")]
                public bool activate ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_add_accelerator")]
                public void add_accelerator (string accel_signal, Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_add_events")]
                public void add_events (int events);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_add_mnemonic_label")]
                public void add_mnemonic_label (Gtk.Widget label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_child_focus")]
                public bool child_focus (Gtk.DirectionType direction);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_class_find_style_property")]
                public static weak GLib.ParamSpec class_find_style_property (pointer klass, string property_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_class_install_style_property")]
                public static void class_install_style_property (pointer klass, GLib.ParamSpec pspec);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_class_install_style_property_parser")]
                public static void class_install_style_property_parser (pointer klass, GLib.ParamSpec pspec, Gtk.RcPropertyParser parser);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_class_list_style_properties")]
                public static weak GLib.ParamSpec class_list_style_properties (pointer klass, uint n_properties);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_class_path")]
                public void class_path (uint path_length, string path, string path_reversed);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_create_pango_context")]
                public weak Pango.Context create_pango_context ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_create_pango_layout")]
                public weak Pango.Layout create_pango_layout (string text);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_destroyed")]
                public void destroyed (Gtk.Widget widget_pointer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_ensure_style")]
                public void ensure_style ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_freeze_child_notify")]
                public void freeze_child_notify ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_accessible")]
                public virtual weak Atk.Object get_accessible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_action")]
                public weak Gtk.Action get_action ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_ancestor")]
                public weak Gtk.Widget get_ancestor (GLib.Type widget_type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_child_requisition")]
                public void get_child_requisition (ref Gtk.Requisition requisition);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_child_visible")]
                public bool get_child_visible ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_clipboard")]
                public weak Gtk.Clipboard get_clipboard (Gdk.Atom selection);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_colormap")]
                public weak Gdk.Colormap get_colormap ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_composite_name")]
                public weak string get_composite_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_default_colormap")]
                public static weak Gdk.Colormap get_default_colormap ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_default_direction")]
                public static Gtk.TextDirection get_default_direction ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_default_style")]
                public static weak Gtk.Style get_default_style ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_default_visual")]
                public static weak Gdk.Visual get_default_visual ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_direction")]
                public Gtk.TextDirection get_direction ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_display")]
                public weak Gdk.Display get_display ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_events")]
                public int get_events ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_extension_events")]
                public Gdk.ExtensionMode get_extension_events ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_modifier_style")]
                public weak Gtk.RcStyle get_modifier_style ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_no_show_all")]
                public bool get_no_show_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_pango_context")]
                public weak Pango.Context get_pango_context ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_parent")]
                public weak Gtk.Widget get_parent ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_parent_window")]
                public weak Gdk.Window get_parent_window ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_pointer")]
                public void get_pointer (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_root_window")]
                public weak Gdk.Window get_root_window ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_screen")]
                public weak Gdk.Screen get_screen ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_settings")]
                public weak Gtk.Settings get_settings ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_size_request")]
                public void get_size_request (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_style")]
                public weak Gtk.Style get_style ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_toplevel")]
                public weak Gtk.Widget get_toplevel ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_get_visual")]
                public weak Gdk.Visual get_visual ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_grab_default")]
                public void grab_default ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_has_screen")]
                public bool has_screen ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_hide_all")]
                public virtual void hide_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_hide_on_delete")]
                public bool hide_on_delete ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_input_shape_combine_mask")]
                public void input_shape_combine_mask (Gdk.Bitmap shape_mask, int offset_x, int offset_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_intersect")]
                public bool intersect (Gdk.Rectangle area, Gdk.Rectangle intersection);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_is_ancestor")]
                public bool is_ancestor (Gtk.Widget ancestor);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_is_composited")]
                public bool is_composited ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_list_accel_closures")]
                public weak GLib.List list_accel_closures ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_list_mnemonic_labels")]
                public weak GLib.List list_mnemonic_labels ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_modify_base")]
                public void modify_base (Gtk.StateType state, Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_modify_bg")]
                public void modify_bg (Gtk.StateType state, Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_modify_fg")]
                public void modify_fg (Gtk.StateType state, Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_modify_font")]
                public void modify_font (Pango.FontDescription font_desc);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_modify_style")]
                public void modify_style (Gtk.RcStyle style);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_modify_text")]
                public void modify_text (Gtk.StateType state, Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_new")]
                public Widget (GLib.Type type, string first_property_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_path")]
                public void path (uint path_length, string path, string path_reversed);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_pop_colormap")]
                public static void pop_colormap ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_pop_composite_child")]
                public static void pop_composite_child ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_push_colormap")]
                public static void push_colormap (Gdk.Colormap cmap);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_push_composite_child")]
                public static void push_composite_child ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_queue_draw")]
                public void queue_draw ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_queue_draw_area")]
                public void queue_draw_area (int x, int y, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_queue_resize")]
                public void queue_resize ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_queue_resize_no_redraw")]
                public void queue_resize_no_redraw ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_ref")]
                public weak Gtk.Widget @ref ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_region_intersect")]
                public weak Gdk.Region region_intersect (Gdk.Region region);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_remove_accelerator")]
                public bool remove_accelerator (Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_remove_mnemonic_label")]
                public void remove_mnemonic_label (Gtk.Widget label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_render_icon")]
                public weak Gdk.Pixbuf render_icon (string stock_id, Gtk.IconSize size, string detail);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_reparent")]
                public void reparent (Gtk.Widget new_parent);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_reset_rc_styles")]
                public void reset_rc_styles ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_reset_shapes")]
                public void reset_shapes ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_send_expose")]
                public int send_expose (Gdk.Event event);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_accel_path")]
                public void set_accel_path (string accel_path, Gtk.AccelGroup accel_group);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_app_paintable")]
                public void set_app_paintable (bool app_paintable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_child_visible")]
                public void set_child_visible (bool is_visible);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_colormap")]
                public void set_colormap (Gdk.Colormap colormap);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_composite_name")]
                public void set_composite_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_default_colormap")]
                public static void set_default_colormap (Gdk.Colormap colormap);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_default_direction")]
                public static void set_default_direction (Gtk.TextDirection dir);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_direction")]
                public void set_direction (Gtk.TextDirection dir);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_double_buffered")]
                public void set_double_buffered (bool double_buffered);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_events")]
                public void set_events (int events);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_extension_events")]
                public void set_extension_events (Gdk.ExtensionMode mode);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_name")]
                public void set_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_no_show_all")]
                public void set_no_show_all (bool no_show_all);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_parent")]
                public void set_parent (Gtk.Widget parent);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_parent_window")]
                public void set_parent_window (Gdk.Window parent_window);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_redraw_on_allocate")]
                public void set_redraw_on_allocate (bool redraw_on_allocate);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_scroll_adjustments")]
                public bool set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_sensitive")]
                public void set_sensitive (bool sensitive);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_size_request")]
                public void set_size_request (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_state")]
                public void set_state (Gtk.StateType state);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_set_style")]
                public void set_style (Gtk.Style style);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_shape_combine_mask")]
                public void shape_combine_mask (Gdk.Bitmap shape_mask, int offset_x, int offset_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_show_all")]
                public virtual void show_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_show_now")]
                public void show_now ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_style_get")]
                public void style_get (string first_property_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_style_get_property")]
                public void style_get_property (string property_name, GLib.Value value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_style_get_valist")]
                public void style_get_valist (string first_property_name, pointer var_args);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_thaw_child_notify")]
                public void thaw_child_notify ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_translate_coordinates")]
                public bool translate_coordinates (Gtk.Widget dest_widget, int src_x, int src_y, int dest_x, int dest_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_unparent")]
                public void unparent ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_widget_unref")]
                public void unref ();
                public weak string name { get; set; }
                public weak Gtk.Container parent { get; set; }
@@ -8484,290 +4606,102 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Win32EmbedWidget : Gtk.Window {
-               [NoArrayLength]
-               [CCode (cname = "gtk_win32_embed_widget_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Window : Gtk.Bin {
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_activate_default")]
                public bool activate_default ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_activate_focus")]
                public bool activate_focus ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_activate_key")]
                public bool activate_key (Gdk.EventKey event);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_add_accel_group")]
                public void add_accel_group (Gtk.AccelGroup accel_group);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_add_embedded_xid")]
                public void add_embedded_xid (uint xid);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_add_mnemonic")]
                public void add_mnemonic (uint keyval, Gtk.Widget target);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_begin_move_drag")]
                public void begin_move_drag (int button, int root_x, int root_y, uint timestamp);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_begin_resize_drag")]
                public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint timestamp);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_deiconify")]
                public void deiconify ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_fullscreen")]
                public void fullscreen ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_accept_focus")]
                public bool get_accept_focus ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_decorated")]
                public bool get_decorated ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_default_icon_list")]
                public static weak GLib.List get_default_icon_list ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_default_size")]
                public void get_default_size (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_deletable")]
                public bool get_deletable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_destroy_with_parent")]
                public bool get_destroy_with_parent ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_focus")]
                public weak Gtk.Widget get_focus ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_focus_on_map")]
                public bool get_focus_on_map ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_frame_dimensions")]
                public void get_frame_dimensions (int left, int top, int right, int bottom);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_gravity")]
                public Gdk.Gravity get_gravity ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_group")]
                public weak Gtk.WindowGroup get_group ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_has_frame")]
                public bool get_has_frame ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_icon")]
                public weak Gdk.Pixbuf get_icon ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_icon_list")]
                public weak GLib.List get_icon_list ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_icon_name")]
                public weak string get_icon_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_mnemonic_modifier")]
                public Gdk.ModifierType get_mnemonic_modifier ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_modal")]
                public bool get_modal ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_position")]
                public void get_position (int root_x, int root_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_resizable")]
                public bool get_resizable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_role")]
                public weak string get_role ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_screen")]
                public weak Gdk.Screen get_screen ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_size")]
                public void get_size (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_skip_pager_hint")]
                public bool get_skip_pager_hint ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_skip_taskbar_hint")]
                public bool get_skip_taskbar_hint ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_title")]
                public weak string get_title ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_transient_for")]
                public weak Gtk.Window get_transient_for ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_type_hint")]
                public Gdk.WindowTypeHint get_type_hint ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_get_urgency_hint")]
                public bool get_urgency_hint ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_iconify")]
                public void iconify ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_list_toplevels")]
                public static weak GLib.List list_toplevels ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_maximize")]
                public void maximize ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_mnemonic_activate")]
                public bool mnemonic_activate (uint keyval, Gdk.ModifierType modifier);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_move")]
                public void move (int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_new")]
                public Window (Gtk.WindowType type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_parse_geometry")]
                public bool parse_geometry (string geometry);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_present")]
                public void present ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_present_with_time")]
                public void present_with_time (uint timestamp);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_propagate_key_event")]
                public bool propagate_key_event (Gdk.EventKey event);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_remove_accel_group")]
                public void remove_accel_group (Gtk.AccelGroup accel_group);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_remove_embedded_xid")]
                public void remove_embedded_xid (uint xid);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_remove_mnemonic")]
                public void remove_mnemonic (uint keyval, Gtk.Widget target);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_reshow_with_initial_size")]
                public void reshow_with_initial_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_resize")]
                public void resize (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_accept_focus")]
                public void set_accept_focus (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_auto_startup_notification")]
                public static void set_auto_startup_notification (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_decorated")]
                public void set_decorated (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_default")]
                public void set_default (Gtk.Widget default_widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_default_icon")]
                public static void set_default_icon (Gdk.Pixbuf icon);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_default_icon_from_file")]
                public static bool set_default_icon_from_file (string filename, GLib.Error err);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_default_icon_list")]
                public static void set_default_icon_list (GLib.List list);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_default_icon_name")]
                public static void set_default_icon_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_default_size")]
                public void set_default_size (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_deletable")]
                public void set_deletable (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_destroy_with_parent")]
                public void set_destroy_with_parent (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_focus_on_map")]
                public void set_focus_on_map (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_frame_dimensions")]
                public void set_frame_dimensions (int left, int top, int right, int bottom);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_geometry_hints")]
                public void set_geometry_hints (Gtk.Widget geometry_widget, Gdk.Geometry geometry, Gdk.WindowHints geom_mask);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_gravity")]
                public void set_gravity (Gdk.Gravity gravity);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_has_frame")]
                public void set_has_frame (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_icon")]
                public void set_icon (Gdk.Pixbuf icon);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_icon_from_file")]
                public bool set_icon_from_file (string filename, GLib.Error err);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_icon_list")]
                public void set_icon_list (GLib.List list);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_icon_name")]
                public void set_icon_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_keep_above")]
                public void set_keep_above (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_keep_below")]
                public void set_keep_below (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_mnemonic_modifier")]
                public void set_mnemonic_modifier (Gdk.ModifierType modifier);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_modal")]
                public void set_modal (bool modal);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_position")]
                public void set_position (Gtk.WindowPosition position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_resizable")]
                public void set_resizable (bool resizable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_role")]
                public void set_role (string role);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_screen")]
                public void set_screen (Gdk.Screen screen);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_skip_pager_hint")]
                public void set_skip_pager_hint (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_skip_taskbar_hint")]
                public void set_skip_taskbar_hint (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_title")]
                public void set_title (string title);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_transient_for")]
                public void set_transient_for (Gtk.Window parent);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_type_hint")]
                public void set_type_hint (Gdk.WindowTypeHint hint);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_urgency_hint")]
                public void set_urgency_hint (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_set_wmclass")]
                public void set_wmclass (string wmclass_name, string wmclass_class);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_stick")]
                public void stick ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_unfullscreen")]
                public void unfullscreen ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_unmaximize")]
                public void unmaximize ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_unstick")]
                public void unstick ();
                [NoAccessorMethod]
                public weak Gtk.WindowType type { get; construct; }
@@ -8813,22 +4747,12 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class WindowGroup : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_group_add_window")]
                public void add_window (Gtk.Window window);
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_group_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_group_new")]
                public WindowGroup ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_window_group_remove_window")]
                public void remove_window (Gtk.Window window);
        }
        public interface CellEditable {
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_editable_get_type")]
                public static GLib.Type get_type ();
                [HasEmitter]
                public signal void editing_done ();
@@ -8836,70 +4760,28 @@ namespace Gtk {
                public signal void remove_widget ();
        }
        public interface CellLayout {
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_layout_add_attribute")]
                public virtual void add_attribute (Gtk.CellRenderer cell, string attribute, int column);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_layout_clear")]
                public virtual void clear ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_layout_clear_attributes")]
                public virtual void clear_attributes (Gtk.CellRenderer cell);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_layout_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_layout_pack_end")]
                public virtual void pack_end (Gtk.CellRenderer cell, bool expand);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_layout_pack_start")]
                public virtual void pack_start (Gtk.CellRenderer cell, bool expand);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_layout_reorder")]
                public virtual void reorder (Gtk.CellRenderer cell, int position);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_layout_set_attributes")]
                public void set_attributes (Gtk.CellRenderer cell);
-               [NoArrayLength]
-               [CCode (cname = "gtk_cell_layout_set_cell_data_func")]
                public virtual void set_cell_data_func (Gtk.CellRenderer cell, Gtk.CellLayoutDataFunc func, pointer func_data, GLib.DestroyNotify destroy);
        }
        public interface Editable {
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_copy_clipboard")]
                public void copy_clipboard ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_cut_clipboard")]
                public void cut_clipboard ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_delete_selection")]
                public void delete_selection ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_get_chars")]
                public virtual weak string get_chars (int start_pos, int end_pos);
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_get_editable")]
                public bool get_editable ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_get_position")]
                public virtual int get_position ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_get_selection_bounds")]
                public virtual bool get_selection_bounds (int start, int end);
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_paste_clipboard")]
                public void paste_clipboard ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_select_region")]
                public void select_region (int start, int end);
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_set_editable")]
                public void set_editable (bool is_editable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_editable_set_position")]
                public virtual void set_position (int position);
                [HasEmitter]
                public signal void insert_text (string text, int length, int position);
@@ -8908,370 +4790,136 @@ namespace Gtk {
                public signal void changed ();
        }
        public interface FileChooser {
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_add_filter")]
                public void add_filter (Gtk.FileFilter filter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_add_shortcut_folder")]
                public bool add_shortcut_folder (string folder, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_add_shortcut_folder_uri")]
                public bool add_shortcut_folder_uri (string uri, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_error_quark")]
                public static GLib.Quark error_quark ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_action")]
                public Gtk.FileChooserAction get_action ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_current_folder")]
                public weak string get_current_folder ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_current_folder_uri")]
                public weak string get_current_folder_uri ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_do_overwrite_confirmation")]
                public bool get_do_overwrite_confirmation ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_extra_widget")]
                public weak Gtk.Widget get_extra_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_filename")]
                public weak string get_filename ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_filenames")]
                public weak GLib.SList get_filenames ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_filter")]
                public weak Gtk.FileFilter get_filter ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_local_only")]
                public bool get_local_only ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_preview_filename")]
                public weak string get_preview_filename ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_preview_uri")]
                public weak string get_preview_uri ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_preview_widget")]
                public weak Gtk.Widget get_preview_widget ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_preview_widget_active")]
                public bool get_preview_widget_active ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_select_multiple")]
                public bool get_select_multiple ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_show_hidden")]
                public bool get_show_hidden ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_uri")]
                public weak string get_uri ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_uris")]
                public weak GLib.SList get_uris ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_get_use_preview_label")]
                public bool get_use_preview_label ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_list_filters")]
                public weak GLib.SList list_filters ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_list_shortcut_folder_uris")]
                public weak GLib.SList list_shortcut_folder_uris ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_list_shortcut_folders")]
                public weak GLib.SList list_shortcut_folders ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_remove_filter")]
                public void remove_filter (Gtk.FileFilter filter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_remove_shortcut_folder")]
                public bool remove_shortcut_folder (string folder, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_remove_shortcut_folder_uri")]
                public bool remove_shortcut_folder_uri (string uri, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_select_all")]
                public void select_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_select_filename")]
                public bool select_filename (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_select_uri")]
                public bool select_uri (string uri);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_action")]
                public void set_action (Gtk.FileChooserAction action);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_current_folder")]
                public bool set_current_folder (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_current_folder_uri")]
                public bool set_current_folder_uri (string uri);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_current_name")]
                public void set_current_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_do_overwrite_confirmation")]
                public void set_do_overwrite_confirmation (bool do_overwrite_confirmation);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_extra_widget")]
                public void set_extra_widget (Gtk.Widget extra_widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_filename")]
                public bool set_filename (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_filter")]
                public void set_filter (Gtk.FileFilter filter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_local_only")]
                public void set_local_only (bool local_only);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_preview_widget")]
                public void set_preview_widget (Gtk.Widget preview_widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_preview_widget_active")]
                public void set_preview_widget_active (bool active);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_select_multiple")]
                public void set_select_multiple (bool select_multiple);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_show_hidden")]
                public void set_show_hidden (bool show_hidden);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_uri")]
                public bool set_uri (string uri);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_set_use_preview_label")]
                public void set_use_preview_label (bool use_label);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_unselect_all")]
                public void unselect_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_unselect_filename")]
                public void unselect_filename (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_file_chooser_unselect_uri")]
                public void unselect_uri (string uri);
        }
        public interface PrintOperationPreview {
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_preview_end_preview")]
                public virtual void end_preview ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_preview_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_preview_is_selected")]
                public virtual bool is_selected (int page_nr);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_operation_preview_render_page")]
                public virtual void render_page (int page_nr);
                public signal void ready (Gtk.PrintContext context);
                public signal void got_page_size (Gtk.PrintContext context, Gtk.PageSetup page_setup);
        }
        public interface RecentChooser {
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_add_filter")]
                public virtual void add_filter (Gtk.RecentFilter filter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_error_quark")]
                public static GLib.Quark error_quark ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_current_item")]
                public weak Gtk.RecentInfo get_current_item ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_current_uri")]
                public virtual weak string get_current_uri ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_filter")]
                public weak Gtk.RecentFilter get_filter ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_items")]
                public virtual weak GLib.List get_items ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_limit")]
                public int get_limit ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_local_only")]
                public bool get_local_only ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_select_multiple")]
                public bool get_select_multiple ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_show_icons")]
                public bool get_show_icons ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_show_not_found")]
                public bool get_show_not_found ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_show_numbers")]
                public bool get_show_numbers ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_show_private")]
                public bool get_show_private ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_show_tips")]
                public bool get_show_tips ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_sort_type")]
                public Gtk.RecentSortType get_sort_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_get_uris")]
                public weak string get_uris (ulong length);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_list_filters")]
                public virtual weak GLib.SList list_filters ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_remove_filter")]
                public virtual void remove_filter (Gtk.RecentFilter filter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_select_all")]
                public virtual void select_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_select_uri")]
                public virtual bool select_uri (string uri, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_current_uri")]
                public virtual bool set_current_uri (string uri, GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_filter")]
                public void set_filter (Gtk.RecentFilter filter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_limit")]
                public void set_limit (int limit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_local_only")]
                public void set_local_only (bool local_only);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_select_multiple")]
                public void set_select_multiple (bool select_multiple);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_show_icons")]
                public void set_show_icons (bool show_icons);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_show_not_found")]
                public void set_show_not_found (bool show_not_found);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_show_numbers")]
                public void set_show_numbers (bool show_numbers);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_show_private")]
                public void set_show_private (bool show_private);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_show_tips")]
                public void set_show_tips (bool show_tips);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_sort_func")]
                public virtual void set_sort_func (Gtk.RecentSortFunc sort_func, pointer sort_data, GLib.DestroyNotify data_destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_set_sort_type")]
                public void set_sort_type (Gtk.RecentSortType sort_type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_unselect_all")]
                public virtual void unselect_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_chooser_unselect_uri")]
                public virtual void unselect_uri (string uri);
                public signal void selection_changed ();
                public signal void item_activated ();
        }
        public interface TreeDragDest {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_drag_dest_drag_data_received")]
                public virtual bool drag_data_received (Gtk.TreePath dest, Gtk.SelectionData selection_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_drag_dest_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_drag_dest_row_drop_possible")]
                public virtual bool row_drop_possible (Gtk.TreePath dest_path, Gtk.SelectionData selection_data);
        }
        public interface TreeDragSource {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_drag_source_drag_data_delete")]
                public virtual bool drag_data_delete (Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_drag_source_drag_data_get")]
                public virtual bool drag_data_get (Gtk.TreePath path, Gtk.SelectionData selection_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_drag_source_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_drag_source_row_draggable")]
                public virtual bool row_draggable (Gtk.TreePath path);
        }
        public interface TreeModel {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_foreach")]
                public void @foreach (Gtk.TreeModelForeachFunc func, pointer user_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get")]
                public void @get (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get_column_type")]
                public virtual GLib.Type get_column_type (int index_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get_flags")]
                public virtual Gtk.TreeModelFlags get_flags ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get_iter")]
                public virtual bool get_iter (ref Gtk.TreeIter iter, Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get_iter_first")]
                public bool get_iter_first (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get_iter_from_string")]
                public bool get_iter_from_string (ref Gtk.TreeIter iter, string path_string);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get_n_columns")]
                public virtual int get_n_columns ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get_path")]
                public virtual weak Gtk.TreePath get_path (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get_string_from_iter")]
                public weak string get_string_from_iter (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get_valist")]
                public void get_valist (ref Gtk.TreeIter iter, pointer var_args);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_get_value")]
                public virtual void get_value (ref Gtk.TreeIter iter, int column, GLib.Value value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_iter_children")]
                public virtual bool iter_children (ref Gtk.TreeIter iter, ref Gtk.TreeIter parent);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_iter_has_child")]
                public virtual bool iter_has_child (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_iter_n_children")]
                public virtual int iter_n_children (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_iter_next")]
                public virtual bool iter_next (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_iter_nth_child")]
                public virtual bool iter_nth_child (ref Gtk.TreeIter iter, ref Gtk.TreeIter parent, int n);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_iter_parent")]
                public virtual bool iter_parent (ref Gtk.TreeIter iter, ref Gtk.TreeIter child);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_ref_node")]
                public virtual void ref_node (ref Gtk.TreeIter iter);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_model_unref_node")]
                public virtual void unref_node (ref Gtk.TreeIter iter);
                [HasEmitter]
                public signal void row_changed (Gtk.TreePath path, ref Gtk.TreeIter iter);
@@ -9285,23 +4933,11 @@ namespace Gtk {
                public signal void rows_reordered (Gtk.TreePath path, ref Gtk.TreeIter iter, int new_order);
        }
        public interface TreeSortable {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_sortable_get_sort_column_id")]
                public virtual bool get_sort_column_id (int sort_column_id, Gtk.SortType order);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_sortable_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_sortable_has_default_sort_func")]
                public virtual bool has_default_sort_func ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_sortable_set_default_sort_func")]
                public virtual void set_default_sort_func (Gtk.TreeIterCompareFunc sort_func, pointer user_data, Gtk.DestroyNotify destroy);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_sortable_set_sort_column_id")]
                public virtual void set_sort_column_id (int sort_column_id, Gtk.SortType order);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_sortable_set_sort_func")]
                public virtual void set_sort_func (int sort_column_id, Gtk.TreeIterCompareFunc sort_func, pointer user_data, Gtk.DestroyNotify destroy);
                [HasEmitter]
                public signal void sort_column_changed ();
@@ -9341,17 +4977,9 @@ namespace Gtk {
                public weak Gtk.BindingEntry set_next;
                public weak Gtk.BindingEntry hash_next;
                public weak Gtk.BindingSignal signals;
-               [NoArrayLength]
-               [CCode (cname = "gtk_binding_entry_add_signal")]
                public static void add_signal (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers, string signal_name, uint n_args);
-               [NoArrayLength]
-               [CCode (cname = "gtk_binding_entry_add_signall")]
                public static void add_signall (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers, string signal_name, GLib.SList binding_args);
-               [NoArrayLength]
-               [CCode (cname = "gtk_binding_entry_clear")]
                public static void clear (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
-               [NoArrayLength]
-               [CCode (cname = "gtk_binding_entry_remove")]
                public static void remove (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
        }
        [ReferenceType]
@@ -9364,20 +4992,10 @@ namespace Gtk {
                public weak Gtk.BindingEntry entries;
                public weak Gtk.BindingEntry current;
                public uint parsed;
-               [NoArrayLength]
-               [CCode (cname = "gtk_binding_set_activate")]
                public bool activate (uint keyval, Gdk.ModifierType modifiers, Gtk.Object object);
-               [NoArrayLength]
-               [CCode (cname = "gtk_binding_set_add_path")]
                public void add_path (Gtk.PathType path_type, string path_pattern, Gtk.PathPriorityType priority);
-               [NoArrayLength]
-               [CCode (cname = "gtk_binding_set_by_class")]
                public static weak Gtk.BindingSet by_class (pointer object_class);
-               [NoArrayLength]
-               [CCode (cname = "gtk_binding_set_find")]
                public static weak Gtk.BindingSet find (string set_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_binding_set_new")]
                public BindingSet (string set_name);
        }
        [ReferenceType]
@@ -9392,16 +5010,10 @@ namespace Gtk {
                public int right;
                public int top;
                public int bottom;
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_border_copy")]
                public Gtk.Border copy ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_border_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_border_get_type")]
                public static GLib.Type get_type ();
        }
        [ReferenceType]
@@ -9437,137 +5049,55 @@ namespace Gtk {
        }
        [ReferenceType]
        public struct IconInfo {
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_info_copy")]
                public weak Gtk.IconInfo copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_info_free")]
                public void free ();
                [NoArrayLength]
-               [CCode (cname = "gtk_icon_info_get_attach_points")]
                public bool get_attach_points (Gdk.Point[] points, int n_points);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_info_get_base_size")]
                public int get_base_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_info_get_builtin_pixbuf")]
                public weak Gdk.Pixbuf get_builtin_pixbuf ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_info_get_display_name")]
                public weak string get_display_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_info_get_embedded_rect")]
                public bool get_embedded_rect (Gdk.Rectangle rectangle);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_info_get_filename")]
                public weak string get_filename ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_info_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_info_load_icon")]
                public weak Gdk.Pixbuf load_icon (GLib.Error error);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_info_set_raw_coordinates")]
                public void set_raw_coordinates (bool raw_coordinates);
        }
        [ReferenceType]
        public struct IconSet {
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_set_add_source")]
                public void add_source (Gtk.IconSource source);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_set_copy")]
                public weak Gtk.IconSet copy ();
                [NoArrayLength]
-               [CCode (cname = "gtk_icon_set_get_sizes")]
                public void get_sizes (Gtk.IconSize[] sizes, int n_sizes);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_set_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_set_new")]
                public IconSet ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_set_new_from_pixbuf")]
                public IconSet.from_pixbuf (Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_set_ref")]
                public weak Gtk.IconSet @ref ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_set_render_icon")]
                public weak Gdk.Pixbuf render_icon (Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_set_unref")]
                public void unref ();
        }
        [ReferenceType]
        public struct IconSource {
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_copy")]
                public weak Gtk.IconSource copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_get_direction")]
                public Gtk.TextDirection get_direction ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_get_direction_wildcarded")]
                public bool get_direction_wildcarded ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_get_filename")]
                public weak string get_filename ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_get_icon_name")]
                public weak string get_icon_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_get_pixbuf")]
                public weak Gdk.Pixbuf get_pixbuf ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_get_size")]
                public Gtk.IconSize get_size ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_get_size_wildcarded")]
                public bool get_size_wildcarded ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_get_state")]
                public Gtk.StateType get_state ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_get_state_wildcarded")]
                public bool get_state_wildcarded ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_new")]
                public IconSource ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_set_direction")]
                public void set_direction (Gtk.TextDirection direction);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_set_direction_wildcarded")]
                public void set_direction_wildcarded (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_set_filename")]
                public void set_filename (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_set_icon_name")]
                public void set_icon_name (string icon_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_set_pixbuf")]
                public void set_pixbuf (Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_set_size")]
                public void set_size (Gtk.IconSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_set_size_wildcarded")]
                public void set_size_wildcarded (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_set_state")]
                public void set_state (Gtk.StateType state);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_source_set_state_wildcarded")]
                public void set_state_wildcarded (bool setting);
        }
        [ReferenceType]
@@ -9621,8 +5151,6 @@ namespace Gtk {
        }
        [ReferenceType]
        public struct NotebookPage {
-               [NoArrayLength]
-               [CCode (cname = "gtk_notebook_page_num")]
                public static int num (Gtk.Notebook notebook, Gtk.Widget child);
        }
        [ReferenceType]
@@ -9632,62 +5160,24 @@ namespace Gtk {
        }
        [ReferenceType]
        public struct PaperSize {
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_copy")]
                public weak Gtk.PaperSize copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_get_default")]
                public static weak string get_default ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_get_default_bottom_margin")]
                public double get_default_bottom_margin (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_get_default_left_margin")]
                public double get_default_left_margin (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_get_default_right_margin")]
                public double get_default_right_margin (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_get_default_top_margin")]
                public double get_default_top_margin (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_get_display_name")]
                public weak string get_display_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_get_height")]
                public double get_height (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_get_ppd_name")]
                public weak string get_ppd_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_get_width")]
                public double get_width (Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_is_custom")]
                public bool is_custom ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_is_equal")]
                public bool is_equal (Gtk.PaperSize size2);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_new")]
                public PaperSize (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_new_custom")]
                public PaperSize.custom (string name, string display_name, double width, double height, Gtk.Unit unit);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_new_from_ppd")]
                public PaperSize.from_ppd (string ppd_name, string ppd_display_name, double width, double height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_paper_size_set_size")]
                public void set_size (double width, double height, Gtk.Unit unit);
        }
        [ReferenceType]
@@ -9696,17 +5186,9 @@ namespace Gtk {
                public weak string device;
                public weak string output;
                public int @flags;
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_win32_devnames_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_win32_devnames_from_printer_name")]
                public static pointer from_printer_name (string printer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_win32_devnames_from_win32")]
                public static weak Gtk.PrintWin32Devnames from_win32 (pointer global);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_win32_devnames_to_win32")]
                public pointer to_win32 ();
        }
        public struct RadioActionEntry {
@@ -9732,20 +5214,10 @@ namespace Gtk {
                public GLib.Quark property_name;
                public weak string origin;
                public weak GLib.Value value;
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_property_parse_border")]
                public static bool parse_border (GLib.ParamSpec pspec, GLib.String gstring, GLib.Value property_value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_property_parse_color")]
                public static bool parse_color (GLib.ParamSpec pspec, GLib.String gstring, GLib.Value property_value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_property_parse_enum")]
                public static bool parse_enum (GLib.ParamSpec pspec, GLib.String gstring, GLib.Value property_value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_property_parse_flags")]
                public static bool parse_flags (GLib.ParamSpec pspec, GLib.String gstring, GLib.Value property_value);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_property_parse_requisition")]
                public static bool parse_requisition (GLib.ParamSpec pspec, GLib.String gstring, GLib.Value property_value);
        }
        [ReferenceType]
@@ -9770,92 +5242,38 @@ namespace Gtk {
        }
        [ReferenceType]
        public struct RecentInfo {
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_exists")]
                public bool exists ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_added")]
                public ulong get_added ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_age")]
                public int get_age ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_application_info")]
                public bool get_application_info (string app_name, string app_exec, uint count, ulong time_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_applications")]
                public weak string get_applications (ulong length);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_description")]
                public weak string get_description ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_display_name")]
                public weak string get_display_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_groups")]
                public weak string get_groups (ulong length);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_icon")]
                public weak Gdk.Pixbuf get_icon (int size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_mime_type")]
                public weak string get_mime_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_modified")]
                public ulong get_modified ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_private_hint")]
                public bool get_private_hint ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_short_name")]
                public weak string get_short_name ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_uri")]
                public weak string get_uri ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_uri_display")]
                public weak string get_uri_display ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_get_visited")]
                public ulong get_visited ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_has_application")]
                public bool has_application (string app_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_has_group")]
                public bool has_group (string group_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_is_local")]
                public bool is_local ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_last_application")]
                public weak string last_application ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_match")]
                public bool match (Gtk.RecentInfo info_b);
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_ref")]
                public weak Gtk.RecentInfo @ref ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_recent_info_unref")]
                public void unref ();
        }
        public struct Requisition {
                public int width;
                public int height;
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_requisition_copy")]
                public Gtk.Requisition copy ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_requisition_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_requisition_get_type")]
                public static GLib.Type get_type ();
        }
        [ReferenceType]
@@ -9875,50 +5293,22 @@ namespace Gtk {
                public weak uchar[] data;
                public int length;
                public weak Gdk.Display display;
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_copy")]
                public weak Gtk.SelectionData copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_get_pixbuf")]
                public weak Gdk.Pixbuf get_pixbuf ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_get_targets")]
                public bool get_targets (Gdk.Atom targets, int n_atoms);
                [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_get_text")]
                public weak uchar[] get_text ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_get_uris")]
                public weak string get_uris ();
                [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_set")]
                public void @set (Gdk.Atom type, int format, uchar[] data, int length);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_set_pixbuf")]
                public bool set_pixbuf (Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_set_text")]
                public bool set_text (string str, int len);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_set_uris")]
                public bool set_uris (string uris);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_targets_include_image")]
                public bool targets_include_image (bool writable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_targets_include_rich_text")]
                public bool targets_include_rich_text (Gtk.TextBuffer buffer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_targets_include_text")]
                public bool targets_include_text ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_data_targets_include_uri")]
                public bool targets_include_uri ();
        }
        [ReferenceType]
@@ -9936,11 +5326,7 @@ namespace Gtk {
                public Gdk.ModifierType modifier;
                public uint keyval;
                public weak string translation_domain;
-               [NoArrayLength]
-               [CCode (cname = "gtk_stock_item_copy")]
                public weak Gtk.StockItem copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_stock_item_free")]
                public void free ();
        }
        [ReferenceType]
@@ -9980,41 +5366,17 @@ namespace Gtk {
        public struct TargetList {
                public weak GLib.List list;
                public uint ref_count;
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_add")]
                public void add (Gdk.Atom target, uint @flags, uint info);
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_add_image_targets")]
                public void add_image_targets (uint info, bool writable);
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_add_rich_text_targets")]
                public void add_rich_text_targets (uint info, bool deserializable, Gtk.TextBuffer buffer);
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_add_table")]
                public void add_table (Gtk.TargetEntry targets, uint ntargets);
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_add_text_targets")]
                public void add_text_targets (uint info);
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_add_uri_targets")]
                public void add_uri_targets (uint info);
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_find")]
                public bool find (Gdk.Atom target, uint info);
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_new")]
                public TargetList (Gtk.TargetEntry targets, uint ntargets);
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_ref")]
                public weak Gtk.TargetList @ref ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_remove")]
                public void remove (Gdk.Atom target);
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_list_unref")]
                public void unref ();
        }
        [ReferenceType]
@@ -10056,391 +5418,197 @@ namespace Gtk {
                public uint bg_full_height;
                public uint editable;
                public uint realized;
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_attributes_copy")]
                public weak Gtk.TextAttributes copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_attributes_copy_values")]
                public void copy_values (Gtk.TextAttributes dest);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_attributes_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_attributes_new")]
                public TextAttributes ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_attributes_ref")]
                public weak Gtk.TextAttributes @ref ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_attributes_unref")]
                public void unref ();
        }
        [ReferenceType]
        public struct TextBTree {
        }
        public struct TextIter {
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_char")]
                public bool backward_char ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_chars")]
                public bool backward_chars (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_cursor_position")]
                public bool backward_cursor_position ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_cursor_positions")]
                public bool backward_cursor_positions (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_find_char")]
                public bool backward_find_char (Gtk.TextCharPredicate pred, pointer user_data, ref Gtk.TextIter limit);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_line")]
                public bool backward_line ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_lines")]
                public bool backward_lines (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_search")]
                public bool backward_search (string str, Gtk.TextSearchFlags @flags, ref Gtk.TextIter match_start, ref Gtk.TextIter match_end, ref Gtk.TextIter limit);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_sentence_start")]
                public bool backward_sentence_start ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_sentence_starts")]
                public bool backward_sentence_starts (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_to_tag_toggle")]
                public bool backward_to_tag_toggle (Gtk.TextTag tag);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_visible_cursor_position")]
                public bool backward_visible_cursor_position ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_visible_cursor_positions")]
                public bool backward_visible_cursor_positions (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_visible_line")]
                public bool backward_visible_line ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_visible_lines")]
                public bool backward_visible_lines (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_visible_word_start")]
                public bool backward_visible_word_start ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_visible_word_starts")]
                public bool backward_visible_word_starts (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_word_start")]
                public bool backward_word_start ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_backward_word_starts")]
                public bool backward_word_starts (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_begins_tag")]
                public bool begins_tag (Gtk.TextTag tag);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_can_insert")]
                public bool can_insert (bool default_editability);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_compare")]
                public int compare (ref Gtk.TextIter rhs);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_copy")]
                public Gtk.TextIter copy ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_editable")]
                public bool editable (bool default_setting);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_ends_line")]
                public bool ends_line ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_ends_sentence")]
                public bool ends_sentence ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_ends_tag")]
                public bool ends_tag (Gtk.TextTag tag);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_ends_word")]
                public bool ends_word ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_equal")]
                public bool equal (ref Gtk.TextIter rhs);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_char")]
                public bool forward_char ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_chars")]
                public bool forward_chars (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_cursor_position")]
                public bool forward_cursor_position ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_cursor_positions")]
                public bool forward_cursor_positions (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_find_char")]
                public bool forward_find_char (Gtk.TextCharPredicate pred, pointer user_data, ref Gtk.TextIter limit);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_line")]
                public bool forward_line ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_lines")]
                public bool forward_lines (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_search")]
                public bool forward_search (string str, Gtk.TextSearchFlags @flags, ref Gtk.TextIter match_start, ref Gtk.TextIter match_end, ref Gtk.TextIter limit);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_sentence_end")]
                public bool forward_sentence_end ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_sentence_ends")]
                public bool forward_sentence_ends (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_to_end")]
                public void forward_to_end ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_to_line_end")]
                public bool forward_to_line_end ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_to_tag_toggle")]
                public bool forward_to_tag_toggle (Gtk.TextTag tag);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_visible_cursor_position")]
                public bool forward_visible_cursor_position ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_visible_cursor_positions")]
                public bool forward_visible_cursor_positions (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_visible_line")]
                public bool forward_visible_line ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_visible_lines")]
                public bool forward_visible_lines (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_visible_word_end")]
                public bool forward_visible_word_end ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_visible_word_ends")]
                public bool forward_visible_word_ends (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_word_end")]
                public bool forward_word_end ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_forward_word_ends")]
                public bool forward_word_ends (int count);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_free")]
                public void free ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_attributes")]
                public bool get_attributes (Gtk.TextAttributes values);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_buffer")]
                public weak Gtk.TextBuffer get_buffer ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_bytes_in_line")]
                public int get_bytes_in_line ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_char")]
                public unichar get_char ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_chars_in_line")]
                public int get_chars_in_line ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_child_anchor")]
                public weak Gtk.TextChildAnchor get_child_anchor ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_language")]
                public weak Pango.Language get_language ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_line")]
                public int get_line ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_line_index")]
                public int get_line_index ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_line_offset")]
                public int get_line_offset ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_marks")]
                public weak GLib.SList get_marks ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_offset")]
                public int get_offset ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_pixbuf")]
                public weak Gdk.Pixbuf get_pixbuf ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_slice")]
                public weak string get_slice (ref Gtk.TextIter end);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_tags")]
                public weak GLib.SList get_tags ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_text")]
                public weak string get_text (ref Gtk.TextIter end);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_toggled_tags")]
                public weak GLib.SList get_toggled_tags (bool toggled_on);
-               [NoArrayLength]
-               [CCode (cname = "gtk_text_iter_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_visible_line_index")]
                public int get_visible_line_index ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_visible_line_offset")]
                public int get_visible_line_offset ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_visible_slice")]
                public weak string get_visible_slice (ref Gtk.TextIter end);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_get_visible_text")]
                public weak string get_visible_text (ref Gtk.TextIter end);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_has_tag")]
                public bool has_tag (Gtk.TextTag tag);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_in_range")]
                public bool in_range (ref Gtk.TextIter start, ref Gtk.TextIter end);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_inside_sentence")]
                public bool inside_sentence ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_inside_word")]
                public bool inside_word ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_is_cursor_position")]
                public bool is_cursor_position ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_is_end")]
                public bool is_end ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_is_start")]
                public bool is_start ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_order")]
                public void order (ref Gtk.TextIter second);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_set_line")]
                public void set_line (int line_number);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_set_line_index")]
                public void set_line_index (int byte_on_line);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_set_line_offset")]
                public void set_line_offset (int char_on_line);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_set_offset")]
                public void set_offset (int char_offset);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_set_visible_line_index")]
                public void set_visible_line_index (int byte_on_line);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_set_visible_line_offset")]
                public void set_visible_line_offset (int char_on_line);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_starts_line")]
                public bool starts_line ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_starts_sentence")]
                public bool starts_sentence ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_starts_word")]
                public bool starts_word ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_text_iter_toggles_tag")]
                public bool toggles_tag (Gtk.TextTag tag);
        }
        [ReferenceType]
@@ -10470,8 +5638,6 @@ namespace Gtk {
                public weak Gtk.Widget widget;
                public weak string tip_text;
                public weak string tip_private;
-               [NoArrayLength]
-               [CCode (cname = "gtk_tooltips_data_get")]
                public static weak Gtk.TooltipsData @get (Gtk.Widget widget);
        }
        public struct TreeIter {
@@ -10479,112 +5645,47 @@ namespace Gtk {
                public pointer user_data;
                public pointer user_data2;
                public pointer user_data3;
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_tree_iter_copy")]
                public Gtk.TreeIter copy ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "gtk_tree_iter_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_iter_get_type")]
                public static GLib.Type get_type ();
        }
        [ReferenceType]
        public struct TreePath {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_append_index")]
                public void append_index (int index_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_compare")]
                public int compare (Gtk.TreePath b);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_copy")]
                public weak Gtk.TreePath copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_down")]
                public void down ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_get_depth")]
                public int get_depth ();
                [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_get_indices")]
                public weak int[] get_indices ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_is_ancestor")]
                public bool is_ancestor (Gtk.TreePath descendant);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_is_descendant")]
                public bool is_descendant (Gtk.TreePath ancestor);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_new")]
                public TreePath ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_new_first")]
                public TreePath.first ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_new_from_indices")]
                public TreePath.from_indices (int first_index);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_new_from_string")]
                public TreePath.from_string (string path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_next")]
                public void next ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_prepend_index")]
                public void prepend_index (int index_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_prev")]
                public bool prev ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_to_string")]
                public weak string to_string ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_path_up")]
                public bool up ();
        }
        [ReferenceType]
        public struct TreeRowReference {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_row_reference_copy")]
                public weak Gtk.TreeRowReference copy ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_row_reference_deleted")]
                public static void deleted (GLib.Object proxy, Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_row_reference_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_row_reference_get_model")]
                public weak Gtk.TreeModel get_model ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_row_reference_get_path")]
                public weak Gtk.TreePath get_path ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_row_reference_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_row_reference_inserted")]
                public static void inserted (GLib.Object proxy, Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_row_reference_new")]
                public TreeRowReference (Gtk.TreeModel model, Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_row_reference_new_proxy")]
                public TreeRowReference.proxy (GLib.Object proxy, Gtk.TreeModel model, Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_row_reference_reordered")]
                public static void reordered (GLib.Object proxy, Gtk.TreePath path, ref Gtk.TreeIter iter, int new_order);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_row_reference_valid")]
                public bool valid ();
        }
        [ReferenceType]
@@ -10607,212 +5708,92 @@ namespace Gtk {
        }
        [ReferenceType]
        public struct Accel {
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_groups_activate")]
                public static bool groups_activate (GLib.Object object, uint accel_key, Gdk.ModifierType accel_mods);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accel_groups_from_object")]
                public static weak GLib.SList groups_from_object (GLib.Object object);
        }
        [ReferenceType]
        public struct Accelerator {
-               [NoArrayLength]
-               [CCode (cname = "gtk_accelerator_get_default_mod_mask")]
                public static uint get_default_mod_mask ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_accelerator_get_label")]
                public static weak string get_label (uint accelerator_key, Gdk.ModifierType accelerator_mods);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accelerator_name")]
                public static weak string name (uint accelerator_key, Gdk.ModifierType accelerator_mods);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accelerator_parse")]
                public static void parse (string accelerator, uint accelerator_key, Gdk.ModifierType accelerator_mods);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accelerator_set_default_mod_mask")]
                public static void set_default_mod_mask (Gdk.ModifierType default_mod_mask);
-               [NoArrayLength]
-               [CCode (cname = "gtk_accelerator_valid")]
                public static bool valid (uint keyval, Gdk.ModifierType modifiers);
        }
        [ReferenceType]
        public struct Bindings {
-               [NoArrayLength]
-               [CCode (cname = "gtk_bindings_activate")]
                public static bool activate (Gtk.Object object, uint keyval, Gdk.ModifierType modifiers);
-               [NoArrayLength]
-               [CCode (cname = "gtk_bindings_activate_event")]
                public static bool activate_event (Gtk.Object object, Gdk.EventKey event);
        }
        [ReferenceType]
        public struct Ctree {
-               [NoArrayLength]
-               [CCode (cname = "gtk_ctree_expander_style_get_type")]
                public static GLib.Type expander_style_get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ctree_expansion_type_get_type")]
                public static GLib.Type expansion_type_get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ctree_line_style_get_type")]
                public static GLib.Type line_style_get_type ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_ctree_pos_get_type")]
                public static GLib.Type pos_get_type ();
        }
        [ReferenceType]
        public struct Drag {
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_begin")]
                public static weak Gdk.DragContext begin (Gtk.Widget widget, Gtk.TargetList targets, Gdk.DragAction actions, int button, Gdk.Event event);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_check_threshold")]
                public static bool check_threshold (Gtk.Widget widget, int start_x, int start_y, int current_x, int current_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_dest_add_image_targets")]
                public static void dest_add_image_targets (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_dest_add_text_targets")]
                public static void dest_add_text_targets (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_dest_add_uri_targets")]
                public static void dest_add_uri_targets (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_dest_find_target")]
                public static Gdk.Atom dest_find_target (Gtk.Widget widget, Gdk.DragContext context, Gtk.TargetList target_list);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_dest_get_target_list")]
                public static weak Gtk.TargetList dest_get_target_list (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_dest_get_track_motion")]
                public static bool dest_get_track_motion (Gtk.Widget widget);
                [NoArrayLength]
-               [CCode (cname = "gtk_drag_dest_set")]
                public static void dest_set (Gtk.Widget widget, Gtk.DestDefaults @flags, Gtk.TargetEntry[] targets, int n_targets, Gdk.DragAction actions);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_dest_set_proxy")]
                public static void dest_set_proxy (Gtk.Widget widget, Gdk.Window proxy_window, Gdk.DragProtocol protocol, bool use_coordinates);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_dest_set_target_list")]
                public static void dest_set_target_list (Gtk.Widget widget, Gtk.TargetList target_list);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_dest_set_track_motion")]
                public static void dest_set_track_motion (Gtk.Widget widget, bool track_motion);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_dest_unset")]
                public static void dest_unset (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_finish")]
                public static void finish (Gdk.DragContext context, bool success, bool del, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_get_data")]
                public static void get_data (Gtk.Widget widget, Gdk.DragContext context, Gdk.Atom target, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_get_source_widget")]
                public static weak Gtk.Widget get_source_widget (Gdk.DragContext context);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_highlight")]
                public static void highlight (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_set_icon_default")]
                public static void set_icon_default (Gdk.DragContext context);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_set_icon_name")]
                public static void set_icon_name (Gdk.DragContext context, string icon_name, int hot_x, int hot_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_set_icon_pixbuf")]
                public static void set_icon_pixbuf (Gdk.DragContext context, Gdk.Pixbuf pixbuf, int hot_x, int hot_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_set_icon_pixmap")]
                public static void set_icon_pixmap (Gdk.DragContext context, Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Bitmap mask, int hot_x, int hot_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_set_icon_stock")]
                public static void set_icon_stock (Gdk.DragContext context, string stock_id, int hot_x, int hot_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_set_icon_widget")]
                public static void set_icon_widget (Gdk.DragContext context, Gtk.Widget widget, int hot_x, int hot_y);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_source_add_image_targets")]
                public static void source_add_image_targets (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_source_add_text_targets")]
                public static void source_add_text_targets (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_source_add_uri_targets")]
                public static void source_add_uri_targets (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_source_get_target_list")]
                public static weak Gtk.TargetList source_get_target_list (Gtk.Widget widget);
                [NoArrayLength]
-               [CCode (cname = "gtk_drag_source_set")]
                public static void source_set (Gtk.Widget widget, Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, int n_targets, Gdk.DragAction actions);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_source_set_icon")]
                public static void source_set_icon (Gtk.Widget widget, Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_source_set_icon_name")]
                public static void source_set_icon_name (Gtk.Widget widget, string icon_name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_source_set_icon_pixbuf")]
                public static void source_set_icon_pixbuf (Gtk.Widget widget, Gdk.Pixbuf pixbuf);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_source_set_icon_stock")]
                public static void source_set_icon_stock (Gtk.Widget widget, string stock_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_source_set_target_list")]
                public static void source_set_target_list (Gtk.Widget widget, Gtk.TargetList target_list);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_source_unset")]
                public static void source_unset (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_drag_unhighlight")]
                public static void unhighlight (Gtk.Widget widget);
        }
        [ReferenceType]
        public struct Draw {
-               [NoArrayLength]
-               [CCode (cname = "gtk_draw_insertion_cursor")]
                public static void insertion_cursor (Gtk.Widget widget, Gdk.Drawable drawable, Gdk.Rectangle area, Gdk.Rectangle location, bool is_primary, Gtk.TextDirection direction, bool draw_arrow);
        }
        [ReferenceType]
        public struct Gc {
-               [NoArrayLength]
-               [CCode (cname = "gtk_gc_get")]
                public static weak Gdk.GC @get (int depth, Gdk.Colormap colormap, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
-               [NoArrayLength]
-               [CCode (cname = "gtk_gc_release")]
                public static void release (Gdk.GC gc);
        }
        [ReferenceType]
        public struct Grab {
-               [NoArrayLength]
-               [CCode (cname = "gtk_grab_add")]
                public static void add (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_grab_get_current")]
                public static weak Gtk.Widget get_current ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_grab_remove")]
                public static void remove (Gtk.Widget widget);
        }
        [ReferenceType]
        public struct Icon {
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_size_from_name")]
                public static Gtk.IconSize size_from_name (string name);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_size_get_name")]
                public static weak string size_get_name (Gtk.IconSize size);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_size_lookup")]
                public static bool size_lookup (Gtk.IconSize size, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_size_lookup_for_settings")]
                public static bool size_lookup_for_settings (Gtk.Settings settings, Gtk.IconSize size, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_size_register")]
                public static Gtk.IconSize size_register (string name, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "gtk_icon_size_register_alias")]
                public static void size_register_alias (string alias, Gtk.IconSize target);
        }
        [ReferenceType]
@@ -10820,20 +5801,10 @@ namespace Gtk {
        }
        [ReferenceType]
        public struct Init {
-               [NoArrayLength]
-               [CCode (cname = "gtk_init_abi_check")]
                public static void abi_check (int argc, string argv, int num_checks, ulong sizeof_GtkWindow, ulong sizeof_GtkBox);
-               [NoArrayLength]
-               [CCode (cname = "gtk_init_add")]
                public static void add (Gtk.Function function, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_init_check")]
                public static bool check (int argc, string argv);
-               [NoArrayLength]
-               [CCode (cname = "gtk_init_check_abi_check")]
                public static bool check_abi_check (int argc, string argv, int num_checks, ulong sizeof_GtkWindow, ulong sizeof_GtkBox);
-               [NoArrayLength]
-               [CCode (cname = "gtk_init_with_args")]
                public static bool with_args (int argc, string argv, string parameter_string, GLib.OptionEntry entries, string translation_domain, GLib.Error error);
        }
        [ReferenceType]
@@ -10841,143 +5812,61 @@ namespace Gtk {
        }
        [ReferenceType]
        public struct Key {
-               [NoArrayLength]
-               [CCode (cname = "gtk_key_snooper_install")]
                public static uint snooper_install (Gtk.KeySnoopFunc snooper, pointer func_data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_key_snooper_remove")]
                public static void snooper_remove (uint snooper_handler_id);
        }
        [ReferenceType]
        public struct Main {
-               [NoArrayLength]
-               [CCode (cname = "gtk_main_do_event")]
                public static void do_event (Gdk.Event event);
-               [NoArrayLength]
-               [CCode (cname = "gtk_main_iteration")]
                public static bool iteration ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_main_iteration_do")]
                public static bool iteration_do (bool blocking);
-               [NoArrayLength]
-               [CCode (cname = "gtk_main_level")]
                public static uint level ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_main_quit")]
                public static void quit ();
        }
        [ReferenceType]
        public struct Print {
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_error_quark")]
                public static GLib.Quark error_quark ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_run_page_setup_dialog")]
                public static weak Gtk.PageSetup run_page_setup_dialog (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings);
-               [NoArrayLength]
-               [CCode (cname = "gtk_print_run_page_setup_dialog_async")]
                public static void run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, Gtk.PageSetupDoneFunc done_cb, pointer data);
        }
        [ReferenceType]
        public struct Quit {
-               [NoArrayLength]
-               [CCode (cname = "gtk_quit_add")]
                public static uint add (uint main_level, Gtk.Function function, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "gtk_quit_add_destroy")]
                public static void add_destroy (uint main_level, Gtk.Object object);
-               [NoArrayLength]
-               [CCode (cname = "gtk_quit_remove")]
                public static void remove (uint quit_handler_id);
-               [NoArrayLength]
-               [CCode (cname = "gtk_quit_remove_by_data")]
                public static void remove_by_data (pointer data);
        }
        [ReferenceType]
        public struct Rc {
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_add_default_file")]
                public static void add_default_file (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_find_module_in_path")]
                public static weak string find_module_in_path (string module_file);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_find_pixmap_in_path")]
                public static weak string find_pixmap_in_path (Gtk.Settings settings, GLib.Scanner scanner, string pixmap_file);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_get_default_files")]
                public static weak string get_default_files ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_get_im_module_file")]
                public static weak string get_im_module_file ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_get_im_module_path")]
                public static weak string get_im_module_path ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_get_module_dir")]
                public static weak string get_module_dir ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_get_style")]
                public static weak Gtk.Style get_style (Gtk.Widget widget);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_get_style_by_paths")]
                public static weak Gtk.Style get_style_by_paths (Gtk.Settings settings, string widget_path, string class_path, GLib.Type type);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_get_theme_dir")]
                public static weak string get_theme_dir ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_parse")]
                public static void parse (string filename);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_parse_color")]
                public static uint parse_color (GLib.Scanner scanner, Gdk.Color color);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_parse_priority")]
                public static uint parse_priority (GLib.Scanner scanner, Gtk.PathPriorityType priority);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_parse_state")]
                public static uint parse_state (GLib.Scanner scanner, Gtk.StateType state);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_parse_string")]
                public static void parse_string (string rc_string);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_reparse_all")]
                public static bool reparse_all ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_reparse_all_for_settings")]
                public static bool reparse_all_for_settings (Gtk.Settings settings, bool force_load);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_reset_styles")]
                public static void reset_styles (Gtk.Settings settings);
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_scanner_new")]
                public static weak GLib.Scanner scanner_new ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_rc_set_default_files")]
                public static void set_default_files (string filenames);
        }
        [ReferenceType]
        public struct Selection {
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_add_target")]
                public static void add_target (Gtk.Widget widget, Gdk.Atom selection, Gdk.Atom target, uint info);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_add_targets")]
                public static void add_targets (Gtk.Widget widget, Gdk.Atom selection, Gtk.TargetEntry targets, uint ntargets);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_clear_targets")]
                public static void clear_targets (Gtk.Widget widget, Gdk.Atom selection);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_convert")]
                public static bool convert (Gtk.Widget widget, Gdk.Atom selection, Gdk.Atom target, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_owner_set")]
                public static bool owner_set (Gtk.Widget widget, Gdk.Atom selection, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_owner_set_for_display")]
                public static bool owner_set_for_display (Gdk.Display display, Gtk.Widget widget, Gdk.Atom selection, uint time_);
-               [NoArrayLength]
-               [CCode (cname = "gtk_selection_remove_all")]
                public static void remove_all (Gtk.Widget widget);
        }
        [ReferenceType]
@@ -10986,43 +5875,28 @@ namespace Gtk {
        [ReferenceType]
        public struct Stock {
                [NoArrayLength]
-               [CCode (cname = "gtk_stock_add")]
                public static void add (Gtk.StockItem[] items, uint n_items);
                [NoArrayLength]
-               [CCode (cname = "gtk_stock_add_static")]
                public static void add_static (Gtk.StockItem[] items, uint n_items);
-               [NoArrayLength]
-               [CCode (cname = "gtk_stock_list_ids")]
                public static weak GLib.SList list_ids ();
-               [NoArrayLength]
-               [CCode (cname = "gtk_stock_lookup")]
                public static bool lookup (string stock_id, Gtk.StockItem item);
-               [NoArrayLength]
-               [CCode (cname = "gtk_stock_set_translate_func")]
                public static void set_translate_func (string domain, Gtk.TranslateFunc func, pointer data, Gtk.DestroyNotify notify);
        }
        [ReferenceType]
        public struct Target {
                [NoArrayLength]
-               [CCode (cname = "gtk_target_table_free")]
                public static void table_free (Gtk.TargetEntry[] targets, int n_targets);
-               [NoArrayLength]
-               [CCode (cname = "gtk_target_table_new_from_list")]
                public static weak Gtk.TargetEntry table_new_from_list (Gtk.TargetList list, int n_targets);
        }
        [ReferenceType]
        public struct Targets {
                [NoArrayLength]
-               [CCode (cname = "gtk_targets_include_image")]
                public static bool include_image (Gdk.Atom[] targets, int n_targets, bool writable);
                [NoArrayLength]
-               [CCode (cname = "gtk_targets_include_rich_text")]
                public static bool include_rich_text (Gdk.Atom[] targets, int n_targets, Gtk.TextBuffer buffer);
                [NoArrayLength]
-               [CCode (cname = "gtk_targets_include_text")]
                public static bool include_text (Gdk.Atom[] targets, int n_targets);
                [NoArrayLength]
-               [CCode (cname = "gtk_targets_include_uri")]
                public static bool include_uri (Gdk.Atom[] targets, int n_targets);
        }
        [ReferenceType]
@@ -11030,17 +5904,11 @@ namespace Gtk {
        }
        [ReferenceType]
        public struct Tree {
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_get_row_drag_data")]
                public static bool get_row_drag_data (Gtk.SelectionData selection_data, Gtk.TreeModel tree_model, Gtk.TreePath path);
-               [NoArrayLength]
-               [CCode (cname = "gtk_tree_set_row_drag_data")]
                public static bool set_row_drag_data (Gtk.SelectionData selection_data, Gtk.TreeModel tree_model, Gtk.TreePath path);
        }
        [ReferenceType]
        public struct Type {
-               [NoArrayLength]
-               [CCode (cname = "gtk_type_class")]
                public pointer @class ();
        }
        public callback void AboutDialogActivateLinkFunc (Gtk.AboutDialog about, string link, pointer data);
@@ -11202,131 +6070,47 @@ namespace Gtk {
        public const string STOCK_ZOOM_FIT;
        public const string STOCK_ZOOM_IN;
        public const string STOCK_ZOOM_OUT;
-       [NoArrayLength]
-       [CCode (cname = "gtk_alternative_dialog_button_order")]
        public static bool alternative_dialog_button_order (Gdk.Screen screen);
-       [NoArrayLength]
-       [CCode (cname = "gtk_binding_parse_binding")]
        public static uint binding_parse_binding (GLib.Scanner scanner);
-       [NoArrayLength]
-       [CCode (cname = "gtk_cell_type_get_type")]
        public static GLib.Type cell_type_get_type ();
-       [NoArrayLength]
-       [CCode (cname = "gtk_check_version")]
        public static weak string check_version (uint required_major, uint required_minor, uint required_micro);
-       [NoArrayLength]
-       [CCode (cname = "gtk_clist_drag_pos_get_type")]
        public static GLib.Type clist_drag_pos_get_type ();
-       [NoArrayLength]
-       [CCode (cname = "gtk_disable_setlocale")]
        public static void disable_setlocale ();
-       [NoArrayLength]
-       [CCode (cname = "gtk_enumerate_printers")]
        public static void enumerate_printers (Gtk.PrinterFunc func, pointer data, GLib.DestroyNotify destroy, bool wait);
-       [NoArrayLength]
-       [CCode (cname = "gtk_events_pending")]
        public static bool events_pending ();
-       [NoArrayLength]
-       [CCode (cname = "gtk_get_current_event")]
        public static weak Gdk.Event get_current_event ();
-       [NoArrayLength]
-       [CCode (cname = "gtk_get_current_event_state")]
        public static bool get_current_event_state (Gdk.ModifierType state);
-       [NoArrayLength]
-       [CCode (cname = "gtk_get_current_event_time")]
        public static uint get_current_event_time ();
-       [NoArrayLength]
-       [CCode (cname = "gtk_get_default_language")]
        public static weak Pango.Language get_default_language ();
-       [NoArrayLength]
-       [CCode (cname = "gtk_get_event_widget")]
        public static weak Gtk.Widget get_event_widget (Gdk.Event event);
-       [NoArrayLength]
-       [CCode (cname = "gtk_get_option_group")]
        public static weak GLib.OptionGroup get_option_group (bool open_default_display);
-       [NoArrayLength]
-       [CCode (cname = "gtk_identifier_get_type")]
        public static GLib.Type identifier_get_type ();
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_arrow")]
        public static void paint_arrow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_box")]
        public static void paint_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_box_gap")]
        public static void paint_box_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, 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);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_check")]
        public static void paint_check (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_diamond")]
        public static void paint_diamond (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_expander")]
        public static void paint_expander (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Gtk.ExpanderStyle expander_style);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_extension")]
        public static void paint_extension (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_flat_box")]
        public static void paint_flat_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_focus")]
        public static void paint_focus (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_handle")]
        public static void paint_handle (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_hline")]
        public static void paint_hline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x1, int x2, int y);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_layout")]
        public static void paint_layout (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, bool use_text, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Pango.Layout layout);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_option")]
        public static void paint_option (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_polygon")]
        public static void paint_polygon (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.Point points, int npoints, bool fill);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_resize_grip")]
        public static void paint_resize_grip (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.WindowEdge edge, int x, int y, int width, int height);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_shadow")]
        public static void paint_shadow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_shadow_gap")]
        public static void paint_shadow_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, 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);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_slider")]
        public static void paint_slider (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_tab")]
        public static void paint_tab (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
-       [NoArrayLength]
-       [CCode (cname = "gtk_paint_vline")]
        public static void paint_vline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int y1_, int y2_, int x);
-       [NoArrayLength]
-       [CCode (cname = "gtk_parse_args")]
        public static bool parse_args (int argc, string argv);
-       [NoArrayLength]
-       [CCode (cname = "gtk_private_flags_get_type")]
        public static GLib.Type private_flags_get_type ();
-       [NoArrayLength]
-       [CCode (cname = "gtk_propagate_event")]
        public static void propagate_event (Gtk.Widget widget, Gdk.Event event);
-       [NoArrayLength]
-       [CCode (cname = "gtk_rgb_to_hsv")]
        public static void rgb_to_hsv (double r, double g, double b, double h, double s, double v);
-       [NoArrayLength]
-       [CCode (cname = "gtk_set_locale")]
        public static weak string set_locale ();
-       [NoArrayLength]
-       [CCode (cname = "gtk_show_about_dialog")]
        public static void show_about_dialog (Gtk.Window parent, string first_property_name, ...);
-       [NoArrayLength]
-       [CCode (cname = "gtk_text_layout_draw")]
        public static void text_layout_draw (pointer layout, Gtk.Widget widget, Gdk.Drawable drawable, Gdk.GC cursor_gc, int x_offset, int y_offset, int x, int y, int width, int height, GLib.List widgets);
 }
 [CCode (cheader_filename = "gtk/gtk.h")]
@@ -11337,10 +6121,7 @@ namespace Gtk {
                public int width;
                public int height;
        }
-       [CCode (cname = "gtk_init")]
        public static void init (out string[] args);
-       [CCode (cname = "gtk_main")]
        public static void main ();
-       [CCode (cname = "gtk_main_quit")]
        public static void main_quit ();
 }

diff --git a/vala/vapi/pango.vala b/vala/vapi/pango.vala
index 447a881..3d577d0 100644 (file)
--- a/vala/vapi/pango.vala
+++ b/vala/vapi/pango.vala
@@ -211,381 +211,153 @@ namespace Pango {
        }
        [CCode (cheader_filename = "pango/pango.h")]
        public class CairoFontMap : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_font_map_create_context")]
                public weak Pango.Context create_context ();
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_font_map_get_default")]
                public static weak Pango.FontMap get_default ();
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_font_map_get_resolution")]
                public double get_resolution ();
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_font_map_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_font_map_new")]
                public CairoFontMap ();
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_font_map_set_resolution")]
                public void set_resolution (double dpi);
        }
        [CCode (cheader_filename = "pango/pango.h")]
        public class Context : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "pango_context_get_base_dir")]
                public Pango.Direction get_base_dir ();
-               [NoArrayLength]
-               [CCode (cname = "pango_context_get_base_gravity")]
                public Pango.Gravity get_base_gravity ();
-               [NoArrayLength]
-               [CCode (cname = "pango_context_get_font_description")]
                public weak Pango.FontDescription get_font_description ();
-               [NoArrayLength]
-               [CCode (cname = "pango_context_get_font_map")]
                public weak Pango.FontMap get_font_map ();
-               [NoArrayLength]
-               [CCode (cname = "pango_context_get_gravity")]
                public Pango.Gravity get_gravity ();
-               [NoArrayLength]
-               [CCode (cname = "pango_context_get_gravity_hint")]
                public Pango.GravityHint get_gravity_hint ();
-               [NoArrayLength]
-               [CCode (cname = "pango_context_get_language")]
                public weak Pango.Language get_language ();
-               [NoArrayLength]
-               [CCode (cname = "pango_context_get_matrix")]
                public Pango.Matrix get_matrix ();
-               [NoArrayLength]
-               [CCode (cname = "pango_context_get_metrics")]
                public weak Pango.FontMetrics get_metrics (Pango.FontDescription desc, Pango.Language language);
-               [NoArrayLength]
-               [CCode (cname = "pango_context_get_type")]
                public static GLib.Type get_type ();
                [NoArrayLength]
-               [CCode (cname = "pango_context_list_families")]
                public void list_families (Pango.FontFamily[] families, int n_families);
-               [NoArrayLength]
-               [CCode (cname = "pango_context_load_font")]
                public weak Pango.Font load_font (Pango.FontDescription desc);
-               [NoArrayLength]
-               [CCode (cname = "pango_context_load_fontset")]
                public weak Pango.Fontset load_fontset (Pango.FontDescription desc, Pango.Language language);
-               [NoArrayLength]
-               [CCode (cname = "pango_context_set_base_dir")]
                public void set_base_dir (Pango.Direction direction);
-               [NoArrayLength]
-               [CCode (cname = "pango_context_set_base_gravity")]
                public void set_base_gravity (Pango.Gravity gravity);
-               [NoArrayLength]
-               [CCode (cname = "pango_context_set_font_description")]
                public void set_font_description (Pango.FontDescription desc);
-               [NoArrayLength]
-               [CCode (cname = "pango_context_set_gravity_hint")]
                public void set_gravity_hint (Pango.GravityHint hint);
-               [NoArrayLength]
-               [CCode (cname = "pango_context_set_language")]
                public void set_language (Pango.Language language);
-               [NoArrayLength]
-               [CCode (cname = "pango_context_set_matrix")]
                public void set_matrix (ref Pango.Matrix matrix);
        }
        [CCode (cheader_filename = "pango/pango.h")]
        public class Font : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "pango_font_describe")]
                public weak Pango.FontDescription describe ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_describe_with_absolute_size")]
                public weak Pango.FontDescription describe_with_absolute_size ();
                [NoArrayLength]
-               [CCode (cname = "pango_font_descriptions_free")]
                public static void descriptions_free (Pango.FontDescription[] descs, int n_descs);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_find_shaper")]
                public weak Pango.EngineShape find_shaper (Pango.Language language, uint ch);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_get_coverage")]
                public weak Pango.Coverage get_coverage (Pango.Language language);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_get_font_map")]
                public weak Pango.FontMap get_font_map ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_get_glyph_extents")]
                public void get_glyph_extents (uint glyph, ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_get_metrics")]
                public weak Pango.FontMetrics get_metrics (Pango.Language language);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "pango/pango.h")]
        public class Fontset : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "pango_fontset_foreach")]
                public void @foreach (Pango.FontsetForeachFunc func, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "pango_fontset_get_font")]
                public weak Pango.Font get_font (uint wc);
-               [NoArrayLength]
-               [CCode (cname = "pango_fontset_get_metrics")]
                public weak Pango.FontMetrics get_metrics ();
-               [NoArrayLength]
-               [CCode (cname = "pango_fontset_get_type")]
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "pango/pango.h")]
        public class FontFace : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "pango_font_face_describe")]
                public weak Pango.FontDescription describe ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_face_get_face_name")]
                public weak string get_face_name ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_face_get_type")]
                public static GLib.Type get_type ();
                [NoArrayLength]
-               [CCode (cname = "pango_font_face_list_sizes")]
                public void list_sizes (int[] sizes, int n_sizes);
        }
        [CCode (cheader_filename = "pango/pango.h")]
        public class FontFamily : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "pango_font_family_get_name")]
                public weak string get_name ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_family_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_family_is_monospace")]
                public bool is_monospace ();
                [NoArrayLength]
-               [CCode (cname = "pango_font_family_list_faces")]
                public void list_faces (Pango.FontFace[] faces, int n_faces);
        }
        [CCode (cheader_filename = "pango/pango.h")]
        public class FontMap : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "pango_font_map_get_type")]
                public static GLib.Type get_type ();
                [NoArrayLength]
-               [CCode (cname = "pango_font_map_list_families")]
                public void list_families (Pango.FontFamily[] families, int n_families);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_map_load_font")]
                public weak Pango.Font load_font (Pango.Context context, Pango.FontDescription desc);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_map_load_fontset")]
                public weak Pango.Fontset load_fontset (Pango.Context context, Pango.FontDescription desc, Pango.Language language);
        }
        [CCode (cheader_filename = "pango/pango.h")]
        public class Layout : GLib.Object {
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_context_changed")]
                public void context_changed ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_copy")]
                public weak Pango.Layout copy ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_alignment")]
                public Pango.Alignment get_alignment ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_attributes")]
                public weak Pango.AttrList get_attributes ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_auto_dir")]
                public bool get_auto_dir ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_context")]
                public weak Pango.Context get_context ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_cursor_pos")]
                public void get_cursor_pos (int index_, ref Pango.Rectangle strong_pos, ref Pango.Rectangle weak_pos);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_ellipsize")]
                public Pango.EllipsizeMode get_ellipsize ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_extents")]
                public void get_extents (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_font_description")]
                public weak Pango.FontDescription get_font_description ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_indent")]
                public int get_indent ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_iter")]
                public weak Pango.LayoutIter get_iter ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_justify")]
                public bool get_justify ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_line")]
                public weak Pango.LayoutLine get_line (int line);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_line_count")]
                public int get_line_count ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_line_readonly")]
                public weak Pango.LayoutLine get_line_readonly (int line);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_lines")]
                public weak GLib.SList get_lines ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_lines_readonly")]
                public weak GLib.SList get_lines_readonly ();
                [NoArrayLength]
-               [CCode (cname = "pango_layout_get_log_attrs")]
                public void get_log_attrs (Pango.LogAttr[] attrs, int n_attrs);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_pixel_extents")]
                public void get_pixel_extents (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_pixel_size")]
                public void get_pixel_size (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_single_paragraph_mode")]
                public bool get_single_paragraph_mode ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_size")]
                public void get_size (int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_spacing")]
                public int get_spacing ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_tabs")]
                public weak Pango.TabArray get_tabs ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_text")]
                public weak string get_text ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_unknown_glyphs_count")]
                public int get_unknown_glyphs_count ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_width")]
                public int get_width ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_get_wrap")]
                public Pango.WrapMode get_wrap ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_index_to_line_x")]
                public void index_to_line_x (int index_, bool trailing, int line, int x_pos);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_index_to_pos")]
                public void index_to_pos (int index_, ref Pango.Rectangle pos);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_is_ellipsized")]
                public bool is_ellipsized ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_is_wrapped")]
                public bool is_wrapped ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_move_cursor_visually")]
                public void move_cursor_visually (bool strong, int old_index, int old_trailing, int direction, int new_index, int new_trailing);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_new")]
                public Layout (Pango.Context context);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_alignment")]
                public void set_alignment (Pango.Alignment alignment);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_attributes")]
                public void set_attributes (Pango.AttrList attrs);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_auto_dir")]
                public void set_auto_dir (bool auto_dir);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_ellipsize")]
                public void set_ellipsize (Pango.EllipsizeMode ellipsize);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_font_description")]
                public void set_font_description (Pango.FontDescription desc);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_indent")]
                public void set_indent (int indent);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_justify")]
                public void set_justify (bool justify);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_markup")]
                public void set_markup (string markup, int length);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_markup_with_accel")]
                public void set_markup_with_accel (string markup, int length, unichar accel_marker, unichar accel_char);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_single_paragraph_mode")]
                public void set_single_paragraph_mode (bool setting);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_spacing")]
                public void set_spacing (int spacing);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_tabs")]
                public void set_tabs (Pango.TabArray tabs);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_text")]
                public void set_text (string text, int length);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_width")]
                public void set_width (int width);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_set_wrap")]
                public void set_wrap (Pango.WrapMode wrap);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_xy_to_index")]
                public bool xy_to_index (int x, int y, int index_, int trailing);
        }
        [CCode (cheader_filename = "pango/pango.h")]
        public class Renderer : GLib.Object {
                public Pango.Matrix matrix;
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_activate")]
                public void activate ();
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_deactivate")]
                public void deactivate ();
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_draw_error_underline")]
                public virtual void draw_error_underline (int x, int y, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_draw_glyph")]
                public virtual void draw_glyph (Pango.Font font, uint glyph, double x, double y);
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_draw_glyphs")]
                public virtual void draw_glyphs (Pango.Font font, Pango.GlyphString glyphs, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_draw_layout")]
                public void draw_layout (Pango.Layout layout, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_draw_layout_line")]
                public void draw_layout_line (Pango.LayoutLine line, int x, int y);
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_draw_rectangle")]
                public virtual void draw_rectangle (Pango.RenderPart part, int x, int y, int width, int height);
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_draw_trapezoid")]
                public virtual void draw_trapezoid (Pango.RenderPart part, double y1_, double x11, double x21, double y2, double x12, double x22);
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_get_color")]
                public Pango.Color get_color (Pango.RenderPart part);
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_get_matrix")]
                public Pango.Matrix get_matrix ();
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_part_changed")]
                public virtual void part_changed (Pango.RenderPart part);
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_set_color")]
                public void set_color (Pango.RenderPart part, ref Pango.Color color);
-               [NoArrayLength]
-               [CCode (cname = "pango_renderer_set_matrix")]
                public void set_matrix (ref Pango.Matrix matrix);
        }
        [ReferenceType]
@@ -617,8 +389,6 @@ namespace Pango {
        public struct AttrFontDesc {
                public weak Pango.Attribute attr;
                public weak Pango.FontDescription desc;
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_font_desc_new")]
                public AttrFontDesc (Pango.FontDescription desc);
        }
        [ReferenceType]
@@ -628,70 +398,32 @@ namespace Pango {
        }
        [ReferenceType]
        public struct AttrIterator {
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_iterator_copy")]
                public weak Pango.AttrIterator copy ();
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_iterator_destroy")]
                public void destroy ();
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_iterator_get")]
                public weak Pango.Attribute @get (Pango.AttrType type);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_iterator_get_attrs")]
                public weak GLib.SList get_attrs ();
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_iterator_get_font")]
                public void get_font (Pango.FontDescription desc, Pango.Language language, GLib.SList extra_attrs);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_iterator_next")]
                public bool next ();
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_iterator_range")]
                public void range (int start, int end);
        }
        [ReferenceType]
        public struct AttrLanguage {
                public weak Pango.Attribute attr;
                public weak Pango.Language value;
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_language_new")]
                public AttrLanguage (Pango.Language language);
        }
        [ReferenceType]
        public struct AttrList {
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_list_change")]
                public void change (Pango.Attribute attr);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_list_copy")]
                public weak Pango.AttrList copy ();
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_list_filter")]
                public weak Pango.AttrList filter (Pango.AttrFilterFunc func, pointer data);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_list_get_iterator")]
                public weak Pango.AttrIterator get_iterator ();
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_list_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_list_insert")]
                public void insert (Pango.Attribute attr);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_list_insert_before")]
                public void insert_before (Pango.Attribute attr);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_list_new")]
                public AttrList ();
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_list_ref")]
                public weak Pango.AttrList @ref ();
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_list_splice")]
                public void splice (Pango.AttrList other, int pos, int len);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_list_unref")]
                public void unref ();
        }
        [ReferenceType]
@@ -702,11 +434,7 @@ namespace Pango {
                public pointer data;
                public Pango.AttrDataCopyFunc copy_func;
                public GLib.DestroyNotify destroy_func;
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_shape_new")]
                public AttrShape (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_shape_new_with_data")]
                public AttrShape.with_data (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect, pointer data, Pango.AttrDataCopyFunc copy_func, GLib.DestroyNotify destroy_func);
        }
        [ReferenceType]
@@ -714,8 +442,6 @@ namespace Pango {
                public weak Pango.Attribute attr;
                public int size;
                public uint absolute;
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_size_new")]
                public AttrSize (int size);
        }
        [ReferenceType]
@@ -728,68 +454,36 @@ namespace Pango {
                public pointer klass;
                public uint start_index;
                public uint end_index;
-               [NoArrayLength]
-               [CCode (cname = "pango_attribute_copy")]
                public weak Pango.Attribute copy ();
-               [NoArrayLength]
-               [CCode (cname = "pango_attribute_destroy")]
                public void destroy ();
-               [NoArrayLength]
-               [CCode (cname = "pango_attribute_equal")]
                public bool equal (Pango.Attribute attr2);
        }
        public struct Color {
                public ushort red;
                public ushort green;
                public ushort blue;
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_color_copy")]
                public Pango.Color copy ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_color_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "pango_color_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_color_parse")]
                public bool parse (string spec);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_color_to_string")]
                public weak string to_string ();
        }
        [ReferenceType]
        public struct Coverage {
-               [NoArrayLength]
-               [CCode (cname = "pango_coverage_copy")]
                public weak Pango.Coverage copy ();
                [NoArrayLength]
-               [CCode (cname = "pango_coverage_from_bytes")]
                public static weak Pango.Coverage from_bytes (uchar[] bytes, int n_bytes);
-               [NoArrayLength]
-               [CCode (cname = "pango_coverage_get")]
                public Pango.CoverageLevel @get (int index_);
-               [NoArrayLength]
-               [CCode (cname = "pango_coverage_max")]
                public void max (Pango.Coverage other);
-               [NoArrayLength]
-               [CCode (cname = "pango_coverage_new")]
                public Coverage ();
-               [NoArrayLength]
-               [CCode (cname = "pango_coverage_ref")]
                public weak Pango.Coverage @ref ();
-               [NoArrayLength]
-               [CCode (cname = "pango_coverage_set")]
                public void @set (int index_, Pango.CoverageLevel level);
                [NoArrayLength]
-               [CCode (cname = "pango_coverage_to_bytes")]
                public void to_bytes (uchar[] bytes, int n_bytes);
-               [NoArrayLength]
-               [CCode (cname = "pango_coverage_unref")]
                public void unref ();
        }
        [ReferenceType]
@@ -800,137 +494,51 @@ namespace Pango {
        }
        [ReferenceType]
        public struct FontDescription {
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_better_match")]
                public bool better_match (Pango.FontDescription old_match, Pango.FontDescription new_match);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_copy")]
                public weak Pango.FontDescription copy ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_copy_static")]
                public weak Pango.FontDescription copy_static ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_equal")]
                public bool equal (Pango.FontDescription desc2);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_from_string")]
                public static weak Pango.FontDescription from_string (string str);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_get_family")]
                public weak string get_family ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_get_gravity")]
                public Pango.Gravity get_gravity ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_get_set_fields")]
                public Pango.FontMask get_set_fields ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_get_size")]
                public int get_size ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_get_size_is_absolute")]
                public bool get_size_is_absolute ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_get_stretch")]
                public Pango.Stretch get_stretch ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_get_style")]
                public Pango.Style get_style ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_get_variant")]
                public Pango.Variant get_variant ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_get_weight")]
                public Pango.Weight get_weight ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_hash")]
                public uint hash ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_merge")]
                public void merge (Pango.FontDescription desc_to_merge, bool replace_existing);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_merge_static")]
                public void merge_static (Pango.FontDescription desc_to_merge, bool replace_existing);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_new")]
                public FontDescription ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_set_absolute_size")]
                public void set_absolute_size (double size);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_set_family")]
                public void set_family (string family);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_set_family_static")]
                public void set_family_static (string family);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_set_gravity")]
                public void set_gravity (Pango.Gravity gravity);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_set_size")]
                public void set_size (int size);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_set_stretch")]
                public void set_stretch (Pango.Stretch stretch);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_set_style")]
                public void set_style (Pango.Style style);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_set_variant")]
                public void set_variant (Pango.Variant variant);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_set_weight")]
                public void set_weight (Pango.Weight weight);
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_to_filename")]
                public weak string to_filename ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_to_string")]
                public weak string to_string ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_description_unset_fields")]
                public void unset_fields (Pango.FontMask to_unset);
        }
        [ReferenceType]
        public struct FontMetrics {
-               [NoArrayLength]
-               [CCode (cname = "pango_font_metrics_get_approximate_char_width")]
                public int get_approximate_char_width ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_metrics_get_approximate_digit_width")]
                public int get_approximate_digit_width ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_metrics_get_ascent")]
                public int get_ascent ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_metrics_get_descent")]
                public int get_descent ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_metrics_get_strikethrough_position")]
                public int get_strikethrough_position ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_metrics_get_strikethrough_thickness")]
                public int get_strikethrough_thickness ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_metrics_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_metrics_get_underline_position")]
                public int get_underline_position ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_metrics_get_underline_thickness")]
                public int get_underline_thickness ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_metrics_ref")]
                public weak Pango.FontMetrics @ref ();
-               [NoArrayLength]
-               [CCode (cname = "pango_font_metrics_unref")]
                public void unref ();
        }
        [ReferenceType]
@@ -949,17 +557,9 @@ namespace Pango {
        public struct GlyphItem {
                public weak Pango.Item item;
                public weak Pango.GlyphString glyphs;
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_item_apply_attrs")]
                public weak GLib.SList apply_attrs (string text, Pango.AttrList list);
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_item_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_item_letter_space")]
                public void letter_space (string text, Pango.LogAttr log_attrs, int letter_spacing);
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_item_split")]
                public weak Pango.GlyphItem split (string text, int split_index);
        }
        [ReferenceType]
@@ -967,38 +567,16 @@ namespace Pango {
                public int num_glyphs;
                public weak Pango.GlyphInfo glyphs;
                public int log_clusters;
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_string_copy")]
                public weak Pango.GlyphString copy ();
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_string_extents")]
                public void extents (Pango.Font font, ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_string_extents_range")]
                public void extents_range (int start, int end, Pango.Font font, ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_string_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_string_get_logical_widths")]
                public void get_logical_widths (string text, int length, int embedding_level, int logical_widths);
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_string_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_string_get_width")]
                public int get_width ();
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_string_index_to_x")]
                public void index_to_x (string text, int length, Pango.Analysis analysis, int index_, bool trailing, int x_pos);
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_string_new")]
                public GlyphString ();
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_string_set_size")]
                public void set_size (int new_len);
-               [NoArrayLength]
-               [CCode (cname = "pango_glyph_string_x_to_index")]
                public void x_to_index (string text, int length, Pango.Analysis analysis, int x_pos, int index_, int trailing);
        }
        [ReferenceType]
@@ -1011,101 +589,41 @@ namespace Pango {
                public int length;
                public int num_chars;
                public weak Pango.Analysis analysis;
-               [NoArrayLength]
-               [CCode (cname = "pango_item_copy")]
                public weak Pango.Item copy ();
-               [NoArrayLength]
-               [CCode (cname = "pango_item_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "pango_item_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_item_new")]
                public Item ();
-               [NoArrayLength]
-               [CCode (cname = "pango_item_split")]
                public weak Pango.Item split (int split_index, int split_offset);
        }
        [ReferenceType]
        public struct Language {
-               [NoArrayLength]
-               [CCode (cname = "pango_language_from_string")]
                public static weak Pango.Language from_string (string language);
-               [NoArrayLength]
-               [CCode (cname = "pango_language_get_default")]
                public static weak Pango.Language get_default ();
-               [NoArrayLength]
-               [CCode (cname = "pango_language_get_sample_string")]
                public weak string get_sample_string ();
-               [NoArrayLength]
-               [CCode (cname = "pango_language_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_language_includes_script")]
                public bool includes_script (Pango.Script script);
-               [NoArrayLength]
-               [CCode (cname = "pango_language_matches")]
                public bool matches (string range_list);
        }
        [ReferenceType]
        public struct LayoutIter {
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_at_last_line")]
                public bool at_last_line ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_baseline")]
                public int get_baseline ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_char_extents")]
                public void get_char_extents (ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_cluster_extents")]
                public void get_cluster_extents (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_index")]
                public int get_index ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_layout_extents")]
                public void get_layout_extents (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_line")]
                public weak Pango.LayoutLine get_line ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_line_extents")]
                public void get_line_extents (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_line_readonly")]
                public weak Pango.LayoutLine get_line_readonly ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_line_yrange")]
                public void get_line_yrange (int y0_, int y1_);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_run")]
                public weak Pango.LayoutRun get_run ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_run_extents")]
                public void get_run_extents (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_run_readonly")]
                public weak Pango.LayoutRun get_run_readonly ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_next_char")]
                public bool next_char ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_next_cluster")]
                public bool next_cluster ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_next_line")]
                public bool next_line ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_iter_next_run")]
                public bool next_run ();
        }
        [ReferenceType]
@@ -1116,29 +634,14 @@ namespace Pango {
                public weak GLib.SList runs;
                public uint is_paragraph_start;
                public uint resolved_dir;
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_line_get_extents")]
                public void get_extents (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_line_get_pixel_extents")]
                public void get_pixel_extents (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_line_get_type")]
                public static GLib.Type get_type ();
                [NoArrayLength]
-               [CCode (cname = "pango_layout_line_get_x_ranges")]
                public void get_x_ranges (int start_index, int end_index, int[] ranges, int n_ranges);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_line_index_to_x")]
                public void index_to_x (int index_, bool trailing, int x_pos);
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_line_ref")]
                public weak Pango.LayoutLine @ref ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_line_unref")]
                public void unref ();
-               [NoArrayLength]
-               [CCode (cname = "pango_layout_line_x_to_index")]
                public bool x_to_index (int x_pos, int index_, int trailing);
        }
        [ReferenceType]
@@ -1167,52 +670,28 @@ namespace Pango {
                public double yy;
                public double x0;
                public double y0;
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_matrix_concat")]
                public void concat (ref Pango.Matrix new_matrix);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_matrix_copy")]
                public Pango.Matrix copy ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_matrix_free")]
                public void free ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_matrix_get_font_scale_factor")]
                public double get_font_scale_factor ();
-               [NoArrayLength]
-               [CCode (cname = "pango_matrix_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_matrix_rotate")]
                public void rotate (double degrees);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_matrix_scale")]
                public void scale (double scale_x, double scale_y);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_matrix_transform_distance")]
                public void transform_distance (double dx, double dy);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_matrix_transform_pixel_rectangle")]
                public void transform_pixel_rectangle (ref Pango.Rectangle rect);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_matrix_transform_point")]
                public void transform_point (double x, double y);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_matrix_transform_rectangle")]
                public void transform_rectangle (ref Pango.Rectangle rect);
-               [NoArrayLength]
                [InstanceByReference]
-               [CCode (cname = "pango_matrix_translate")]
                public void translate (double tx, double ty);
        }
        public struct Rectangle {
@@ -1223,278 +702,110 @@ namespace Pango {
        }
        [ReferenceType]
        public struct ScriptIter {
-               [NoArrayLength]
-               [CCode (cname = "pango_script_iter_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "pango_script_iter_get_range")]
                public void get_range (string start, string end, Pango.Script script);
-               [NoArrayLength]
-               [CCode (cname = "pango_script_iter_new")]
                public ScriptIter (string text, int length);
-               [NoArrayLength]
-               [CCode (cname = "pango_script_iter_next")]
                public bool next ();
        }
        [ReferenceType]
        public struct TabArray {
-               [NoArrayLength]
-               [CCode (cname = "pango_tab_array_copy")]
                public weak Pango.TabArray copy ();
-               [NoArrayLength]
-               [CCode (cname = "pango_tab_array_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "pango_tab_array_get_positions_in_pixels")]
                public bool get_positions_in_pixels ();
-               [NoArrayLength]
-               [CCode (cname = "pango_tab_array_get_size")]
                public int get_size ();
-               [NoArrayLength]
-               [CCode (cname = "pango_tab_array_get_tab")]
                public void get_tab (int tab_index, Pango.TabAlign alignment, int location);
-               [NoArrayLength]
-               [CCode (cname = "pango_tab_array_get_tabs")]
                public void get_tabs (Pango.TabAlign alignments, int locations);
-               [NoArrayLength]
-               [CCode (cname = "pango_tab_array_get_type")]
                public static GLib.Type get_type ();
-               [NoArrayLength]
-               [CCode (cname = "pango_tab_array_new")]
                public TabArray (int initial_size, bool positions_in_pixels);
-               [NoArrayLength]
-               [CCode (cname = "pango_tab_array_new_with_positions")]
                public TabArray.with_positions (int size, bool positions_in_pixels, Pango.TabAlign first_alignment, int first_position);
-               [NoArrayLength]
-               [CCode (cname = "pango_tab_array_resize")]
                public void resize (int new_size);
-               [NoArrayLength]
-               [CCode (cname = "pango_tab_array_set_tab")]
                public void set_tab (int tab_index, Pango.TabAlign alignment, int location);
        }
        [ReferenceType]
        public struct Win32FontCache {
-               [NoArrayLength]
-               [CCode (cname = "pango_win32_font_cache_free")]
                public void free ();
-               [NoArrayLength]
-               [CCode (cname = "pango_win32_font_cache_load")]
                public pointer load (pointer logfont);
-               [NoArrayLength]
-               [CCode (cname = "pango_win32_font_cache_loadw")]
                public pointer loadw (pointer logfont);
-               [NoArrayLength]
-               [CCode (cname = "pango_win32_font_cache_new")]
                public Win32FontCache ();
-               [NoArrayLength]
-               [CCode (cname = "pango_win32_font_cache_unload")]
                public void unload (pointer hfont);
        }
        [ReferenceType]
        public struct Attr {
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_background_new")]
                public static weak Pango.Attribute background_new (ushort red, ushort green, ushort blue);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_fallback_new")]
                public static weak Pango.Attribute fallback_new (bool enable_fallback);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_family_new")]
                public static weak Pango.Attribute family_new (string family);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_foreground_new")]
                public static weak Pango.Attribute foreground_new (ushort red, ushort green, ushort blue);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_gravity_hint_new")]
                public static weak Pango.Attribute gravity_hint_new (Pango.GravityHint hint);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_gravity_new")]
                public static weak Pango.Attribute gravity_new (Pango.Gravity gravity);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_letter_spacing_new")]
                public static weak Pango.Attribute letter_spacing_new (int letter_spacing);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_rise_new")]
                public static weak Pango.Attribute rise_new (int rise);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_scale_new")]
                public static weak Pango.Attribute scale_new (double scale_factor);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_stretch_new")]
                public static weak Pango.Attribute stretch_new (Pango.Stretch stretch);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_strikethrough_color_new")]
                public static weak Pango.Attribute strikethrough_color_new (ushort red, ushort green, ushort blue);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_strikethrough_new")]
                public static weak Pango.Attribute strikethrough_new (bool strikethrough);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_style_new")]
                public static weak Pango.Attribute style_new (Pango.Style style);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_type_register")]
                public static Pango.AttrType type_register (string name);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_underline_color_new")]
                public static weak Pango.Attribute underline_color_new (ushort red, ushort green, ushort blue);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_underline_new")]
                public static weak Pango.Attribute underline_new (Pango.Underline underline);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_variant_new")]
                public static weak Pango.Attribute variant_new (Pango.Variant variant);
-               [NoArrayLength]
-               [CCode (cname = "pango_attr_weight_new")]
                public static weak Pango.Attribute weight_new (Pango.Weight weight);
        }
        [ReferenceType]
        public struct Cairo {
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_context_get_font_options")]
                public static pointer context_get_font_options (Pango.Context context);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_context_get_resolution")]
                public static double context_get_resolution (Pango.Context context);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_context_set_font_options")]
                public static void context_set_font_options (Pango.Context context, pointer options);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_context_set_resolution")]
                public static void context_set_resolution (Pango.Context context, double dpi);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_create_layout")]
                public static weak Pango.Layout create_layout (Cairo.Context cr);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_error_underline_path")]
                public static void error_underline_path (Cairo.Context cr, double x, double y, double width, double height);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_glyph_string_path")]
                public static void glyph_string_path (Cairo.Context cr, Pango.Font font, Pango.GlyphString glyphs);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_layout_line_path")]
                public static void layout_line_path (Cairo.Context cr, Pango.LayoutLine line);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_layout_path")]
                public static void layout_path (Cairo.Context cr, Pango.Layout layout);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_show_error_underline")]
                public static void show_error_underline (Cairo.Context cr, double x, double y, double width, double height);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_show_glyph_string")]
                public static void show_glyph_string (Cairo.Context cr, Pango.Font font, Pango.GlyphString glyphs);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_show_layout")]
                public static void show_layout (Cairo.Context cr, Pango.Layout layout);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_show_layout_line")]
                public static void show_layout_line (Cairo.Context cr, Pango.LayoutLine line);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_update_context")]
                public static void update_context (Cairo.Context cr, Pango.Context context);
-               [NoArrayLength]
-               [CCode (cname = "pango_cairo_update_layout")]
                public static void update_layout (Cairo.Context cr, Pango.Layout layout);
        }
        [ReferenceType]
        public struct Units {
-               [NoArrayLength]
-               [CCode (cname = "pango_units_from_double")]
                public static int from_double (double d);
-               [NoArrayLength]
-               [CCode (cname = "pango_units_to_double")]
                public static double to_double (int i);
        }
        [ReferenceType]
        public struct Version {
-               [NoArrayLength]
-               [CCode (cname = "pango_version_check")]
                public static weak string check (int required_major, int required_minor, int required_micro);
-               [NoArrayLength]
-               [CCode (cname = "pango_version_string")]
                public static weak string string ();
        }
        public callback pointer AttrDataCopyFunc (pointer data);
        public callback bool AttrFilterFunc (Pango.Attribute attribute, pointer data);
        public callback bool FontsetForeachFunc (Pango.Fontset fontset, Pango.Font font, pointer data);
-       [NoArrayLength]
-       [CCode (cname = "pango_extents_to_pixels")]
        public static void extents_to_pixels (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
-       [NoArrayLength]
-       [CCode (cname = "pango_find_base_dir")]
        public static Pango.Direction find_base_dir (string text, int length);
-       [NoArrayLength]
-       [CCode (cname = "pango_find_paragraph_boundary")]
        public static void find_paragraph_boundary (string text, int length, int paragraph_delimiter_index, int next_paragraph_start);
-       [NoArrayLength]
-       [CCode (cname = "pango_get_log_attrs")]
        public static void get_log_attrs (string text, int length, int level, Pango.Language language, Pango.LogAttr log_attrs, int attrs_len);
-       [NoArrayLength]
-       [CCode (cname = "pango_gravity_get_for_matrix")]
        public static Pango.Gravity gravity_get_for_matrix (ref Pango.Matrix matrix);
-       [NoArrayLength]
-       [CCode (cname = "pango_gravity_get_for_script")]
        public static Pango.Gravity gravity_get_for_script (Pango.Script script, Pango.Gravity base_gravity, Pango.GravityHint hint);
-       [NoArrayLength]
-       [CCode (cname = "pango_gravity_to_rotation")]
        public static double gravity_to_rotation (Pango.Gravity gravity);
-       [NoArrayLength]
-       [CCode (cname = "pango_is_zero_width")]
        public static bool is_zero_width (unichar ch);
-       [NoArrayLength]
-       [CCode (cname = "pango_itemize_with_base_dir")]
        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);
-       [NoArrayLength]
-       [CCode (cname = "pango_parse_enum")]
        public static bool parse_enum (GLib.Type type, string str, int value, bool warn, string possible_values);
-       [NoArrayLength]
-       [CCode (cname = "pango_parse_markup")]
        public static bool parse_markup (string markup_text, int length, unichar accel_marker, Pango.AttrList attr_list, string text, unichar accel_char, GLib.Error error);
-       [NoArrayLength]
-       [CCode (cname = "pango_parse_stretch")]
        public static bool parse_stretch (string str, Pango.Stretch stretch, bool warn);
-       [NoArrayLength]
-       [CCode (cname = "pango_parse_style")]
        public static bool parse_style (string str, Pango.Style style, bool warn);
-       [NoArrayLength]
-       [CCode (cname = "pango_parse_variant")]
        public static bool parse_variant (string str, Pango.Variant variant, bool warn);
-       [NoArrayLength]
-       [CCode (cname = "pango_parse_weight")]
        public static bool parse_weight (string str, Pango.Weight weight, bool warn);
-       [NoArrayLength]
-       [CCode (cname = "pango_quantize_line_geometry")]
        public static void quantize_line_geometry (int thickness, int position);
-       [NoArrayLength]
-       [CCode (cname = "pango_read_line")]
        public static int read_line (GLib.File stream, GLib.String str);
-       [NoArrayLength]
-       [CCode (cname = "pango_reorder_items")]
        public static weak GLib.List reorder_items (GLib.List logical_items);
-       [NoArrayLength]
-       [CCode (cname = "pango_scan_int")]
        public static bool scan_int (string pos, int @out);
-       [NoArrayLength]
-       [CCode (cname = "pango_scan_string")]
        public static bool scan_string (string pos, GLib.String @out);
-       [NoArrayLength]
-       [CCode (cname = "pango_scan_word")]
        public static bool scan_word (string pos, GLib.String @out);
-       [NoArrayLength]
-       [CCode (cname = "pango_script_for_unichar")]
        public static Pango.Script script_for_unichar (unichar ch);
-       [NoArrayLength]
-       [CCode (cname = "pango_script_get_sample_language")]
        public static weak Pango.Language script_get_sample_language (Pango.Script script);
-       [NoArrayLength]
-       [CCode (cname = "pango_skip_space")]
        public static bool skip_space (string pos);
-       [NoArrayLength]
-       [CCode (cname = "pango_split_file_list")]
        public static weak string split_file_list (string str);
-       [NoArrayLength]
-       [CCode (cname = "pango_trim_string")]
        public static weak string trim_string (string str);
-       [NoArrayLength]
-       [CCode (cname = "pango_unichar_direction")]
        public static Pango.Direction unichar_direction (unichar ch);
 }