gtk+-3.0: Further syncing from g-i-generated binding

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 9271ec51681ae1359922b9df9a1e5789909f9e50..61ba97eae06f859a55ef90341e6f95ea9287c434 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -788,7 +788,6 @@ namespace Gtk {
                public uint add_objects_from_string (string buffer, size_t length, [CCode (array_length = false, array_null_terminated = true)] string[] object_ids) throws GLib.Error;
                public void connect_signals (void* user_data);
                public void connect_signals_full (Gtk.BuilderConnectFunc func);
-               public static GLib.Quark error_quark ();
                public void expose_object (string name, GLib.Object object);
                public uint extend_with_template (Gtk.Widget widget, GLib.Type template_type, string buffer, size_t length) throws GLib.Error;
                [CCode (has_construct_function = false)]
@@ -1698,7 +1697,6 @@ namespace Gtk {
        public class CssProvider : GLib.Object, Gtk.StyleProvider {
                [CCode (has_construct_function = false)]
                public CssProvider ();
-               public static GLib.Quark error_quark ();
                public static unowned Gtk.CssProvider get_default ();
                public static unowned Gtk.CssProvider get_named (string name, string? variant);
                [CCode (cname = "gtk_css_provider_load_from_data")]
@@ -2732,7 +2730,6 @@ namespace Gtk {
                public void append_search_path (string path);
                public Gtk.IconInfo? choose_icon ([CCode (array_length = false, array_null_terminated = true)] string[] icon_names, int size, Gtk.IconLookupFlags flags);
                public Gtk.IconInfo? choose_icon_for_scale ([CCode (array_length = false, array_null_terminated = true)] string[] icon_names, int size, int scale, Gtk.IconLookupFlags flags);
-               public static GLib.Quark error_quark ();
                public static unowned Gtk.IconTheme get_default ();
                public string? get_example_icon_name ();
                public static unowned Gtk.IconTheme get_for_screen (Gdk.Screen screen);
@@ -3153,7 +3150,7 @@ namespace Gtk {
        public class ListBox : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ListBox ();
-               public void bind_model (GLib.ListModel? model, owned Gtk.ListBoxCreateWidgetFunc create_widget_func);
+               public void bind_model (GLib.ListModel? model, owned Gtk.ListBoxCreateWidgetFunc? create_widget_func);
                public void drag_highlight_row (Gtk.ListBoxRow row);
                public void drag_unhighlight_row ();
                public bool get_activate_on_single_click ();
@@ -4343,7 +4340,6 @@ namespace Gtk {
                public RecentManager ();
                public bool add_full (string uri, Gtk.RecentData recent_data);
                public bool add_item (string uri);
-               public static GLib.Quark error_quark ();
                public static unowned Gtk.RecentManager get_default ();
                public GLib.List<Gtk.RecentInfo> get_items ();
                public bool has_item (string uri);
@@ -7328,7 +7324,6 @@ namespace Gtk {
                public void add_filter (owned Gtk.FileFilter filter);
                public bool add_shortcut_folder (string folder) throws GLib.Error;
                public bool add_shortcut_folder_uri (string uri) throws GLib.Error;
-               public static GLib.Quark error_quark ();
                public Gtk.FileChooserAction get_action ();
                public bool get_create_folders ();
                public string get_current_folder ();
@@ -7444,7 +7439,6 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public interface RecentChooser : GLib.Object {
                public abstract void add_filter (Gtk.RecentFilter filter);
-               public static GLib.Quark error_quark ();
                public Gtk.RecentInfo get_current_item ();
                public abstract string get_current_uri ();
                public unowned Gtk.RecentFilter get_filter ();
@@ -8814,7 +8808,8 @@ namespace Gtk {
                TEMPLATE_MISMATCH,
                INVALID_PROPERTY,
                INVALID_SIGNAL,
-               INVALID_ID
+               INVALID_ID;
+               public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CSS_PROVIDER_ERROR_")]
        public errordomain CssProviderError {
@@ -8823,31 +8818,36 @@ namespace Gtk {
                IMPORT,
                NAME,
                DEPRECATED,
-               UNKNOWN_VALUE
+               UNKNOWN_VALUE;
+               public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_ERROR_")]
        public errordomain FileChooserError {
                NONEXISTENT,
                BAD_FILENAME,
                ALREADY_EXISTS,
-               INCOMPLETE_HOSTNAME
+               INCOMPLETE_HOSTNAME;
+               public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_THEME_")]
        public errordomain IconThemeError {
                NOT_FOUND,
-               FAILED
+               FAILED;
+               public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_ERROR_")]
        public errordomain PrintError {
                GENERAL,
                INTERNAL_ERROR,
                NOMEM,
-               INVALID_FILE
+               INVALID_FILE;
+               public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_CHOOSER_ERROR_")]
        public errordomain RecentChooserError {
                NOT_FOUND,
-               INVALID_URI
+               INVALID_URI;
+               public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_MANAGER_ERROR_")]
        public errordomain RecentManagerError {
@@ -8857,7 +8857,8 @@ namespace Gtk {
                NOT_REGISTERED,
                READ,
                WRITE,
-               UNKNOWN
+               UNKNOWN;
+               public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate bool AccelGroupActivate (Gtk.AccelGroup accel_group, GLib.Object acceleratable, uint keyval, Gdk.ModifierType modifier);
@@ -9874,8 +9875,6 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool parse_args ([CCode (array_length_pos = 0.5)] ref unowned string[] argv);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public static GLib.Quark print_error_quark ();
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public static Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, [CCode (scope = "async")] Gtk.PageSetupDoneFunc done_cb);

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
index 85b10cba3a04c17b97006b499fbd100fcf28e027..5eed1cb557c3806305f61889155845ee9e20e62c 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
@@ -128,6 +128,74 @@ namespace Gtk {
                UNSORTED
        }
 
+       [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUILDER_ERROR_")]
+       public errordomain BuilderError {
+               INVALID_TYPE_FUNCTION,
+               UNHANDLED_TAG,
+               MISSING_ATTRIBUTE,
+               INVALID_ATTRIBUTE,
+               INVALID_TAG,
+               MISSING_PROPERTY_VALUE,
+               INVALID_VALUE,
+               VERSION_MISMATCH,
+               DUPLICATE_ID,
+               OBJECT_TYPE_REFUSED,
+               TEMPLATE_MISMATCH,
+               INVALID_PROPERTY,
+               INVALID_SIGNAL,
+               INVALID_ID;
+               public static GLib.Quark quark ();
+       }
+       [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CSS_PROVIDER_ERROR_")]
+       public errordomain CssProviderError {
+               FAILED,
+               SYNTAX,
+               IMPORT,
+               NAME,
+               DEPRECATED,
+               UNKNOWN_VALUE;
+               public static GLib.Quark quark ();
+       }
+       [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_ERROR_")]
+       public errordomain FileChooserError {
+               NONEXISTENT,
+               BAD_FILENAME,
+               ALREADY_EXISTS,
+               INCOMPLETE_HOSTNAME;
+               public static GLib.Quark quark ();
+       }
+       [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_THEME_")]
+       public errordomain IconThemeError {
+               NOT_FOUND,
+               FAILED;
+               public static GLib.Quark quark ();
+       }
+       [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_ERROR_")]
+       public errordomain PrintError {
+               GENERAL,
+               INTERNAL_ERROR,
+               NOMEM,
+               INVALID_FILE;
+               public static GLib.Quark quark ();
+       }
+       [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_CHOOSER_ERROR_")]
+       public errordomain RecentChooserError {
+               NOT_FOUND,
+               INVALID_URI;
+               public static GLib.Quark quark ();
+       }
+       [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_MANAGER_ERROR_")]
+       public errordomain RecentManagerError {
+               NOT_FOUND,
+               INVALID_URI,
+               INVALID_ENCODING,
+               NOT_REGISTERED,
+               READ,
+               WRITE,
+               UNKNOWN;
+               public static GLib.Quark quark ();
+       }
+
        [Version (deprecated_since = "3.0", replacement = "StyleContext")]
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Style {

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index d8c34efae873b51677fbc600b4ac7400c5a5d2f6..f1af10e0b576685572c287133285ce63cf91567e 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -731,7 +731,7 @@ gtk_layout_new.vadjustment nullable="1" default_value="null"
 gtk_layout_set_hadjustment.adjustment nullable="1"
 gtk_layout_set_vadjustment.adjustment nullable="1"
 gtk_link_button_new_with_label.label nullable="1"
-gtk_list_box_bind_model.create_widget_func transfer_ownership="1"
+gtk_list_box_bind_model.create_widget_func transfer_ownership="1" nullable="1"
 gtk_list_box_bind_model.model type_name="GLib.ListModel" nullable="1"
 gtk_list_box_bind_model.user_data_free_func hidden="1"
 gtk_list_box_get_selected_rows transfer_ownership="1" type_arguments="unowned ListBoxRow"
@@ -1981,13 +1981,14 @@ gtk_rgb_to_hsv.s is_out="1"
 gtk_rgb_to_hsv.v is_out="1"
 
 // errordomains
-GtkBuilderError errordomain="1"
-GtkCssProviderError errordomain="1"
-GtkFileChooserError errordomain="1"
-GtkIconThemeError errordomain="1"
-GtkPrintError errordomain="1"
-GtkRecentChooserError errordomain="1"
-GtkRecentManagerError errordomain="1"
+GtkBuilderError errordomain="1" hidden="1"
+GtkCssProviderError errordomain="1" hidden="1"
+GtkFileChooserError errordomain="1" hidden="1"
+GtkIconThemeError errordomain="1" hidden="1"
+GtkPrintError errordomain="1" hidden="1"
+GtkRecentChooserError errordomain="1" hidden="1"
+GtkRecentManagerError errordomain="1" hidden="1"
+*error_quark hidden="1"
 
 // type modifications (type-ids, deprecations)
 GtkAboutDialog type_id="gtk_about_dialog_get_type ()"