gtk+-3.0: Resolve conflicts of signals with properties

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 563e7bd40ccf51ec2c022fd55e73536a45d5915c..d102f017f8d35890f33e9e2f930fc13a5a7664cb 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -3742,6 +3742,8 @@ namespace Gtk {
                [NoAccessorMethod]
                public bool snap_edge_set { get; set; }
                public virtual signal void child_attached (Gtk.Widget child);
+               [CCode (cname = "child-detached")]
+               public signal void on_child_detached (Gtk.Widget widget);
        }
        [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_header_bar_get_type ()")]
        public class HeaderBar : Gtk.Container, Atk.Implementor, Gtk.Buildable {
@@ -5619,6 +5621,15 @@ namespace Gtk {
                public signal void drag_perform_drop (GLib.File dest_file, GLib.List<GLib.File> source_file_list, int action);
                [Version (since = "3.20")]
                public signal void mount (GLib.MountOperation mount_operation);
+               [CCode (cname = "show-connect-to-server")]
+               [Version (deprecated = true, deprecated_since = "3.18")]
+               public signal void on_show_connect_to_server ();
+               [CCode (cname = "show-enter-location")]
+               [Version (since = "3.14")]
+               public signal void on_show_enter_location ();
+               [CCode (cname = "show-starred-location")]
+               [Version (since = "3.22.26")]
+               public signal void on_show_starred_location (Gtk.PlacesOpenFlags open_flags);
                [Version (since = "3.10")]
                public signal void open_location (GLib.File location, Gtk.PlacesOpenFlags open_flags);
                [Version (since = "3.10")]
@@ -5652,6 +5663,8 @@ namespace Gtk {
                public virtual bool embedded { get; }
                [Version (since = "2.14")]
                public Gdk.Window socket_window { get; }
+               [CCode (cname = "embedded")]
+               public signal void on_embedded ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_popover_get_type ()")]
        [Version (since = "3.12")]

diff --git a/vapi/metadata/Gtk-3.0.metadata b/vapi/metadata/Gtk-3.0.metadata
index 95bb0d8e6cc0da0c8f9827a199997c2adbcc1a16..3f70bc3bd045eb12f63f20486652b73d845ecb44 100644 (file)
--- a/vapi/metadata/Gtk-3.0.metadata
+++ b/vapi/metadata/Gtk-3.0.metadata
@@ -382,11 +382,19 @@ Container
   .set_focus_child skip
 EntryCompletion
   .insert_prefix#method name="request_prefix_insertion"
+HandleBox
+  .child_detached#signal name="on_child_detached"
 Notebook
   .insert_page#virtual_method name="insert_page_menu"
   .insert_page#virtual_method.tab_label nullable
   .insert_page#virtual_method.menu_label nullable
   .insert_page_menu skip
+PlacesSidebar
+  .show_connect_to_server#signal name="on_show_connect_to_server"
+  .show_enter_location#signal name="on_show_enter_location"
+  .show_starred_location#signal name="on_show_starred_location"
+Plug
+  .embedded#signal name="on_embedded"
 ToolShell
   .get_icon_size#method skip
 TreeView
@@ -654,7 +662,6 @@ RadioToolButton
   .get_group nullable
 Window
   .list_toplevels type="GLib.List<unowned Gtk.Window>"
-  .set_focus#signal.object nullable
 TreeModel
   .get_path nullable
   .iter_next.iter ref